From 60c65f2110f65221bc3a71b2887667e78c53c53e Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 22 Mar 2017 17:44:16 +0000
Subject: [PATCH] #3527 fix - Added pack/license actions and a lot of bugfixing
---
securis/src/main/webapp/src/app/forms/user.form.html | 71 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/user.form.html b/securis/src/main/webapp/src/app/forms/user.form.html
index 6299a7c..1a3caa4 100644
--- a/securis/src/main/webapp/src/app/forms/user.form.html
+++ b/securis/src/main/webapp/src/app/forms/user.form.html
@@ -8,17 +8,15 @@
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
</md-toolbar>
<!--
- code: 'CICS',
- creation_timestamp: 1418384439000,
- description: 'Wellbore integrity analysis software',
- id: 1,
- license_filename: 'config_server.lic',
- name: 'CurisIntegrity',
- metadata:
- [ { key: 'max_docs',
- value: '250000',
- readonly: true,
- mandatory: true } ]
+ username: 'rym',
+ roles: [ 1 ],
+ lastLogin: 1488885433000,
+ modificationTimestamp: 1479898458000,
+ email: 'rbouchair@curistec.com',
+ first_name: 'Rym',
+ last_name: 'Bouchair',
+ creation_timestamp: 1479898458000,
+ organizations_ids: [ 1, 2, 5, 6, 7, 8 ]
}
-->
<div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
@@ -31,59 +29,80 @@
<form #form="ngForm" class="inset">
<div layout="column" layout-align="start center">
<div layout="row" layout-fill layout-padding>
- <field-readonly [value]="data.id" label="field.id" flex="15" *ngIf="!isNew"></field-readonly>
<div layout="column" layout-fill flex>
<md-input-container>
- <input #firstField mdInput maxLength="50" type="text" [(ngModel)]="data.code" name="code" required [readonly]="!isNew" />
+ <input #firstField mdInput maxLength="50" type="text" [(ngModel)]="data.username" name="username" required [readonly]="!isNew" />
<md-placeholder>
- <span i18n="field.code"></span>
+ <span i18n="field.username"></span>
</md-placeholder>
</md-input-container>
- <error-checker [fieldName]="getFieldName('code')" [formField]="form.controls.code"></error-checker>
+ <error-checker [fieldName]="getFieldName('username')" [formField]="form.controls.username"></error-checker>
+ </div>
+ <div layout="column" layout-fill flex>
+ <md-input-container flex>
+ <input mdInput type="password" [(ngModel)]="data.password" name="password" [required]="isNew" />
+ <md-placeholder>
+ <span i18n="field.password"></span>
+ </md-placeholder>
+ </md-input-container>
+ <error-checker [fieldName]="getFieldName('password')" [formField]="form.controls.password"></error-checker>
</div>
</div>
<div layout="row" layout-fill layout-padding>
<div layout="column" layout-fill flex>
<md-input-container flex>
- <input mdInput type="text" [(ngModel)]="data.name" name="name" required />
+ <input mdInput type="text" [(ngModel)]="data.first_name" name="first_name" required />
<md-placeholder>
- <span i18n="field.name"></span>
+ <span i18n="field.first_name"></span>
</md-placeholder>
</md-input-container>
- <error-checker [fieldName]="getFieldName('name')" [formField]="form.controls.name"></error-checker>
+ <error-checker [fieldName]="getFieldName('first_name')" [formField]="form.controls.first_name"></error-checker>
</div>
<div layout="column" layout-fill flex>
<md-input-container flex>
- <input mdInput type="text" [(ngModel)]="data.license_filename" name="license_filename" required />
+ <input mdInput type="text" [(ngModel)]="data.last_name" name="last_name" />
<md-placeholder>
- <span i18n="field.license_filename"></span>
+ <span i18n="field.last_name"></span>
</md-placeholder>
</md-input-container>
- <error-checker [fieldName]="getFieldName('license_filename')" [formField]="form.controls.license_filename"></error-checker>
+ <error-checker [fieldName]="getFieldName('last_name')" [formField]="form.controls.last_name"></error-checker>
</div>
</div>
<div layout="row" layout-fill layout-padding>
<div layout="column" layout-fill flex>
<md-input-container flex>
- <textarea mdInput type="text" type="text" [(ngModel)]="data.description" name="description" maxlength="1024"></textarea>
+ <input mdInput type="email" [(ngModel)]="data.email" name="email" required maxlength="200" />
<md-placeholder>
- <span i18n="field.description"></span>
+ <span i18n="field.email"></span>
</md-placeholder>
- <md-hint align="end">(max 1024)</md-hint>
</md-input-container>
+ <error-checker [fieldName]="$L.get('field.email')" [formField]="form.controls.email"></error-checker>
+ </div>
+ </div>
+ <div layout="row" layout-fill layout-padding >
+ <td-chips flex [mdTooltip]="$L.get('Organizations that user can access')" [placeholder]="$L.get('Select organizations')"
+ [items]="orgNames" [(ngModel)]="user_orgs" name="user_orgs" requireMatch>
+ </td-chips>
+ <div layout="column" layout-fill flex="25">
+ <md-checkbox [(ngModel)]="user_roles.advance" name="advance_role" [mdTooltip]="$L.get('Role {}', 'advance')">
+ <span i18n>Advance</span>
+ </md-checkbox>
+ <md-checkbox [(ngModel)]="user_roles.admin" name="admin_role" [mdTooltip]="$L.get('Role {}', 'admin')">
+ <span i18n>Admin</span>
+ </md-checkbox>
</div>
</div>
<div layout="row" layout-fill layout-padding *ngIf="!isNew">
+ <field-readonly [value]="data.lastLogin || '' | timeAgo" label="field.lastLogin" flex></field-readonly>
<field-readonly [value]="data.creation_timestamp | date: 'medium'" label="field.creation_timestamp" flex></field-readonly>
</div>
- <metadata-manager addOrDelete="true" editKeys="true" [metadata]="data.metadata" ></metadata-manager>
</div>
</form>
</md-card-content>
<md-divider></md-divider>
<md-card-actions>
<div layout="row" layout-align="start center" class="margin">
- <button *ngIf="!isNew" md-raised-button color="warn" (click)="delete(data.id)">Delete</button>
+ <button *ngIf="!isNew" [disabled]="!canBeDeleted()" md-raised-button color="warn" (click)="delete(data.username)">Delete</button>
<span flex></span>
<button [disabled]="!form.form.valid" md-raised-button color="primary" (click)="save()">Save</button>
<button md-button (click)="goBack()">Cancel</button>
--
Gitblit v1.3.2