re-importing latest customer.jdl from master branch
This commit is contained in:
@ -71,11 +71,18 @@
|
||||
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.asset.member" for="field_member">Member</label>
|
||||
<select class="form-control" id="field_member" name="member" [(ngModel)]="asset.memberId" >
|
||||
<option [ngValue]="null"></option>
|
||||
<select class="form-control" id="field_member" name="member" [(ngModel)]="asset.memberId" required>
|
||||
<option *ngIf="!editForm.value.member" [ngValue]="null" selected></option>
|
||||
<option [ngValue]="membershipOption.id" *ngFor="let membershipOption of memberships; trackBy: trackMembershipById">{{membershipOption.id}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div [hidden]="!(editForm.controls.member?.dirty && editForm.controls.member?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.member?.errors?.required"
|
||||
jhiTranslate="entity.validation.required">
|
||||
This field is required.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button type="button" id="cancel-save" class="btn btn-secondary" (click)="previousState()">
|
||||
|
@ -13,6 +13,26 @@
|
||||
<dd>
|
||||
<span>{{customer.prefix}}</span>
|
||||
</dd>
|
||||
<dt><span jhiTranslate="hsadminNgApp.customer.name">Name</span></dt>
|
||||
<dd>
|
||||
<span>{{customer.name}}</span>
|
||||
</dd>
|
||||
<dt><span jhiTranslate="hsadminNgApp.customer.contractualAddress">Contractual Address</span></dt>
|
||||
<dd>
|
||||
<span>{{customer.contractualAddress}}</span>
|
||||
</dd>
|
||||
<dt><span jhiTranslate="hsadminNgApp.customer.contractualSalutation">Contractual Salutation</span></dt>
|
||||
<dd>
|
||||
<span>{{customer.contractualSalutation}}</span>
|
||||
</dd>
|
||||
<dt><span jhiTranslate="hsadminNgApp.customer.billingAddress">Billing Address</span></dt>
|
||||
<dd>
|
||||
<span>{{customer.billingAddress}}</span>
|
||||
</dd>
|
||||
<dt><span jhiTranslate="hsadminNgApp.customer.billingSalutation">Billing Salutation</span></dt>
|
||||
<dd>
|
||||
<span>{{customer.billingSalutation}}</span>
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
<button type="submit"
|
||||
|
@ -47,6 +47,86 @@
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.customer.name"
|
||||
for="field_name">Name</label>
|
||||
<input type="text" class="form-control" name="name" id="field_name"
|
||||
[(ngModel)]="customer.name" required maxlength="80"/>
|
||||
<div [hidden]="!(editForm.controls.name?.dirty && editForm.controls.name?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.name?.errors?.required"
|
||||
jhiTranslate="entity.validation.required">
|
||||
This field is required.
|
||||
</small>
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.name?.errors?.maxlength"
|
||||
jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 80 }">
|
||||
This field cannot be longer than 80 characters.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.customer.contractualAddress"
|
||||
for="field_contractualAddress">Contractual Address</label>
|
||||
<input type="text" class="form-control" name="contractualAddress" id="field_contractualAddress"
|
||||
[(ngModel)]="customer.contractualAddress" required maxlength="400"/>
|
||||
<div
|
||||
[hidden]="!(editForm.controls.contractualAddress?.dirty && editForm.controls.contractualAddress?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.contractualAddress?.errors?.required"
|
||||
jhiTranslate="entity.validation.required">
|
||||
This field is required.
|
||||
</small>
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.contractualAddress?.errors?.maxlength"
|
||||
jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 400 }">
|
||||
This field cannot be longer than 400 characters.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.customer.contractualSalutation"
|
||||
for="field_contractualSalutation">Contractual Salutation</label>
|
||||
<input type="text" class="form-control" name="contractualSalutation"
|
||||
id="field_contractualSalutation"
|
||||
[(ngModel)]="customer.contractualSalutation" maxlength="80"/>
|
||||
<div
|
||||
[hidden]="!(editForm.controls.contractualSalutation?.dirty && editForm.controls.contractualSalutation?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.contractualSalutation?.errors?.maxlength"
|
||||
jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 80 }">
|
||||
This field cannot be longer than 80 characters.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.customer.billingAddress"
|
||||
for="field_billingAddress">Billing Address</label>
|
||||
<input type="text" class="form-control" name="billingAddress" id="field_billingAddress"
|
||||
[(ngModel)]="customer.billingAddress" maxlength="400"/>
|
||||
<div
|
||||
[hidden]="!(editForm.controls.billingAddress?.dirty && editForm.controls.billingAddress?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.billingAddress?.errors?.maxlength"
|
||||
jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 400 }">
|
||||
This field cannot be longer than 400 characters.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.customer.billingSalutation"
|
||||
for="field_billingSalutation">Billing Salutation</label>
|
||||
<input type="text" class="form-control" name="billingSalutation" id="field_billingSalutation"
|
||||
[(ngModel)]="customer.billingSalutation" maxlength="80"/>
|
||||
<div
|
||||
[hidden]="!(editForm.controls.billingSalutation?.dirty && editForm.controls.billingSalutation?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.billingSalutation?.errors?.maxlength"
|
||||
jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 80 }">
|
||||
This field cannot be longer than 80 characters.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div>
|
||||
|
@ -17,6 +17,22 @@
|
||||
<th jhiSortBy="id"><span jhiTranslate="global.field.id">ID</span> <fa-icon [icon]="'sort'"></fa-icon></th>
|
||||
<th jhiSortBy="number"><span jhiTranslate="hsadminNgApp.customer.number">Number</span> <fa-icon [icon]="'sort'"></fa-icon></th>
|
||||
<th jhiSortBy="prefix"><span jhiTranslate="hsadminNgApp.customer.prefix">Prefix</span> <fa-icon [icon]="'sort'"></fa-icon></th>
|
||||
<th jhiSortBy="name"><span jhiTranslate="hsadminNgApp.customer.name">Name</span>
|
||||
<fa-icon [icon]="'sort'"></fa-icon>
|
||||
</th>
|
||||
<th jhiSortBy="contractualAddress"><span jhiTranslate="hsadminNgApp.customer.contractualAddress">Contractual Address</span>
|
||||
<fa-icon [icon]="'sort'"></fa-icon>
|
||||
</th>
|
||||
<th jhiSortBy="contractualSalutation"><span jhiTranslate="hsadminNgApp.customer.contractualSalutation">Contractual Salutation</span>
|
||||
<fa-icon [icon]="'sort'"></fa-icon>
|
||||
</th>
|
||||
<th jhiSortBy="billingAddress"><span
|
||||
jhiTranslate="hsadminNgApp.customer.billingAddress">Billing Address</span>
|
||||
<fa-icon [icon]="'sort'"></fa-icon>
|
||||
</th>
|
||||
<th jhiSortBy="billingSalutation"><span jhiTranslate="hsadminNgApp.customer.billingSalutation">Billing Salutation</span>
|
||||
<fa-icon [icon]="'sort'"></fa-icon>
|
||||
</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -25,6 +41,11 @@
|
||||
<td><a [routerLink]="['/customer', customer.id, 'view' ]">{{customer.id}}</a></td>
|
||||
<td>{{customer.number}}</td>
|
||||
<td>{{customer.prefix}}</td>
|
||||
<td>{{customer.name}}</td>
|
||||
<td>{{customer.contractualAddress}}</td>
|
||||
<td>{{customer.contractualSalutation}}</td>
|
||||
<td>{{customer.billingAddress}}</td>
|
||||
<td>{{customer.billingSalutation}}</td>
|
||||
<td class="text-right">
|
||||
<div class="btn-group flex-btn-group-container">
|
||||
<button type="submit"
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
@NgModule({
|
||||
@ -24,6 +24,22 @@ import { RouterModule } from '@angular/router';
|
||||
path: 'share',
|
||||
loadChildren: './share/share.module#HsadminNgShareModule'
|
||||
},
|
||||
{
|
||||
path: 'asset',
|
||||
loadChildren: './asset/asset.module#HsadminNgAssetModule'
|
||||
},
|
||||
{
|
||||
path: 'customer',
|
||||
loadChildren: './customer/customer.module#HsadminNgCustomerModule'
|
||||
},
|
||||
{
|
||||
path: 'membership',
|
||||
loadChildren: './membership/membership.module#HsadminNgMembershipModule'
|
||||
},
|
||||
{
|
||||
path: 'share',
|
||||
loadChildren: './share/share.module#HsadminNgShareModule'
|
||||
},
|
||||
{
|
||||
path: 'asset',
|
||||
loadChildren: './asset/asset.module#HsadminNgAssetModule'
|
||||
|
@ -38,11 +38,19 @@
|
||||
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.membership.customer" for="field_customer">Customer</label>
|
||||
<select class="form-control" id="field_customer" name="customer" [(ngModel)]="membership.customerId" >
|
||||
<option [ngValue]="null"></option>
|
||||
<select class="form-control" id="field_customer" name="customer" [(ngModel)]="membership.customerId"
|
||||
required>
|
||||
<option *ngIf="!editForm.value.customer" [ngValue]="null" selected></option>
|
||||
<option [ngValue]="customerOption.id" *ngFor="let customerOption of customers; trackBy: trackCustomerById">{{customerOption.prefix}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div [hidden]="!(editForm.controls.customer?.dirty && editForm.controls.customer?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.customer?.errors?.required"
|
||||
jhiTranslate="entity.validation.required">
|
||||
This field is required.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button type="button" id="cancel-save" class="btn btn-secondary" (click)="previousState()">
|
||||
|
@ -67,11 +67,18 @@
|
||||
|
||||
<div class="form-group">
|
||||
<label class="form-control-label" jhiTranslate="hsadminNgApp.share.member" for="field_member">Member</label>
|
||||
<select class="form-control" id="field_member" name="member" [(ngModel)]="share.memberId" >
|
||||
<option [ngValue]="null"></option>
|
||||
<select class="form-control" id="field_member" name="member" [(ngModel)]="share.memberId" required>
|
||||
<option *ngIf="!editForm.value.member" [ngValue]="null" selected></option>
|
||||
<option [ngValue]="membershipOption.id" *ngFor="let membershipOption of memberships; trackBy: trackMembershipById">{{membershipOption.id}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div [hidden]="!(editForm.controls.member?.dirty && editForm.controls.member?.invalid)">
|
||||
<small class="form-text text-danger"
|
||||
[hidden]="!editForm.controls.member?.errors?.required"
|
||||
jhiTranslate="entity.validation.required">
|
||||
This field is required.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button type="button" id="cancel-save" class="btn btn-secondary" (click)="previousState()">
|
||||
|
@ -1,12 +1,17 @@
|
||||
import { IMembership } from 'app/shared/model/membership.model';
|
||||
import { ICustomerContact } from 'app/shared/model/customer-contact.model';
|
||||
import { IMembership } from 'app/shared/model/membership.model';
|
||||
|
||||
export interface ICustomer {
|
||||
id?: number;
|
||||
number?: number;
|
||||
prefix?: string;
|
||||
memberships?: IMembership[];
|
||||
name?: string;
|
||||
contractualAddress?: string;
|
||||
contractualSalutation?: string;
|
||||
billingAddress?: string;
|
||||
billingSalutation?: string;
|
||||
roles?: ICustomerContact[];
|
||||
memberships?: IMembership[];
|
||||
}
|
||||
|
||||
export class Customer implements ICustomer {
|
||||
@ -14,7 +19,12 @@ export class Customer implements ICustomer {
|
||||
public id?: number,
|
||||
public number?: number,
|
||||
public prefix?: string,
|
||||
public memberships?: IMembership[],
|
||||
public roles?: ICustomerContact[]
|
||||
public name?: string,
|
||||
public contractualAddress?: string,
|
||||
public contractualSalutation?: string,
|
||||
public billingAddress?: string,
|
||||
public billingSalutation?: string,
|
||||
public roles?: ICustomerContact[],
|
||||
public memberships?: IMembership[]
|
||||
) {}
|
||||
}
|
||||
|
@ -17,8 +17,13 @@
|
||||
},
|
||||
"number": "Number",
|
||||
"prefix": "Prefix",
|
||||
"membership": "Membership",
|
||||
"role": "Role"
|
||||
"name": "Name",
|
||||
"contractualAddress": "Contractual Address",
|
||||
"contractualSalutation": "Contractual Salutation",
|
||||
"billingAddress": "Billing Address",
|
||||
"billingSalutation": "Billing Salutation",
|
||||
"role": "Role",
|
||||
"membership": "Membership"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -17,8 +17,13 @@
|
||||
},
|
||||
"number": "Number",
|
||||
"prefix": "Prefix",
|
||||
"membership": "Membership",
|
||||
"role": "Role"
|
||||
"name": "Name",
|
||||
"contractualAddress": "Contractual Address",
|
||||
"contractualSalutation": "Contractual Salutation",
|
||||
"billingAddress": "Billing Address",
|
||||
"billingSalutation": "Billing Salutation",
|
||||
"role": "Role",
|
||||
"membership": "Membership"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user