From 280daa7f3f858ecfef9c91ffd5dea1007f021048 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Sun, 19 Mar 2017 11:29:37 +0000
Subject: [PATCH] #3527 fix - Added applications and some minor refactoring
---
securis/src/main/webapp/src/app/forms/pack.form.html | 345 ++++++++++++++++++++++++++-------------------------------
1 files changed, 158 insertions(+), 187 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/pack.form.html b/securis/src/main/webapp/src/app/forms/pack.form.html
index 9575db2..e509765 100644
--- a/securis/src/main/webapp/src/app/forms/pack.form.html
+++ b/securis/src/main/webapp/src/app/forms/pack.form.html
@@ -1,189 +1,160 @@
-<md-toolbar>
- <span md-dialog-title>{{form_title}}</span>
- <span flex></span>
- <button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
- <button md-icon-button md-dialog-close><md-icon>close</md-icon></button>
-</md-toolbar>
-<p class="md-subhead">{{form_subtitle}}</p>
-<md-divider></md-divider>
-<form #packForm="ngForm" class="inset" >
-<div layout="column" >
-<md-dialog-content>
- <div layout="column" layout-align="start center">
- <div layout="row" layout-fill layout-padding>
- <div layout="column" layout-fill flex="15" *ngIf="!isNew">
- <md-input-container>
- <input mdInput maxLength="50" type="text" [(ngModel)]="data.id" name="id" required [readonly]="!isNew" />
- <md-placeholder>
- <span i18n="field.id"></span>
- </md-placeholder>
- </md-input-container>
- </div>
- <div layout="column" layout-fill flex>
- <md-input-container>
- <input mdInput maxLength="50" type="text" [(ngModel)]="data.code" name="code" required [readonly]="!isNew" />
- <md-placeholder>
- <span i18n="field.code"></span>
- </md-placeholder>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('code')" [formField]="packForm.controls.code"></error-checker>
- </div>
- <div layout="column" layout-fill flex>
- <md-input-container>
- <input mdInput type="number" [(ngModel)]="data.num_licenses" name="num_licenses" required />
- <md-placeholder>
- <span i18n="field.num_licenses"></span>
- </md-placeholder>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('num_licenses')" [formField]="packForm.controls.num_licenses"></error-checker>
- </div>
- </div>
- <div layout="row" layout-fill layout-padding>
- <div layout="column" layout-fill flex>
- <md-checkbox labelPosition="after" [(ngModel)]="data.license_preactivation" name="license_preactivation">
- <span i18n="field.license_preactivation"></span>
- </md-checkbox>
- </div>
- <div layout="column" layout-fill flex *ngIf="!isNew">
- <div layout="column" class="mat-input-container" flex>
- <label class="mat-input-placeholder mat-float">
- <span class="placeholder" i18n="field.status"></span>
- </label>
- <div class="label-value mat-input-element">{{packs.getStatusName(data.status)}}</div>
+<td-layout-card-over cardWidth="60">
+ <md-toolbar role="toolbar" class="mat-secondary">
+ <button md-icon-button (click)="goBack()" color="accent">
+ <md-icon>arrow_back</md-icon>
+ </button>
+ <span class="md-title" i18n>{{form_title}}</span>
+ <span flex></span>
+ <button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
+ </md-toolbar>
+ <div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
+ <md-card flex="70">
+ <md-card-title>
+ {{form_subtitle}}
+ </md-card-title>
+ <md-divider></md-divider>
+ <md-card-content>
+ <form #packForm="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 mdInput maxLength="50" type="text" [(ngModel)]="data.code" name="code" required [readonly]="!isNew" />
+ <md-placeholder>
+ <span i18n="field.code"></span>
+ </md-placeholder>
+ </md-input-container>
+ <error-checker [fieldName]="getFieldName('code')" [formField]="packForm.controls.code"></error-checker>
+ </div>
+ <div layout="column" layout-fill flex>
+ <md-input-container>
+ <input mdInput type="number" [(ngModel)]="data.num_licenses" name="num_licenses" required />
+ <md-placeholder>
+ <span i18n="field.num_licenses"></span>
+ </md-placeholder>
+ </md-input-container>
+ <error-checker [fieldName]="getFieldName('num_licenses')" [formField]="packForm.controls.num_licenses"></error-checker>
+ </div>
+ </div>
+ <div layout="row" layout-fill layout-padding>
+ <div layout="column" layout-fill flex>
+ <md-checkbox labelPosition="after" [(ngModel)]="data.license_preactivation" name="license_preactivation">
+ <span i18n="field.license_preactivation"></span>
+ </md-checkbox>
+ </div>
+ <field-readonly [value]="packs.getStatusName(data.status)" label="field.status" flex *ngIf="!isNew"></field-readonly>
+ </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 />
+ <md-placeholder>
+ <span i18n="field.end_valid_date"></span>
+ </md-placeholder>
+ </md-input-container>
+ <error-checker [fieldName]="getFieldName('init_valid_date')" [formField]="packForm.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]="packForm.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]="packForm.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]="packForm.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]="packForm.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]="packForm.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>
+ </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>
+ </div>
+ </form>
+ </md-card-content>
+ <md-divider></md-divider>
+ <md-card-actions>
+ <div layout="row" layout-align="start center" class="margin">
+ <span flex></span>
+ <button [disabled]="!packForm.form.valid" md-raised-button color="primary" (click)="save()">Save</button>
+ <button md-button (click)="goBack()">Cancel</button>
</div>
- </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 />
- <md-placeholder>
- <span i18n="field.end_valid_date"></span>
- </md-placeholder>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('init_valid_date')" [formField]="packForm.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]="packForm.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]="packForm.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]="packForm.controls.license_type_id"></error-checker>
- </div>
- </div>
- <div layout="row" layout-fill layout-padding *ngIf="!isNew">
- <div layout="column" layout-fill flex>
- <div layout="column" class="mat-input-container" flex>
- <label class="mat-input-placeholder mat-float">
- <span class="placeholder" i18n="field.organization_id"></span>
- </label>
- <div class="label-value mat-input-element">{{data.organization_name}}</div>
- </div>
- </div>
- <div layout="column" layout-fill flex>
- <div layout="column" class="mat-input-container" flex>
- <label class="mat-input-placeholder mat-float">
- <span class="placeholder" i18n="field.license_type_id"></span>
- </label>
- <div class="label-value mat-input-element">{{data.licensetype_code}}</div>
- </div>
- </div>
- </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]="packForm.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]="packForm.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>
- </md-placeholder>
- <md-hint align="end">(max 1024)</md-hint>
- </md-input-container>
- </div>
- </div>
- <div layout="row" layout-fill layout-padding *ngIf="!isNew">
- <div layout="column" layout-fill flex>
- <div layout="column" class="mat-input-container" flex>
- <label class="mat-input-placeholder mat-float">
- <span class="placeholder" i18n="field.created_by_name"></span>
- </label>
- <div class="label-value mat-input-element">{{data.created_by_name}}</div>
- </div>
- </div>
- <div layout="column" layout-fill flex>
- <div layout="column" class="mat-input-container" flex>
- <label class="mat-input-placeholder mat-float">
- <span class="placeholder" i18n="field.creation_timestamp"></span>
- </label>
- <div class="label-value mat-input-element">{{data.creation_timestamp | date: 'medium'}}</div>
- </div>
- </div>
- </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>
+ </md-card-actions>
+ </md-card>
</div>
-</md-dialog-content>
-<div flex></div>
-<md-divider></md-divider>
-<md-dialog-actions layout="row" layout-align="end center">
- <button [disabled]="!packForm.form.valid" md-raised-button color="primary" (click)="save()">Save</button>
- <button md-button md-dialog-close>Cancel</button>
-</md-dialog-actions>
-</div>
-</form>
+</td-layout-card-over>
\ No newline at end of file
--
Gitblit v1.3.2