UI changes

This commit is contained in:
saravanakumarkandasami 2018-10-12 16:56:45 +05:30
parent 30073db984
commit 5b1d626ba2
28 changed files with 280 additions and 60 deletions

View File

@ -1,5 +1,171 @@
<div class="pad-wrap"> <div class="pad-wrap">
<p> <div fxLayout="row wrap">
Dashboard! <div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
</p> <mat-card>
<div class="wheather-widget text-center grad-blue">
<div class="wheather-today">
<h3>PD Triggered</h3>
</div>
<div fxLayout="row wrap">
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Full PD</p>
<h3>13</h3>
</div>
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Smart PD</p>
<h3>13</h3>
</div>
</div>
</div>
</mat-card>
</div>
<div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
<mat-card>
<div class="wheather-widget text-center grad-blue">
<div class="wheather-today">
<h3>PD Allocated</h3>
</div>
<div fxLayout="row wrap">
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Full PD</p>
<h3>33</h3>
</div>
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Smart PD</p>
<h3>5</h3>
</div>
</div>
</div>
</mat-card>
</div>
<div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
<mat-card>
<div class="wheather-widget text-center grad-blue">
<div class="wheather-today">
<h3>PD Scheduled</h3>
</div>
<div fxLayout="row wrap">
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Full PD</p>
<h3>20</h3>
</div>
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Smart PD</p>
<h3>6</h3>
</div>
</div>
</div>
</mat-card>
</div>
</div>
<!--Second row card's section-->
<div fxLayout="row wrap">
<div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
<mat-card>
<div class="wheather-widget text-center grad-blue">
<div class="wheather-today">
<h3>PD Progress</h3>
</div>
<div fxLayout="row wrap">
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Full PD</p>
<h3>34</h3>
</div>
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Smart PD</p>
<h3>9</h3>
</div>
</div>
</div>
</mat-card>
</div>
<div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
<mat-card>
<div class="wheather-widget text-center grad-blue">
<div class="wheather-today">
<h3>PD Completed</h3>
</div>
<div fxLayout="row wrap">
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Full PD</p>
<h3>65</h3>
</div>
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Smart PD</p>
<h3>24</h3>
</div>
</div>
</div>
</mat-card>
</div>
<div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
<mat-card>
<div class="wheather-widget text-center grad-blue">
<div class="wheather-today">
<h3>QC Completed</h3>
</div>
<div fxLayout="row wrap">
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Full PD</p>
<h3>47</h3>
</div>
<div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
<p>Smart PD</p>
<h3>29</h3>
</div>
</div>
</div>
</mat-card>
</div>
</div>
<!--Lender,Citywise, Same Status-->
<div fxLayout="row wrap">
<div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap p-gap">
<mat-card>
<mat-card-title>Lender</mat-card-title>
<mat-card-subtitle>PD Triggered Today</mat-card-subtitle>
<hr>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="lenderpd">
<mat-list-item>
<h3 mat-line> {{item.lendername}} / {{item.billingaddr}} </h3>
<p mat-line> Full PD -{{item.fullpd}} / Smart PD -{{item.smartpd}} </p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card>
</div>
<div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap p-gap">
<mat-card>
<mat-card-title>Citywise</mat-card-title>
<mat-card-subtitle>PD Triggered Today</mat-card-subtitle>
<hr>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="citywisepd">
<mat-list-item>
<h3 mat-line> {{item.cityname}} </h3>
<p mat-line> Full PD -{{item.fullpd}} / Smart PD -{{item.smartpd}} </p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card>
</div>
<div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap p-gap">
<mat-card>
<mat-card-title>Information</mat-card-title>
<mat-card-subtitle>PD In Same Status</mat-card-subtitle>
<hr>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="message">
<mat-list-item>
<img mat-list-avatar src="{{item.photo}}" alt="">
<h3 mat-line> {{item.applicantname}} </h3>
<p mat-line> {{item.applicantid}}</p>
<p mat-line> {{item.lendername}} - {{item.status}} </p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card>
</div>
</div>
</div> </div>

View File

@ -9,4 +9,57 @@ export class DashboardComponent {
constructor() { constructor() {
} }
//Lender wise PD Triggered
lenderpd: Object[] = [{
lendername:'ICICI',
billingaddr:'Bangalore',
fullpd:'9',
smartpd:'6',
}, {
lendername:'IOB',
billingaddr:'Chennai',
fullpd:'10',
smartpd:'5',
}, {
lendername:'SBI',
billingaddr:'Pune',
fullpd:'16',
smartpd:'3',
}, ];
//City Wise PD Triggered
citywisepd: Object[] = [{
cityname: 'Bangalore',
fullpd:'45',
smartpd:'17',
}, {
cityname: 'Chennai',
fullpd:'33',
smartpd:'16',
}, {
cityname: 'Salem',
fullpd:'22',
smartpd:'12',
}, ];
//Same status
message: Object[] = [{
applicantname: 'Saravana',
applicantid:'ICICITN0118000354',
lendername:'ICICI',
status:'Allocated',
photo: 'assets/images/face3.jpg',
}, {
applicantname: 'Kumaran',
applicantid:'IOBKA0418000578',
lendername:'IOB',
status:'Allocated',
photo: 'assets/images/face6.jpg',
}, {
applicantname: 'Priya',
applicantid:'SBIGA0118000241',
lendername:'SBI',
status:'Triggered',
photo: 'assets/images/face4.jpg',
}, ];
} }

View File

@ -17,11 +17,11 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field> <mat-form-field>
<!-- <ngx-select-dropdown [multiple]="false" [value]="citydatas.city_id" [options]="citydatas" ></ngx-select-dropdown> --> <!-- <ngx-select-dropdown [multiple]="false" [value]="citydatas.city_id" [options]="citydatas" ></ngx-select-dropdown> -->
<mat-select placeholder="Pick Up City name" required [formControl]="_branchForm.controls['fk_city_id']"> <mat-select placeholder="City Name" required [formControl]="_branchForm.controls['fk_city_id']">
<!-- <mat-option (click)="onChangedData()" *ngFor="let masters of masterArray" [value]="masters.value" [disabled]="masters.disabled"> --> <!-- <mat-option (click)="onChangedData()" *ngFor="let masters of masterArray" [value]="masters.value" [disabled]="masters.disabled"> -->
<mat-option *ngFor="let cd of citydatas" [value]="cd.city_id">{{ cd.name }}</mat-option> <mat-option *ngFor="let cd of citydatas" [value]="cd.city_id">{{ cd.name }}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</mat-error> <mat-error *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">City Name Required.</mat-error>
</mat-form-field> </mat-form-field>
<!-- <small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</small> --> <!-- <small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</small> -->
</div> </div>
@ -29,7 +29,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field> <mat-form-field>
<input matInput type="text" placeholder="Branch Name" required [formControl]="_branchForm.controls['name']"> <input matInput type="text" placeholder="Branch Name" required [formControl]="_branchForm.controls['name']">
<mat-error *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched">You must inculde a Branch Name</mat-error> <mat-error *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched">Branch Name Required</mat-error>
</mat-form-field> </mat-form-field>
<!-- <small *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</small> --> <!-- <small *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</small> -->
</div> </div>

View File

@ -17,7 +17,7 @@
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div>
</div> </div>
<mat-table [dataSource]="dataSource" *ngIf="!noRecordFound" matSort> <mat-table [dataSource]="dataSource" *ngIf="!noRecordFound" matSort>
<ng-container matColumnDef="serialno"> <ng-container matColumnDef="serialno">

View File

@ -31,17 +31,17 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field> <mat-form-field>
<mat-select placeholder="Pick Up State Name" required [formControl]="_cityForm.controls['fk_state_id']"> <mat-select placeholder="State Name" required [formControl]="_cityForm.controls['fk_state_id']">
<mat-option *ngFor="let sd of stateDatas" [value]="sd.state_id">{{ sd.name }}</mat-option> <mat-option *ngFor="let sd of stateDatas" [value]="sd.state_id">{{ sd.name }}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="!_cityForm.controls['fk_state_id'].valid && _cityForm.controls['fk_state_id'].touched" class="mat-text-warn">You must Pickup State Name.</mat-error> <mat-error *ngIf="!_cityForm.controls['fk_state_id'].valid && _cityForm.controls['fk_state_id'].touched" class="mat-text-warn">State Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field> <mat-form-field>
<input matInput type="text" placeholder="City Name" required [formControl]="_cityForm.controls['name']"> <input matInput type="text" placeholder="City Name" required [formControl]="_cityForm.controls['name']">
<mat-error *ngIf="!_cityForm.controls['name'].valid && _cityForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_cityForm.controls['name'].valid && _cityForm.controls['name'].touched" class="mat-text-warn">City Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -32,7 +32,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Rating" required [formControl]="_CommentOnLocalityForm.controls['rating']"> <input matInput type="text" placeholder="Rating" required [formControl]="_CommentOnLocalityForm.controls['rating']">
<mat-error *ngIf="!_CommentOnLocalityForm.controls['rating'].valid && _CommentOnLocalityForm.controls['rating'].touched" class="mat-text-warn">You must include a Rating.</mat-error> <mat-error *ngIf="!_CommentOnLocalityForm.controls['rating'].valid && _CommentOnLocalityForm.controls['rating'].touched" class="mat-text-warn">Rating Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -16,38 +16,38 @@
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Company Name" required [formControl]="_companyForm.controls['name']"> <input matInput type="text" placeholder="Company Name" required [formControl]="_companyForm.controls['name']">
<mat-error *ngIf="!_companyForm.controls['name'].valid && _companyForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_companyForm.controls['name'].valid && _companyForm.controls['name'].touched" class="mat-text-warn">Company Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Company addressline1" required [formControl]="_companyForm.controls['addressline1']"> <input matInput type="text" placeholder="Company Address Line1" required [formControl]="_companyForm.controls['addressline1']">
<mat-error *ngIf="!_companyForm.controls['addressline1'].valid && _companyForm.controls['addressline1'].touched" class="mat-text-warn">You must include a addressline1.</mat-error> <mat-error *ngIf="!_companyForm.controls['addressline1'].valid && _companyForm.controls['addressline1'].touched" class="mat-text-warn">Company Address Line1 Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Company addressline2" required [formControl]="_companyForm.controls['addressline2']"> <input matInput type="text" placeholder="Company Address Line2" required [formControl]="_companyForm.controls['addressline2']">
<mat-error *ngIf="!_companyForm.controls['addressline2'].valid && _companyForm.controls['addressline2'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_companyForm.controls['addressline2'].valid && _companyForm.controls['addressline2'].touched" class="mat-text-warn">Company Address Line2 Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Company addressline3" required [formControl]="_companyForm.controls['addressline3']"> <input matInput type="text" placeholder="Company Address Line3" required [formControl]="_companyForm.controls['addressline3']">
<mat-error *ngIf="!_companyForm.controls['addressline3'].valid && _companyForm.controls['addressline3'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_companyForm.controls['addressline3'].valid && _companyForm.controls['addressline3'].touched" class="mat-text-warn">Company Address Line3 Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<mat-select placeholder="Pick Up City name" required [formControl]="_companyForm.controls['city']"> <mat-select placeholder="City Name" required [formControl]="_companyForm.controls['city']">
<mat-option *ngFor="let cd of citydatas" [value]="cd.city_id">{{ cd.name }}</mat-option> <mat-option *ngFor="let cd of citydatas" [value]="cd.city_id">{{ cd.name }}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="!_companyForm.controls['city'].valid && _companyForm.controls['city'].touched" class="mat-text-warn">You must include a City.</mat-error> <mat-error *ngIf="!_companyForm.controls['city'].valid && _companyForm.controls['city'].touched" class="mat-text-warn">City Name Required.</mat-error>
</mat-form-field> </mat-form-field>
<!-- <small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</small> --> <!-- <small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</small> -->
</div> </div>
@ -55,7 +55,7 @@
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Pin code" required [formControl]="_companyForm.controls['pincode']"> <input matInput type="text" placeholder="Pin code" required [formControl]="_companyForm.controls['pincode']">
<mat-hint>pincode should be in 6 digit format</mat-hint> <mat-hint>Pincode should be in 6 digit format</mat-hint>
<!-- <mat-error *ngIf="_companyForm.controls['pincode'].hasError('required') && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include phone number.</mat-error> --> <!-- <mat-error *ngIf="_companyForm.controls['pincode'].hasError('required') && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include phone number.</mat-error> -->
<!-- <mat-error *ngIf="!_companyForm.controls['pincode'].valid && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include a pincode number.</mat-error> --> <!-- <mat-error *ngIf="!_companyForm.controls['pincode'].valid && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include a pincode number.</mat-error> -->
<mat-error *ngIf="_companyForm.controls['pincode'].hasError('minlength') && _companyForm.controls['pincode'].touched" class="mat-text-warn">Your pincode must be at least 5 characters long.</mat-error> <mat-error *ngIf="_companyForm.controls['pincode'].hasError('minlength') && _companyForm.controls['pincode'].touched" class="mat-text-warn">Your pincode must be at least 5 characters long.</mat-error>
@ -65,10 +65,10 @@
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<mat-select placeholder="Pick Up State Name" required [formControl]="_companyForm.controls['state']"> <mat-select placeholder="State Name" required [formControl]="_companyForm.controls['state']">
<mat-option *ngFor="let sd of stateDatas" [value]="sd.state_id">{{ sd.name }}</mat-option> <mat-option *ngFor="let sd of stateDatas" [value]="sd.state_id">{{ sd.name }}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="!_companyForm.controls['state'].valid && _companyForm.controls['state'].touched" class="mat-text-warn">You must Pickup a State.</mat-error> <mat-error *ngIf="!_companyForm.controls['state'].valid && _companyForm.controls['state'].touched" class="mat-text-warn">State Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -34,7 +34,7 @@ fxLayoutAlign="center">
<div class="mb-1"> <div class="mb-1">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Description" required [formControl]="_customerBehaviourForm.controls['description']"> <input matInput type="text" placeholder="Description" required [formControl]="_customerBehaviourForm.controls['description']">
<mat-error *ngIf="!_customerBehaviourForm.controls['description'].valid && _customerBehaviourForm.controls['description'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_customerBehaviourForm.controls['description'].valid && _customerBehaviourForm.controls['description'].touched" class="mat-text-warn">Description Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -34,7 +34,7 @@ fxLayoutAlign="center">
<div class="mb-1"> <div class="mb-1">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_customerSegmentForm.controls['name']"> <input matInput type="text" placeholder="Name" required [formControl]="_customerSegmentForm.controls['name']">
<mat-error *ngIf="!_customerSegmentForm.controls['name'].valid && _customerSegmentForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_customerSegmentForm.controls['name'].valid && _customerSegmentForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -42,7 +42,7 @@ fxLayoutAlign="center">
<div class="mb-1"> <div class="mb-1">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Abbrevation" required [formControl]="_customerSegmentForm.controls['abbr']"> <input matInput type="text" placeholder="Abbrevation" required [formControl]="_customerSegmentForm.controls['abbr']">
<mat-error *ngIf="!_customerSegmentForm.controls['abbr'].valid && _customerSegmentForm.controls['abbr'].touched" class="mat-text-warn">You must include a Abbrevation.</mat-error> <mat-error *ngIf="!_customerSegmentForm.controls['abbr'].valid && _customerSegmentForm.controls['abbr'].touched" class="mat-text-warn">Abbrevation Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -32,7 +32,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_designationForm.controls['name']"> <input matInput type="text" placeholder="Name" required [formControl]="_designationForm.controls['name']">
<mat-error *ngIf="!_designationForm.controls['name'].valid && _designationForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_designationForm.controls['name'].valid && _designationForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -42,7 +42,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Short Name" required [formControl]="_designationForm.controls['short_name']"> <input matInput type="text" placeholder="Short Name" required [formControl]="_designationForm.controls['short_name']">
<mat-error *ngIf="!_designationForm.controls['short_name'].valid && _designationForm.controls['short_name'].touched" class="mat-text-warn">You must include a Short Name.</mat-error> <mat-error *ngIf="!_designationForm.controls['short_name'].valid && _designationForm.controls['short_name'].touched" class="mat-text-warn">Short Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -34,7 +34,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Frequency Name" required [formControl]="_frequencyForm.controls['name']"> <input matInput type="text" placeholder="Frequency Name" required [formControl]="_frequencyForm.controls['name']">
<mat-error *ngIf="!_frequencyForm.controls['name'].valid && _frequencyForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_frequencyForm.controls['name'].valid && _frequencyForm.controls['name'].touched" class="mat-text-warn">Frequency Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -33,7 +33,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Classification Name" required [formControl]="_IndustryClassificationForm.controls['name']"> <input matInput type="text" placeholder="Classification Name" required [formControl]="_IndustryClassificationForm.controls['name']">
<mat-error *ngIf="!_IndustryClassificationForm.controls['name'].valid && _IndustryClassificationForm.controls['name'].touched" class="mat-text-warn">You must include a Classified Name.</mat-error> <mat-error *ngIf="!_IndustryClassificationForm.controls['name'].valid && _IndustryClassificationForm.controls['name'].touched" class="mat-text-warn">Classified Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -32,7 +32,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Lender Hierarchy Name" required [formControl]="_lenderHierarchyForm.controls['lender_hierarchy']"> <input matInput type="text" placeholder="Lender Hierarchy Name" required [formControl]="_lenderHierarchyForm.controls['lender_hierarchy']">
<mat-error *ngIf="!_lenderHierarchyForm.controls['lender_hierarchy'].valid && _lenderHierarchyForm.controls['lender_hierarchy'].touched" class="mat-text-warn">You must include a Lender Hierarchy Name.</mat-error> <mat-error *ngIf="!_lenderHierarchyForm.controls['lender_hierarchy'].valid && _lenderHierarchyForm.controls['lender_hierarchy'].touched" class="mat-text-warn">Lender Hierarchy Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -32,7 +32,7 @@ fxLayout="row">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_occupationForm.controls['name']"> <input matInput type="text" placeholder="Name" required [formControl]="_occupationForm.controls['name']">
<mat-error *ngIf="!_occupationForm.controls['name'].valid && _occupationForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_occupationForm.controls['name'].valid && _occupationForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -33,8 +33,8 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_pdLocationApproachForm.controls['description']"> <input matInput type="text" placeholder="Descriptiion" required [formControl]="_pdLocationApproachForm.controls['description']">
<mat-error *ngIf="!_pdLocationApproachForm.controls['description'].valid && _pdLocationApproachForm.controls['description'].touched" class="mat-text-warn">You must include a Description.</mat-error> <mat-error *ngIf="!_pdLocationApproachForm.controls['description'].valid && _pdLocationApproachForm.controls['description'].touched" class="mat-text-warn">Description Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -33,8 +33,8 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_pdTypeForm.controls['type_name']"> <input matInput type="text" placeholder="Type Name" required [formControl]="_pdTypeForm.controls['type_name']">
<mat-error *ngIf="!_pdTypeForm.controls['type_name'].valid && _pdTypeForm.controls['type_name'].touched" class="mat-text-warn">You must include a type_name.</mat-error> <mat-error *ngIf="!_pdTypeForm.controls['type_name'].valid && _pdTypeForm.controls['type_name'].touched" class="mat-text-warn">Type Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -32,7 +32,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Product Name" required [formControl]="_productMasterForm.controls['name']"> <input matInput type="text" placeholder="Product Name" required [formControl]="_productMasterForm.controls['name']">
<mat-error *ngIf="!_productMasterForm.controls['name'].valid && _productMasterForm.controls['name'].touched" class="mat-text-warn">You must include a Product name.</mat-error> <mat-error *ngIf="!_productMasterForm.controls['name'].valid && _productMasterForm.controls['name'].touched" class="mat-text-warn">Product Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -41,7 +41,7 @@ fxLayoutAlign="center">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Product Abbr" required [formControl]="_productMasterForm.controls['abbr']"> <input matInput type="text" placeholder="Product Abbr" required [formControl]="_productMasterForm.controls['abbr']">
</mat-form-field> </mat-form-field>
<mat-error *ngIf="!_productMasterForm.controls['abbr'].valid && _productMasterForm.controls['abbr'].touched" class="mat-text-warn">You must include a Product abbrevation.</mat-error> <mat-error *ngIf="!_productMasterForm.controls['abbr'].valid && _productMasterForm.controls['abbr'].touched" class="mat-text-warn">Product Abbrevation Required.</mat-error>
</div> </div>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">

View File

@ -16,7 +16,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Category Name" required [formControl]="_questionCategoryForm.controls['categroy_name']"> <input matInput type="text" placeholder="Category Name" required [formControl]="_questionCategoryForm.controls['categroy_name']">
<mat-error *ngIf="!_questionCategoryForm.controls['categroy_name'].valid && _questionCategoryForm.controls['categroy_name'].touched" class="mat-text-warn">You must include a category name.</mat-error> <mat-error *ngIf="!_questionCategoryForm.controls['categroy_name'].valid && _questionCategoryForm.controls['categroy_name'].touched" class="mat-text-warn">Category Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -34,7 +34,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_regionsForm.controls['name']"> <input matInput type="text" placeholder="Name" required [formControl]="_regionsForm.controls['name']">
<mat-error *ngIf="!_regionsForm.controls['name'].valid && _regionsForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_regionsForm.controls['name'].valid && _regionsForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -34,7 +34,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_relationShipForm.controls['name']"> <input matInput type="text" placeholder="Name" required [formControl]="_relationShipForm.controls['name']">
<mat-error *ngIf="!_relationShipForm.controls['name'].valid && _relationShipForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_relationShipForm.controls['name'].valid && _relationShipForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -32,17 +32,17 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field> <mat-form-field>
<mat-select placeholder="Pick Up Region Name" required [formControl]="_statesForm.controls['fk_region_id']"> <mat-select placeholder="Region Name" required [formControl]="_statesForm.controls['fk_region_id']">
<mat-option *ngFor="let sd of regionDatas" [value]="sd.region_id">{{ sd.name }}</mat-option> <mat-option *ngFor="let sd of regionDatas" [value]="sd.region_id">{{ sd.name }}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="!_statesForm.controls['fk_region_id'].valid && _statesForm.controls['fk_region_id'].touched" class="mat-text-warn">You must include a Region.</mat-error> <mat-error *ngIf="!_statesForm.controls['fk_region_id'].valid && _statesForm.controls['fk_region_id'].touched" class="mat-text-warn">Region Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Name" required [formControl]="_statesForm.controls['name']"> <input matInput type="text" placeholder="Name" required [formControl]="_statesForm.controls['name']">
<mat-error *ngIf="!_statesForm.controls['name'].valid && _statesForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_statesForm.controls['name'].valid && _statesForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -58,7 +58,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Code" required [formControl]="_statesForm.controls['code']"> <input matInput type="text" placeholder="Code" required [formControl]="_statesForm.controls['code']">
<mat-error *ngIf="!_statesForm.controls['code'].valid && _statesForm.controls['code'].touched" class="mat-text-warn">You must include a Code.</mat-error> <mat-error *ngIf="!_statesForm.controls['code'].valid && _statesForm.controls['code'].touched" class="mat-text-warn">Code Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -41,10 +41,10 @@ fxLayoutAlign="center">
</mat-form-field> --> </mat-form-field> -->
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field> <mat-form-field>
<mat-select placeholder="Pick Up Product Name" required [formControl]="_subProductMasterForm.controls['fk_product_id']"> <mat-select placeholder="Product Name" required [formControl]="_subProductMasterForm.controls['fk_product_id']">
<mat-option *ngFor="let sd of productDatas" [value]="sd.product_id">{{ sd.name }}</mat-option> <mat-option *ngFor="let sd of productDatas" [value]="sd.product_id">{{ sd.name }}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="!_subProductMasterForm.controls['fk_product_id'].valid && _subProductMasterForm.controls['fk_product_id'].touched" class="mat-text-warn">You must include a Product name.</mat-error> <mat-error *ngIf="!_subProductMasterForm.controls['fk_product_id'].valid && _subProductMasterForm.controls['fk_product_id'].touched" class="mat-text-warn">Product Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<!-- <mat-form-field style="width: 100%"> <!-- <mat-form-field style="width: 100%">
@ -56,7 +56,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Sub Product Name" required [formControl]="_subProductMasterForm.controls['name']"> <input matInput type="text" placeholder="Sub Product Name" required [formControl]="_subProductMasterForm.controls['name']">
<mat-error *ngIf="!_subProductMasterForm.controls['name'].valid && _subProductMasterForm.controls['name'].touched" class="mat-text-warn">You must include a Sub Product name.</mat-error> <mat-error *ngIf="!_subProductMasterForm.controls['name'].valid && _subProductMasterForm.controls['name'].touched" class="mat-text-warn">Sub Product Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -34,7 +34,7 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Title" required [formControl]="_titleForm.controls['name']"> <input matInput type="text" placeholder="Title" required [formControl]="_titleForm.controls['name']">
<mat-error *ngIf="!_titleForm.controls['name'].valid && _titleForm.controls['name'].touched" class="mat-text-warn">You must include a Title.</mat-error> <mat-error *ngIf="!_titleForm.controls['name'].valid && _titleForm.controls['name'].touched" class="mat-text-warn">Title Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -34,7 +34,7 @@ fxLayoutAlign="center">
<div class="mb-1"> <div class="mb-1">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Activity Name" required [formControl]="_activityMasterForm.controls['name']"> <input matInput type="text" placeholder="Activity Name" required [formControl]="_activityMasterForm.controls['name']">
<mat-error *ngIf="!_activityMasterForm.controls['name'].valid && _activityMasterForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_activityMasterForm.controls['name'].valid && _activityMasterForm.controls['name'].touched" class="mat-text-warn">Activity Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -32,7 +32,7 @@ fxLayoutAlign="center">
<div class="mb-1"> <div class="mb-1">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="text" placeholder="UOM Name" required [formControl]="_uomForm.controls['name']"> <input matInput type="text" placeholder="UOM Name" required [formControl]="_uomForm.controls['name']">
<mat-error *ngIf="!_uomForm.controls['name'].valid && _uomForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> <mat-error *ngIf="!_uomForm.controls['name'].valid && _uomForm.controls['name'].touched" class="mat-text-warn">UOM Name Required.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

View File

@ -23,8 +23,8 @@ export interface Master {
export class PdTeamService { export class PdTeamService {
//private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
private apiUrl = "http://localhost/sparqapi/api/"; //private apiUrl = "http://localhost/sparqapi/api/";
pk: { "primary_key": any; }; pk: { "primary_key": any; };

View File

@ -41,7 +41,7 @@
<mat-cell *matCellDef="let us"> {{us.role_name}} </mat-cell> <mat-cell *matCellDef="let us"> {{us.role_name}} </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Entity"> <ng-container matColumnDef="Entity">
<mat-header-cell *matHeaderCellDef mat-sort-header> ENTITIES </mat-header-cell> <mat-header-cell *matHeaderCellDef mat-sort-header>Entities </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.entitytypename}} </mat-cell> <mat-cell *matCellDef="let us"> {{us.entitytypename}} </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="IsActive"> <ng-container matColumnDef="IsActive">
@ -70,7 +70,7 @@
<ng-container matColumnDef="Actions"> <ng-container matColumnDef="Actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell> <mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-cell *matCellDef="let us"> <mat-cell *matCellDef="let us">
<a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editUserDetails(us.userid,us.aws_name)"><mat-icon>edit</mat-icon></a> <a mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editUserDetails(us.userid,us.aws_name)"><mat-icon>edit</mat-icon></a>
<!-- <a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="deleteuser(us)"><mat-icon>delete_forever</mat-icon></a> --> <!-- <a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="deleteuser(us)"><mat-icon>delete_forever</mat-icon></a> -->
<!-- <a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="adminedituser(us)"><mat-icon>account_circle</mat-icon></a> --> <!-- <a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="adminedituser(us)"><mat-icon>account_circle</mat-icon></a> -->
</mat-cell> </mat-cell>
@ -83,6 +83,6 @@
<!-- <div *ngIf="dataSource.length === 0">No records found</div> --> <!-- <div *ngIf="dataSource.length === 0">No records found</div> -->
<mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator> <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div> </div>
</mat-card-content> </mat-card-content>

View File

@ -5,6 +5,8 @@ import { MatPaginator, MatTableDataSource,MatSort } from '@angular/material';
import { UserService } from '../../service/user.service'; import { UserService } from '../../service/user.service';
import { DataSource } from '@angular/cdk/table'; import { DataSource } from '@angular/cdk/table';
import { CognitoService } from '../../../AwsService/cognito.service'; import { CognitoService } from '../../../AwsService/cognito.service';
@Component({ @Component({
selector: 'app-user-list', selector: 'app-user-list',
templateUrl: './user-list.component.html', templateUrl: './user-list.component.html',
@ -17,7 +19,9 @@ export class UserListComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
color="primary";
// pagination variable details
pageSize = 10;
userdata: any = []; userdata: any = [];
loader: boolean = false; loader: boolean = false;
@ -41,9 +45,6 @@ export class UserListComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
delete this.aws.localUserId; delete this.aws.localUserId;