From 1a0491f2462d2c309bd8e310b22c11019a79ce1e Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 20 Mar 2017 16:02:14 +0000
Subject: [PATCH] #3527 fix - Added applications forms and metadata component
---
securis/src/main/webapp/src/app/forms/application.form.html | 124 +++++++++++------------------------------
1 files changed, 33 insertions(+), 91 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/application.form.html b/securis/src/main/webapp/src/app/forms/application.form.html
index f346418..afff290 100644
--- a/securis/src/main/webapp/src/app/forms/application.form.html
+++ b/securis/src/main/webapp/src/app/forms/application.form.html
@@ -7,6 +7,20 @@
<span flex></span>
<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 } ]
+}
+ -->
<div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
<md-card flex="70">
<md-card-title>
@@ -27,121 +41,49 @@
</md-input-container>
<error-checker [fieldName]="getFieldName('code')" [formField]="applicationForm.controls.code"></error-checker>
</div>
+ </div>
+ <div layout="row" layout-fill layout-padding>
<div layout="column" layout-fill flex>
- <md-input-container>
- <input mdInput type="number" [(ngModel)]="data.num_licenses" name="num_licenses" required />
+ <md-input-container flex>
+ <input mdInput type="text" [(ngModel)]="data.name" name="name" required />
<md-placeholder>
- <span i18n="field.num_licenses"></span>
+ <span i18n="field.name"></span>
</md-placeholder>
</md-input-container>
- <error-checker [fieldName]="getFieldName('num_licenses')" [formField]="applicationForm.controls.num_licenses"></error-checker>
+ <error-checker [fieldName]="getFieldName('name')" [formField]="applicationForm.controls.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 />
+ <md-placeholder>
+ <span i18n="field.license_filename"></span>
+ </md-placeholder>
+ </md-input-container>
+ <error-checker [fieldName]="getFieldName('license_filename')" [formField]="applicationForm.controls.license_filename"></error-checker>
</div>
</div>
<div layout="row" layout-fill layout-padding>
<div layout="column" layout-fill flex>
<md-input-container flex>
- <input mdInput type="date" [(ngModel)]="data.init_valid_date" name="init_valid_date" required />
+ <textarea mdInput type="text" type="text" [(ngModel)]="data.description" name="description" maxlength="1024"></textarea>
<md-placeholder>
- <span i18n="field.end_valid_date"></span>
- </md-placeholder>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('init_valid_date')" [formField]="applicationForm.controls.init_valid_date"></error-checker>
- </div>
- <div layout="column" layout-fill flex>
- <md-input-container flex>
- <input mdInput type="date" [(ngModel)]="data.end_valid_date" name="end_valid_date" required />
- <md-placeholder>
- <span i18n="field.end_valid_date"></span>
- </md-placeholder>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('end_valid_date')" [formField]="applicationForm.controls.end_valid_date"></error-checker>
- </div>
- </div>
- <div layout="row" layout-fill layout-padding *ngIf="isNew">
- <div layout="column" layout-fill flex>
- <md-select [placeholder]="getFieldName('organization_id')" flex [(ngModel)]="data.organization_id" name="organization_id"
- (change)="changeOrg($event)">
- <md-option *ngFor="let org of organizations" [value]="org.id">
- {{org.label}}
- </md-option>
- </md-select>
- <error-checker [fieldName]="getFieldName('organization_id')" [formField]="applicationForm.controls.organization_id"></error-checker>
- </div>
- <div layout="column" layout-fill flex>
- <md-select flex [placeholder]="getFieldName('license_type_id')" [(ngModel)]="data.license_type_id" name="license_type_id"
- (change)="changeLicType($event)">
- <md-option *ngFor="let lt of licensetypes" [value]="lt.id">
- {{lt.label}}
- </md-option>
- </md-select>
- <error-checker [fieldName]="getFieldName('license_type_id')" [formField]="applicationForm.controls.license_type_id"></error-checker>
- </div>
- </div>
- <div layout="row" layout-fill layout-padding *ngIf="!isNew">
- <field-readonly [value]="data.organization_name" label="field.organization_id" flex></field-readonly>
- <field-readonly [value]="data.licensetype_code" label="field.license_type_id" flex></field-readonly>
- </div>
- <div layout="row" layout-fill layout-padding>
- <div layout="column" layout-fill flex>
- <md-input-container flex>
- <input mdInput type="number" [(ngModel)]="data.preactivation_valid_period" name="preactivation_valid_period" required />
- <md-placeholder>
- <span i18n="field.preactivation_valid_period"></span>
- </md-placeholder>
- <md-hint align="end">days</md-hint>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('preactivation_valid_period')" [formField]="applicationForm.controls.preactivation_valid_period"></error-checker>
- </div>
- <div layout="column" layout-fill flex>
- <md-input-container flex>
- <input mdInput type="number" [(ngModel)]="data.renew_valid_period" name="renew_valid_period" required />
- <md-placeholder>
- <span i18n="field.renew_valid_period"></span>
- </md-placeholder>
- <md-hint align="end">days</md-hint>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('renew_valid_period')" [formField]="applicationForm.controls.renew_valid_period"></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.comments" name="comments" maxlength="1024"></textarea>
- <md-placeholder>
- <span i18n="field.comments"></span>
+ <span i18n="field.description"></span>
</md-placeholder>
<md-hint align="end">(max 1024)</md-hint>
</md-input-container>
</div>
</div>
<div layout="row" layout-fill layout-padding *ngIf="!isNew">
- <field-readonly [value]="data.created_by_name" label="field.created_by" flex></field-readonly>
<field-readonly [value]="data.creation_timestamp | date: 'medium'" label="field.creation_timestamp" flex></field-readonly>
</div>
- <div layout="column" layout-fill>
- <span class="md-title" i18n>License metadata</span>
- <div layout="row" layout-fill layout-padding *ngFor="let pair of data.metadata">
- <md-input-container flex="40">
- <input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.key" readonly />
- <md-placeholder>
- <span i18n="field.key"></span>
- </md-placeholder>
- </md-input-container>
- <md-input-container flex>
- <input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.value" [readonly]="pair.readonly" [required]="pair.required"
- />
- <md-placeholder>
- <span i18n="field.value"></span>
- </md-placeholder>
- </md-input-container>
- </div>
- </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>
<span flex></span>
<button [disabled]="!applicationForm.form.valid" md-raised-button color="primary" (click)="save()">Save</button>
<button md-button (click)="goBack()">Cancel</button>
--
Gitblit v1.3.2