Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge pd changes: kms

Browse Source
This commit is contained in:
gandhimathi 2018-10-15 21:28:25 +05:30
parent 8f42c76a94
commit b4f416ac43
46 changed files with 863 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ng6-seed/package-lock.json generated
View File

@ -4294,12 +4294,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -4314,17 +4316,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@ -4441,7 +4446,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@ -4453,6 +4459,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -4467,6 +4474,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -4474,12 +4482,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -4498,6 +4508,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -4578,7 +4589,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@ -4590,6 +4602,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -4711,6 +4724,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",

51
ng6-seed/src/app/dashboard/dashboard.component.html
View File

@ -1,4 +1,5 @@
<div class="pad-wrap">
<!-- <div class="pad-wrap">
<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>
@ -58,7 +59,6 @@
</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>
@ -118,47 +118,68 @@
</mat-card>
</div>
</div>
<!--Lender,Citywise, Same Status-->
=======
<div class="pad-wrap">
<div fxLayout="row wrap">
<div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap p-gap">
<div fxFlex.gt-sm="100" fxFlex.gt-xs="100" fxFlex="100">
<mat-card>
<mat-card-title>Lender</mat-card-title>
<mat-card-subtitle>PD Triggered Today</mat-card-subtitle>
<mat-card-title>Personal Discussion Details</mat-card-title>
<mat-card-subtitle></mat-card-subtitle>
<hr>
<mat-card-content>
<div class="w-100 h-300px">
<ngx-charts-bar-horizontal-stacked [scheme]="colorScheme" [results]="multi" [gradient]="gradient" [xAxis]="showXAxis" [yAxis]="showYAxis" [legend]="showLegend" [showXAxisLabel]="showXAxisLabel" [showYAxisLabel]="showYAxisLabel" [xAxisLabel]="yAxisLabel" [yAxisLabel]="xAxisLabel" (select)="onSelect($event)">
</ngx-charts-bar-horizontal-stacked>
</div>
</mat-card-content>
</mat-card>
</div>
</div>
<!--Lender,Citywise, Same Status-->
<!--
<div fxLayout="row wrap">
<div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
<mat-card>
<mat-card-title>Lenderwise</mat-card-title>
<mat-card-subtitle>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>
<p mat-line> Full -{{item.fullpd}} / Smart -{{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">
<div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
<mat-card>
<mat-card-title>Citywise</mat-card-title>
<mat-card-subtitle>PD Triggered Today</mat-card-subtitle>
<mat-card-subtitle>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>
<p mat-line> Full -{{item.fullpd}} / Smart -{{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">
<div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
<mat-card>
<mat-card-title>Information</mat-card-title>
<mat-card-subtitle>PD In Same Status</mat-card-subtitle>
<mat-card-title><span fxFlex="80">Alert</span> <span fxFlex="20"><mat-icon color="primary"> warning</mat-icon></span></mat-card-title>
<mat-card-subtitle>Unscheduled</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="">
<!--<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>
@ -168,4 +189,4 @@
</mat-card>
</div>
</div>
</div>
</div> -->

194
ng6-seed/src/app/dashboard/dashboard.component.ts
View File

@ -1,65 +1,157 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-dashboard',
templateUrl: './dashboard.component.html',
styleUrls: ['./dashboard.component.scss']
})
export class DashboardComponent {
//public single: any[];
//public multi: any[];
public showXAxis = true;
public showYAxis = true;
public gradient = false;
public showLegend = false;
public showXAxisLabel = true;
public xAxisLabel = 'Type';
public showYAxisLabel = true;
public yAxisLabel = 'Application';
public colorScheme = {
domain: ['#673ab7', '#f44336', '#009688 ', '#2196f3', '#ffd740 ', '#eb35bb ']
};
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',
}, ];
// //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',
// }, ];
//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',
}, ];
// multi: Object[] = [
// {
// name: 'Full',
// series: [
// {
// name: 'Triggered',
// value: 50
// },
// {
// name: 'Allocated',
// value: 29
// },
// {
// name: 'Schudled',
// value: 45
// },
// {
// name: 'InProgress',
// value: 67
// },
// {
// name: 'Completed',
// value: 34
// },{
// name: 'QC Completed',
// value: 22
// }
// ]
// },
// {
// name: 'Smart',
// series: [
// {
// name: 'Triggred',
// value: 60
// },
// {
// name: 'Allocated',
// value: 33
// },
// {
// name: 'Schudled',
// value: 76
// },
// {
// name: 'InProgress',
// value: 34
// },{
// name: 'Completed',
// value: 56
// },{
// name: 'QC Completed',
// value: 45
// }
// ]
// },
// ];
// //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',
// } ];
}

8
ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
View File

@ -26,17 +26,17 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Branch Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Branch </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="city_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> City Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> City</mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.city_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editBranch(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteCity(row.city_id)"><mat-icon>delete_outline</mat-icon></button> -->
@ -44,7 +44,7 @@
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"

4
ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html
View File

@ -100,12 +100,12 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> City Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> City </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="state_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> State Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> State </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.state_name}} </mat-cell>
</ng-container>

6
ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html
View File

@ -94,7 +94,7 @@
</ng-container>
<ng-container matColumnDef="rating">
<mat-header-cell *matHeaderCellDef mat-sort-header> Comments On Locality Rating </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Locality Rating </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.rating}} </mat-cell>
</ng-container>
@ -107,7 +107,7 @@
</ng-container> -->
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editCommentsOnLocality(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteCommentsOnLocality(row.comments_on_locality_id)"><mat-icon>delete_outline</mat-icon></button> -->
@ -115,7 +115,7 @@
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"

1
ng6-seed/src/app/settings/masters/component/company/company.component.html
View File

@ -79,3 +79,4 @@
</div>
</form>
</mat-card-content>
<notifier-container></notifier-container>

20
ng6-seed/src/app/settings/masters/component/company/company.component.ts
View File

@ -9,6 +9,7 @@ import { FormBuilder,
/** Service */
import { MastersService } from '../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({
@ -21,14 +22,15 @@ export class CompanyComponent implements OnInit {
public _companyForm: FormGroup;
public companyData: any = [];
private notifier: NotifierService;
stateDatas: any[];
citydatas: any[];
errorMessage:string;
constructor(private _formBuilder: FormBuilder,
private _mastersService: MastersService) { }
constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private _mastersService: MastersService) { this.notifier = notifier; }
FetchFormValue() {
this._mastersService.getAllCompany().subscribe(
@ -139,11 +141,12 @@ export class CompanyComponent implements OnInit {
dataresult=>{
if (dataresult.dataStatus == true){
alert("Data Saved Successfully");
//alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
}
else{
alert("SomeThing Wents Wrong Try Again !");
//alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
}
});
@ -153,11 +156,12 @@ export class CompanyComponent implements OnInit {
this._mastersService.editMasterDetails(CompanyFormValue,'COMPANY').subscribe(
dataresult=>{
if (dataresult.dataStatus == true){
alert("Data Edited Successfully");
//alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
}
else{
alert("SomeThing Wents Wrong Try Again !");
//alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
}
}

4
ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html
View File

@ -105,7 +105,7 @@
</ng-container>-->
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editCustomerBehaviour(row)" [color]="color"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteCustomerBehaviour(row.city_id)"><mat-icon>delete_outline</mat-icon></button> -->
@ -113,7 +113,7 @@
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <button mat-icon-button class="active" matTooltip="Active" matTooltipPosition="above" (click)="isactiveCustomerBehaviour(row.customer_behaviour_id,row.isactive)" *ngIf="row.isactive == 1;else notactive;"><mat-icon>done</mat-icon></button>
<ng-template #notactive><button mat-icon-button class="deactive" matTooltip="Inactive" matTooltipPosition="above" (click)="isactiveCustomerBehaviour(row.customer_behaviour_id,row.isactive)"><mat-icon>clear</mat-icon></button></ng-template> -->

6
ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html
View File

@ -94,13 +94,13 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header>Customer Segment</mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Segment</mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editCustomerSegment(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteCustomerSegment(row.city_id)"><mat-icon>delete_outline</mat-icon></button> -->
@ -109,7 +109,7 @@
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->

6
ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html
View File

@ -96,12 +96,12 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Designation Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Designation </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -124,7 +124,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button class="hover-icon" [color]="color" matTooltip="Edit" matTooltipPosition="above" (click)="editDesignation(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteDesignation(row.designation_id)"><mat-icon>delete_outline</mat-icon></button> -->

6
ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html
View File

@ -105,12 +105,12 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Frequency Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Frequency </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"
@ -131,7 +131,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editFrequency(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteFrequency(row.frequency_id)"><mat-icon>delete_outline</mat-icon></button> -->

12
ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html
View File

@ -34,16 +34,16 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Industry Classification Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Classification </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"
matTooltip="Active" matTooltipPosition="above"
checked="true" [color]="color"
@ -57,6 +57,12 @@
(change)="isactiveIndustryClassification(row.industry_classification_id,row.isactive)"
(click)="active()">
</mat-slide-toggle></ng-template>
<!-- <mat-slide-toggle
class="example-margin"
[matTooltip] = "row.isactive == 1 ? Inactive : Active"
matTooltipPosition="above"
(change)="isactiveIndustryClassification(row.industry_classification_id,row.isactive)"
(click)="active()"></mat-slide-toggle> -->
</mat-cell>
</ng-container>

8
ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html
View File

@ -90,17 +90,17 @@
</ng-container>
<ng-container matColumnDef="lender_hierarchy">
<mat-header-cell *matHeaderCellDef mat-sort-header> Lender Hierarchy </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Hierarchy </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.lender_hierarchy}} </mat-cell>
</ng-container>
<ng-container matColumnDef="cityname">
<mat-header-cell *matHeaderCellDef mat-sort-header> State Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> State</mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.cityname}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"
@ -121,7 +121,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editLenderHierarchy(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteLenderHierarchy(row.lender_hierarchy_id)"><mat-icon>delete_outline</mat-icon></button> -->

6
ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html
View File

@ -109,14 +109,14 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Occupation Non Earning Member </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Occupation </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"
@ -139,7 +139,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editMemberOccupation(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteMemberOccupation(row.occupation_non_earning_member_id)"><mat-icon>delete_outline</mat-icon></button> -->

4
ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html
View File

@ -28,12 +28,12 @@
</ng-container>
<ng-container matColumnDef="pd_allocation_type_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> PD Allocation Type </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Type </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.pd_allocation_type_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="pd_allocation_logic">
<mat-header-cell *matHeaderCellDef mat-sort-header> PD Allocation Logic </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Logic </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.pd_allocation_logic}} </mat-cell>
</ng-container>

2
ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html
View File

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

6
ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html
View File

@ -90,12 +90,12 @@
</ng-container>
<ng-container matColumnDef="description">
<mat-header-cell *matHeaderCellDef mat-sort-header> PD Location </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Location </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.description}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"
@ -118,7 +118,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editPdLocationApproach(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deletePdLocationApproach(row.pd_location_approach_id)"><mat-icon>delete_outline</mat-icon></button> -->

2
ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html
View File

@ -36,7 +36,7 @@
</ng-container>
<ng-container matColumnDef="pd_status_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> PD Status </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Status </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.pd_status_name}} </mat-cell>
<!-- <mat-checkbox [checked]="row.isPublish"></mat-checkbox> -->
</ng-container>

4
ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html
View File

@ -90,12 +90,12 @@
</ng-container>
<ng-container matColumnDef="type_name">
<mat-header-cell *matHeaderCellDef mat-sort-header>PD Type</mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Type</mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.type_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->

6
ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html
View File

@ -36,7 +36,7 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Product Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Product </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
@ -46,7 +46,7 @@
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon> -->
<!-- <ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -69,7 +69,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editProductMaster(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteProductMaster(row.product_id)"><mat-icon>delete_outline</mat-icon></button> -->

8
ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html
View File

@ -1,4 +1,4 @@
<!-- //question_categroy_id, categroy_name, createdon, fk_createdby, updatedon, fk_updatedby, isactive -->
<!-- //question_category_id, category_name, createdon, fk_createdby, updatedon, fk_updatedby, isactive -->
<div class="ml-xs mr-xs" style="width: 100%;"
fxLayout="row"
fxLayoutAlign="center">
@ -15,14 +15,14 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs">
<mat-form-field style="width: 100%">
<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">Category Name Required.</mat-error>
<input matInput type="text" placeholder="Category Name" required [formControl]="_questionCategoryForm.controls['category_name']">
<mat-error *ngIf="!_questionCategoryForm.controls['category_name'].valid && _questionCategoryForm.controls['category_name'].touched" class="mat-text-warn">Category Name Required.</mat-error>
</mat-form-field>
</div>
<div class="row" style="text-align:right;">
<button *ngIf="isEmptyObject(_questionCategoryForm.controls['question_categroy_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="ADD Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button>
<button *ngIf="isEmptyObject(_questionCategoryForm.controls['question_category_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="ADD Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button>
<ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetedited()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template>

8
ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts
View File

@ -31,8 +31,8 @@ export class QuestionCategoryDialogComponent implements OnInit {
formfunction(){
this._questionCategoryForm = this._formBuilder.group({
question_categroy_id: [this.data.question_categroy_id],
categroy_name: [this.data.categroy_name, Validators.compose([Validators.required])],
question_category_id: [this.data.question_category_id],
category_name: [this.data.category_name, Validators.compose([Validators.required])],
});
}
@ -44,7 +44,7 @@ export class QuestionCategoryDialogComponent implements OnInit {
/** To Save/Edited Popup Data */
onSubmit() {
var QuestionFormValues = this._questionCategoryForm.value;
if(isNaN(this.data.question_categroy_id)) {
if(isNaN(this.data.question_category_id)) {
Object.keys(QuestionFormValues).forEach((key) => ( QuestionFormValues[key] == null) && delete QuestionFormValues[key]);
@ -82,7 +82,7 @@ export class QuestionCategoryDialogComponent implements OnInit {
}
/** To Reset Popup Data */
onReset(){
this._questionCategoryForm.reset({ id: this.data.question_categroy_id });
this._questionCategoryForm.reset({ id: this.data.question_category_id });
}
onResetedited(){

18
ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
View File

@ -35,19 +35,25 @@
<mat-cell *matCellDef="let row; let i = index;"> {{row.serialno}} </mat-cell>
</ng-container>
<ng-container matColumnDef="categroy_name">
<<<<<<< HEAD
<ng-container matColumnDef="category_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Question Category Name </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.category_name}} </mat-cell>
=======
<ng-container matColumnDef="categroy_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Category </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.categroy_name}} </mat-cell>
>>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"
matTooltip="Active" matTooltipPosition="above"
checked="true" [color]="color"
(change)="isactiveQuestionCategory(row.question_categroy_id,row.isactive)"
(change)="isactiveQuestionCategory(row.question_category_id,row.isactive)"
(click)="deactive()">
</mat-slide-toggle>
<ng-template #notactive >
@ -55,14 +61,14 @@
class="example-margin"
matTooltip="Inactive" matTooltipPosition="above"
checked="false" [color]="color"
(change)="isactiveQuestionCategory(row.question_categroy_id,row.isactive)"
(change)="isactiveQuestionCategory(row.question_category_id,row.isactive)"
(click)="active()">
</mat-slide-toggle></ng-template>
</mat-cell>
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editQuestionCategory(row)"><mat-icon>edit</mat-icon></button>
</mat-cell>
@ -76,7 +82,7 @@
<!-- <mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator> -->
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<div *ngIf="noRecordFound" class="nocontent">No records found</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->
</mat-card-content>

10
ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts
View File

@ -35,8 +35,8 @@ export class QuestionCategoryListComponent implements OnInit {
public dataLength: number;
public dataSource = new MatTableDataSource();
// <!-- //question_categroy_id, categroy_name, createdon, fk_createdby, updatedon, fk_updatedby, isactive -->
displayedColumns = ['serialno','categroy_name','actions', 'isactive'];
// <!-- //question_category_id, category_name, createdon, fk_createdby, updatedon, fk_updatedby, isactive -->
displayedColumns = ['serialno','category_name','actions', 'isactive'];
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ -102,7 +102,7 @@ export class QuestionCategoryListComponent implements OnInit {
//To inactive the data
deleteQuestionCategory(id: number) {
var PrimaryKeyWithValue ={'question_categroy_id':id};
var PrimaryKeyWithValue ={'question_category_id':id};
this._MasterService.deleteMasterDetails(PrimaryKeyWithValue,'QUESTIONCATEGORY')
.subscribe( data => { });
this.getQuestionCategory();
@ -112,8 +112,8 @@ export class QuestionCategoryListComponent implements OnInit {
isactiveQuestionCategory(id: number,isactive : number) {
let ActiveDatas = isactive == 0
? { 'question_categroy_id':id,'isactive': '1'}
: { 'question_categroy_id':id,'isactive': '0'}
? { 'question_category_id':id,'isactive': '1'}
: { 'question_category_id':id,'isactive': '0'}
this._MasterService.editMasterDetails(ActiveDatas,'QUESTIONCATEGORY')
.subscribe(dataresult=>{

6
ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html
View File

@ -21,12 +21,12 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Region Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Region </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="row.isactive == 1;else notactive;"
class="example-margin"
@ -47,7 +47,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editregions(row)"><mat-icon>edit</mat-icon></button>

6
ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html
View File

@ -112,13 +112,13 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Relationship Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Relationship </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -141,7 +141,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editRelationShip(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteRelationShip(row.relationship_id)"><mat-icon>delete_outline</mat-icon></button> -->

8
ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html
View File

@ -131,17 +131,17 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> State Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> State </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="region_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Region Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Region </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.region_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -164,7 +164,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editState(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteState(row.state_id)"><mat-icon>delete_outline</mat-icon></button> -->

8
ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html
View File

@ -120,17 +120,17 @@
</ng-container>
<ng-container matColumnDef="product_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Product Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Product </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.product_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Sub-Product Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Sub-Product </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -153,7 +153,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editSubProductMaster(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteSubProductMaster(row.subproduct_id)"><mat-icon>delete_outline</mat-icon></button> -->

6
ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html
View File

@ -109,12 +109,12 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Title Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Title </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -137,7 +137,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editTitle(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteTitle(row.title_id)"><mat-icon>delete_outline</mat-icon></button> -->

6
ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html
View File

@ -103,12 +103,12 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Activity Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Activity </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -131,7 +131,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editActivity(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteActivity(row.type_of_activity_id)"><mat-icon>delete_outline</mat-icon></button> -->

6
ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html
View File

@ -29,13 +29,13 @@
</ng-container>
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> UOM Name </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header> UOM </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-header-cell *matHeaderCellDef mat-sort-header>Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
<ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template> -->
@ -58,7 +58,7 @@
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editUOM(row)"><mat-icon>edit</mat-icon></button>
<!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteUOM(row.uom_id)"><mat-icon>delete_outline</mat-icon></button> -->

198
ng6-seed/src/app/settings/masters/masters.component.html
View File

@ -11,94 +11,174 @@
[placeholderLabel]="'Find Masters...'"
[noEntriesFoundLabel]="'no matching found'">
</ngx-mat-select-search>
<mat-option *ngFor="let master of filteredMasters | async" [value]="master.id">
<!-- <mat-option *ngFor="let master of filteredMasters | async" [value]="master.id">
{{master.name}}
</mat-option> -->
<mat-option *ngFor="let master of filteredMasters | async" [value]="master.master_id">
{{master.master_name}}
</mat-option>
<mat-error *ngIf="masterCtrl.value ==''" class="mat-text-warn">You must Pickup Master Name.</mat-error>
<!-- <mat-error *ngIf="masterCtrl.value ==''" class="mat-text-warn">You must Pickup Master Name.</mat-error> -->
</mat-select>
</mat-form-field>
</div>
</div>
<div *ngIf="masterCtrl.value =='master-1'" >
<<<<<<< HEAD
<div *ngIf="masterCtrl.value =='1'">
<app-industry_classification-list></app-industry_classification-list>
</div>
<div *ngIf="masterCtrl.value =='2'">
<app-product-list></app-product-list>
</div>
<div *ngIf="masterCtrl.value =='3'">
<app-sub-product-list></app-sub-product-list>
</div>
<div *ngIf="masterCtrl.value =='4'">
<app-branch-list></app-branch-list>
</div>
<div *ngIf="masterCtrl.value =='5'">
<app-city-list></app-city-list>
</div>
<div *ngIf="masterCtrl.value =='6'">
<app-states-list></app-states-list>
</div>
<div *ngIf="masterCtrl.value =='7'">
<app-regions-list></app-regions-list>
</div>
<div *ngIf="masterCtrl.value =='8'">
<app-title-list></app-title-list>
</div>
<div *ngIf="masterCtrl.value =='9'">
<app-relation-ship-list></app-relation-ship-list>
</div>
<div *ngIf="masterCtrl.value =='10'" >
<app-members-occupation-list></app-members-occupation-list>
</div>
<div *ngIf="masterCtrl.value =='11'">
<app-activity-list></app-activity-list>
</div>
<div *ngIf="masterCtrl.value =='12'">
<app-uom-list></app-uom-list>
</div>
<div *ngIf="masterCtrl.value =='13'">
<app-pd-type-list></app-pd-type-list>
</div>
<div *ngIf="masterCtrl.value =='14'">
<app-pd-allocation-type-list>
</app-pd-allocation-type-list>
</div>
<div *ngIf="masterCtrl.value =='15'">
<app-pd-location-approach-list></app-pd-location-approach-list>
</div>
<div *ngIf="masterCtrl.value =='17'">
<app-comments-on-locality-list></app-comments-on-locality-list>
</div>
<div *ngIf="masterCtrl.value =='18'">
<app-customer-behaviour-list></app-customer-behaviour-list>
</div>
<div *ngIf="masterCtrl.value =='19'">
<app-customer-segment-list></app-customer-segment-list>
</div>
<div *ngIf="masterCtrl.value =='20'">
<app-frequency-list></app-frequency-list>
</div>
<div *ngIf="masterCtrl.value =='21'">
<app-designation-list></app-designation-list>
</div>
<div *ngIf="masterCtrl.value =='22'">
<!-- <app-company-list></app-company-list> -->
<app-company></app-company>
</div>
<div *ngIf="masterCtrl.value =='23'">
<app-lender-hierarchy-list></app-lender-hierarchy-list>
</div>
<div *ngIf="masterCtrl.value =='26'">
<app-pd-notification-list></app-pd-notification-list>
</div>
<div *ngIf="masterCtrl.value =='27'">
<app-question-category-list></app-question-category-list>
</div>
=======
<div *ngIf="masterCtrl.value =='1'">
<app-industry_classification-list></app-industry_classification-list>
</div>
<div *ngIf="masterCtrl.value =='master-2'">
<app-branch-list></app-branch-list>
<div *ngIf="masterCtrl.value =='2'">
<app-product-list></app-product-list>
</div>
<div *ngIf="masterCtrl.value =='master-3'">
<app-title-list></app-title-list>
<div *ngIf="masterCtrl.value =='3'">
<app-sub-product-list></app-sub-product-list>
</div>
<div *ngIf="masterCtrl.value =='master-4'">
<app-city-list></app-city-list>
<div *ngIf="masterCtrl.value =='4'">
<app-branch-list></app-branch-list>
</div>
<div *ngIf="masterCtrl.value =='master-5'">
<app-states-list></app-states-list>
<div *ngIf="masterCtrl.value =='5'">
<app-city-list></app-city-list>
</div>
<div *ngIf="masterCtrl.value =='master-6'">
<app-regions-list></app-regions-list>
<div *ngIf="masterCtrl.value =='6'">
<app-states-list></app-states-list>
</div>
<div *ngIf="masterCtrl.value =='master-7'">
<app-relation-ship-list></app-relation-ship-list>
<div *ngIf="masterCtrl.value =='7'">
<app-regions-list></app-regions-list>
</div>
<div *ngIf="masterCtrl.value =='master-8'">
<app-product-list></app-product-list>
<div *ngIf="masterCtrl.value =='8'">
<app-title-list></app-title-list>
</div>
<div *ngIf="masterCtrl.value =='master-9'">
<app-sub-product-list></app-sub-product-list>
<div *ngIf="masterCtrl.value =='9'">
<app-relation-ship-list></app-relation-ship-list>
</div>
<div *ngIf="masterCtrl.value =='master-10'" >
<app-members-occupation-list></app-members-occupation-list>
<div *ngIf="masterCtrl.value =='10'" >
<app-members-occupation-list></app-members-occupation-list>
</div>
<div *ngIf="masterCtrl.value =='master-11'">
<app-activity-list></app-activity-list>
<div *ngIf="masterCtrl.value =='11'">
<app-activity-list></app-activity-list>
</div>
<div *ngIf="masterCtrl.value =='master-12'">
<app-uom-list></app-uom-list>
<div *ngIf="masterCtrl.value =='12'">
<app-uom-list></app-uom-list>
</div>
<div *ngIf="masterCtrl.value =='master-13'">
<app-frequency-list></app-frequency-list>
<div *ngIf="masterCtrl.value =='13'">
<app-pd-type-list></app-pd-type-list>
</div>
<div *ngIf="masterCtrl.value =='master-14'">
<app-comments-on-locality-list></app-comments-on-locality-list>
<div *ngIf="masterCtrl.value =='14'">
<app-pd-allocation-type-list>
</app-pd-allocation-type-list>
</div>
<div *ngIf="masterCtrl.value =='master-15'">
<app-customer-behaviour-list></app-customer-behaviour-list>
</div>
<div *ngIf="masterCtrl.value =='master-16'">
<app-customer-segment-list></app-customer-segment-list>
</div>
<div *ngIf="masterCtrl.value =='master-17'">
<app-designation-list></app-designation-list>
</div>
<div *ngIf="masterCtrl.value =='master-18'">
<app-lender-hierarchy-list></app-lender-hierarchy-list>
</div>
<div *ngIf="masterCtrl.value =='master-19'">
<!-- <app-company-list></app-company-list> -->
<app-company></app-company>
</div>
<div *ngIf="masterCtrl.value =='master-20'">
<app-question-category-list></app-question-category-list>
</div>
<div *ngIf="masterCtrl.value =='master-21'">
<app-pd-type-list></app-pd-type-list>
</div>
<div *ngIf="masterCtrl.value =='master-22'">
<div *ngIf="masterCtrl.value =='15'">
<app-pd-location-approach-list></app-pd-location-approach-list>
</div>
<div *ngIf="masterCtrl.value =='master-23'">
<app-pd-allocation-type-list>
</app-pd-allocation-type-list>
<div *ngIf="masterCtrl.value =='17'">
<app-comments-on-locality-list></app-comments-on-locality-list>
</div>
<div *ngIf="masterCtrl.value =='master-24'">
<app-pd-notification-list></app-pd-notification-list>
<div *ngIf="masterCtrl.value =='18'">
<app-customer-behaviour-list></app-customer-behaviour-list>
</div>
<div *ngIf="masterCtrl.value =='19'">
<app-customer-segment-list></app-customer-segment-list>
</div>
<div *ngIf="masterCtrl.value =='20'">
<app-frequency-list></app-frequency-list>
</div>
<div *ngIf="masterCtrl.value =='21'">
<app-designation-list></app-designation-list>
</div>
<div *ngIf="masterCtrl.value =='22'">
<!-- <app-company-list></app-company-list> -->
<app-company></app-company>
</div>
<div *ngIf="masterCtrl.value =='23'">
<app-lender-hierarchy-list></app-lender-hierarchy-list>
</div>
<div *ngIf="masterCtrl.value =='26'">
<app-pd-notification-list></app-pd-notification-list>
</div>
<div *ngIf="masterCtrl.value =='27'">
<app-question-category-list></app-question-category-list>
</div>
>>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff
<!--<div *ngIf="masterCtrl.value =='master-25'">
<app-pd-office-lender-list></app-pd-office-lender-list>
</div>
<div *ngIf="masterCtrl.value =='master-26'">
<app-pd-team-list></app-pd-team-list>
</div>-->
</mat-card>

152
ng6-seed/src/app/settings/masters/masters.component.ts
View File

@ -17,6 +17,12 @@
name: string;
}
export interface Dbmaster{
master_id: number;
master_name: string;
constant_name: string;
}
// export interface Master {
// master_id: string;
// master_name: string;
@ -36,8 +42,15 @@
})
export class MastersComponent implements OnInit {
private dbmasters: Dbmaster[];
//public dbmasters: Dbmaster = new Dbmaster();
//public arr: Array<{master_id: number, master_name: string}>;
/* Normal Search Code
pickUpMasterData : string;
pickUpMasterData : string
constructor() {}
@ -99,37 +112,41 @@ export class MastersComponent implements OnInit {
/** list of masters */
private masters: Master[] = [
{id: 'master-1',name: 'Industry Classfication'},
{id: 'master-2',name: 'Branch'},
{id: 'master-3',name: 'Title'},
{id: 'master-4',name: 'City'},
{id: 'master-5',name: 'States'},
{id: 'master-6',name: 'Regions'},
{id: 'master-7',name: 'Relation Ship'},
{id: 'master-8',name: 'Product'},
{id: 'master-9',name: 'Sub Product'},
{id: 'master-10',name: 'Occupation of Non earning members'},
{id: 'master-11',name: 'Type of activity'},
{id: 'master-12',name: 'Unit of Measurement'},
{id: 'master-13',name: 'Frequency'},
{id: 'master-14',name: 'Comments on locality'},
{id: 'master-15',name: 'Customer Behaviour'},
{id: 'master-16',name: 'Customer Segment'},
{id: 'master-17',name: 'Designation'},
{id: 'master-18',name: 'Lender Hierarchy'},
{id: 'master-19',name: 'Company Details'},
{id: 'master-20',name: 'Question Category'},
{id: 'master-21',name: 'PD Type'},
{id: 'master-22',name: 'Approach to PD location'},
{id: 'master-23',name: 'PD Allocation Type'},
{id: 'master-24',name: 'PD Notification'},
// {id: 'master-25',name: 'PD Office Lender'},
// {id: 'master-25',name: 'PD Team'},
];
// private masters: Master[] = [
// {id: 'master-1',name: 'Industry Classfication'},
// {id: 'master-2',name: 'Branch'},
// {id: 'master-3',name: 'Title'},
// {id: 'master-4',name: 'City'},
// {id: 'master-5',name: 'States'},
// {id: 'master-6',name: 'Regions'},
// {id: 'master-7',name: 'Relation Ship'},
// {id: 'master-8',name: 'Product'},
// {id: 'master-9',name: 'Sub Product'},
// {id: 'master-10',name: 'Occupation of Non earning members'},
// {id: 'master-11',name: 'Type of activity'},
// {id: 'master-12',name: 'Unit of Measurement'},
// {id: 'master-13',name: 'Frequency'},
// {id: 'master-14',name: 'Comments on locality'},
// {id: 'master-15',name: 'Customer Behaviour'},
// {id: 'master-16',name: 'Customer Segment'},
// {id: 'master-17',name: 'Designation'},
// {id: 'master-18',name: 'Lender Hierarchy'},
// {id: 'master-19',name: 'Company Details'},
// {id: 'master-20',name: 'Question Category'},
// {id: 'master-21',name: 'PD Type'},
// {id: 'master-22',name: 'Approach to PD location'},
// {id: 'master-23',name: 'PD Allocation Type'},
// {id: 'master-24',name: 'PD Notification'},
// // {id: 'master-25',name: 'PD Office Lender'},
// // {id: 'master-25',name: 'PD Team'},
// ];
/** list of masters filtered by search keyword */
public filteredMasters: ReplaySubject<Master[]> = new ReplaySubject<Master[]>(1);
//public filteredMasters: ReplaySubject<Master[]> = new ReplaySubject<Master[]>(1);
public filteredMasters: ReplaySubject<Dbmaster[]> = new ReplaySubject<Dbmaster[]>(1);
@ViewChild('singleSelect') singleSelect: MatSelect;
@ -139,13 +156,34 @@ export class MastersComponent implements OnInit {
ngOnInit() {
// this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe((data:Master[]) => {
// this.masters = data;
// console.log(this.masters);
// });
console.log(this.masters);
//console.log(this.masters);
this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => {
this.dbmasters = data.records;
this.dbmasters = this.dbmasters.sort((a, b) => {
if (a.master_name > b.master_name) {
return 1;
}
if (a.master_name < b.master_name) {
return -1;
}
return 0;
});
this.filteredMasters.next(this.dbmasters.slice());
});
// load the initial master list
//this.filteredMasters.next(this.masters.slice());
//console.log(this.dbmasters.master_id);
// load the initial master list
this.filteredMasters.next(this.masters.slice());
// listen for search field value changes
this.masterFilterCtrl.valueChanges
@ -158,6 +196,7 @@ export class MastersComponent implements OnInit {
ngAfterViewInit() {
//this.setInitialValue();
//console.log('ngafterViewInit',this.dbmasters);
}
ngOnDestroy() {
@ -182,21 +221,64 @@ export class MastersComponent implements OnInit {
// }
private filterMasters() {
if (!this.masters) {
if (!this.dbmasters) {
return;
// this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => {
// this.dbmasters = data.records;
// if (!this.dbmasters) {
// return;
// }
//console.log(this.dbmasters);
}
// get the search keyword
let search = this.masterFilterCtrl.value;
if (!search) {
this.filteredMasters.next(this.masters.slice());
this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => {
this.dbmasters = data.records;
this.dbmasters = this.dbmasters.sort((a, b) => {
if (a.master_name > b.master_name) {
return 1;
}
if (a.master_name < b.master_name) {
return -1;
}
return 0;
});
this.filteredMasters.next(this.dbmasters.slice());
});
//this.filteredMasters.next(this.masters.slice());
return;
} else {
search = search.toLowerCase();
}
// filter the masters
this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => {
this.dbmasters = data.records;
this.dbmasters = this.dbmasters.sort((a, b) => {
if (a.master_name > b.master_name) {
return 1;
}
if (a.master_name < b.master_name) {
return -1;
}
return 0;
});
this.filteredMasters.next(
this.masters.filter(master => master.name.toLowerCase().indexOf(search) > -1)
//this.masters.filter(master => master.name.toLowerCase().indexOf(search) > -1)
this.dbmasters.filter(master => master.master_name.toLowerCase().indexOf(search) > -1)
);
});
//this.filteredMasters.next(this.dbmasters.slice());
}
}

7
ng6-seed/src/app/settings/masters/model/Dbmaster.ts Normal file
View File

@ -0,0 +1,7 @@
export class Dbmaster {
master_id: any;
master_name: any;
constant_name: any;
}

17
ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html
View File

@ -12,22 +12,23 @@
<div class="filter-container mat-elevation-z8">
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div *ngIf="!noRecordFound" class="ml-xs mr-xs" style="width: 90%;">
<div *ngIf="!noRecordFound" class="ml-xs mr-xs" style="width: 80%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</div>
<div *ngIf="noRecordFound" class="nocontent ml-xs mr-xs" style="width: 90%;">No records found</div>
<div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<<<<<<< HEAD
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" matTooltip="Add PD Team" matTooltipPosition="above" [routerLink]="['/setting/pdteam/addpdteam']" ><mat-icon>add</mat-icon></button>
=======
<div *ngIf="noRecordFound" class="nocontent ml-xs mr-xs" style="width: 80%;">No records found</div>
<div class="ml-xs mr-xs" style="width: 20%; text-align: right;">
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" matTooltip="Add PD Team" matTooltipPosition="above" [routerLink]="['/setting/pdteam/addpdteam']" ><mat-icon>add</mat-icon></button>
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="managepdteam()" matTooltip="Manage PD Team" matTooltipPosition="above"><mat-icon>people</mat-icon></button>
</div>
<div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<!-- <div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addPdTeam()" matTooltip="Add PD Team" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
>>>>>>> 3ad6314e0e602cb2c232acb142715009dca646f9
</div>
</div> -->
</div>
<mat-table *ngIf="!noRecordFound" [dataSource]="dataSource" matSort >

15
ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html
View File

@ -3,22 +3,23 @@
<div style="margin: 6px; padding: 4px;">
<div class="p_title" style="font-size: 26px; font-style: bold;">Manage PD Team</div>
<!--<div class="sub_title" style="font-size: 11px;">List of Entity Master Details</div>-->
<hr>
</div>
<div *ngIf="loader">
<mat-card>
<mat-card-content>
<!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" color="primary" class="mb-1"></mat-progress-bar>
</div>
</div>-->
<div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none" *ngIf="viewpage">
<div fxFlex="100%">
<div fxLayout="row wrap">
<div fxFlex.gt-sm="30" fxFlex.gt-xs="30" fxFlex="50" *ngFor="let pdteamdetails of pdTeamManageData; let i = index;" >
<div fxFlex.gt-sm="33" fxFlex.gt-xs="33" fxFlex="50" *ngFor="let pdteamdetails of pdTeamManageData; let i = index;" >
<mat-card class="mb-1">
<mat-card-title style="margin-bottom:0px!important;" ><span fxFlex="80">{{pdteamdetails.team_name | titlecase}}</span> <mat-icon (click)="cityinfo(pdteamdetails.pdteam_id)" color="primary" matTooltip="Click for more info" matTooltipPosition="above" fxFlex="16" style="text-align:right;">info</mat-icon></mat-card-title>
<mat-card-title style="margin-bottom:0px!important;font-size:19px;font-weight:800;" ><span fxFlex="80">{{pdteamdetails.team_name | titlecase}}</span> <mat-icon (click)="cityinfo(pdteamdetails.pdteam_id)" color="primary" matTooltip="Click for more info" matTooltipPosition="above" fxFlex="16" style="text-align:right;">info</mat-icon></mat-card-title>
<br/>
<mat-card-subtitle >{{pdteamdetails.short_name}}</mat-card-subtitle>
<hr>
@ -49,5 +50,7 @@
<div *ngIf="!viewpage" style="text-align: center">
<span>{{pdTeamManageData}}</span>
</div>
</mat-card-content>
</mat-card>
</mat-card>

207
ng6-seed/src/app/settings/users/register/register.component.html
View File

@ -1,78 +1,120 @@
<mat-card>
<mat-card-title>
USER REGISTRATION <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above"(click)="back()"><mat-icon>close</mat-icon>
</button> </mat-card-title>
<!-- <div class="profile-avatar">
<!-- <div class="profile-avatar">
<img fxFlexOffset="50px" [src]="'https://www.google.co.in/url?sa=i&rct=j&q=&esrc=s&source=images&cd=&ved=2ahUKEwi8qsnv7NPdAhWFWysKHZIZBDcQjRx6BAgBEAU&url=https%3A%2F%2Fwww.facebook.com%2FProfilePictures%2F&psig=AOvVaw12u0YbndUEVORSODg1OWeg&ust=1537885714967641'" style="width: 70px;height: 100px;border-radius: 50%;">
</div> -->
<!-- <mat-card-subtitle>Angular2 custom validation</mat-card-subtitle> -->
<form [formGroup]="regForm" (ngSubmit)="register(regForm.value)">
<mat-card-content>
<mat-card-title>Personal</mat-card-title><hr/>
<div fxFlex="100" fxLayout="row" fxLayoutAlign="start center">
<div dividerColor="primary" class="ml-xs mr-xs">
<div style="font-size:24px;"> User Registration</div>
</div>
<div dividerColor="primary" class="ml-xs mr-xs">
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="First Name" [formControl]="regForm.controls['firstName']" required>
<mat-error *ngIf="regForm.controls['firstName'].hasError('required') && regForm.controls['firstName'].touched" class="mat-text-warn">First Name Required.</mat-error>
<mat-error *ngIf="regForm.controls['firstName'].hasError('minlength') && regForm.controls['firstName'].touched" class="mat-text-warn">Atleast 5 Characters.</mat-error>
<mat-error *ngIf="regForm.controls['firstName'].hasError('maxlength') && regForm.controls['firstName'].touched" class="mat-text-warn">Not More Than 10 Characters.</mat-error>
</mat-form-field>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above"(click)="back()"><mat-icon>close</mat-icon></button>
</div>
</div>
<div fxLayout="row wrap">
<div fxFlex.gt-sm="33.33%" fxFlex="50" class="m-gap p-gap">
<mat-card>
<mat-card-title>Personal</mat-card-title><hr/>
<mat-card-content>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2">
<span dividerColor="primary" class="ml-xs mr-xs" *ngIf="profileaccess">
<img [src]="profileurl" style="width: 10%;border-radius: 50%;"></span>
<div style="width:80%">
User Profile
<input type="file" (change)="onFileChange($event)" [formControl]="regForm.controls['userpic']" accept="image/*" />
<br/>
<div *ngIf="imageaccess">
<img [src]="filename" style="width: 14%; border-radius: 50%;">
</div>
<span *ngIf="usersData !=''">
{{img}}
</span>
</div>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="First Name" [formControl]="regForm.controls['firstName']" required>
<mat-error *ngIf="regForm.controls['firstName'].hasError('required') && regForm.controls['firstName'].touched" class="mat-text-warn">First Name Required.</mat-error>
<mat-error *ngIf="regForm.controls['firstName'].hasError('minlength') && regForm.controls['firstName'].touched" class="mat-text-warn">Atleast 5 Characters.</mat-error>
<mat-error *ngIf="regForm.controls['firstName'].hasError('maxlength') && regForm.controls['firstName'].touched" class="mat-text-warn">Not More Than 10 Characters.</mat-error>
</mat-form-field>
<br>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Last Name" [formControl]="regForm.controls['lastName']" required>
<mat-error *ngIf="regForm.controls['lastName'].hasError('required') && regForm.controls['lastName'].touched" class="mat-text-warn">Last Name Required.</mat-error>
</mat-form-field>
<!-- <mat-error *ngIf="regForm.controls['lastName'].hasError('minlength') && regForm.controls['lastName'].touched" class="mat-text-warn">Your first name must be at least 5 characters long.</mat-error>
<mat-error *ngIf="regForm.controls['lastName'].hasError('maxlength') && regForm.controls['lastName'].touched" class="mat-text-warn">Your first name cannot exceed 10 characters.</mat-error> -->
<mat-form-field style="display: none;">
<input matInput placeholder="User Id" [formControl]="regForm.controls['userid']">
</mat-form-field>
<br>
<mat-slide-toggle color="primary" [formControl]="regForm.controls['isactive']">
Isactive
</mat-slide-toggle>
</div>
</mat-card-content>
</mat-card>
</div>
<div fxFlex.gt-sm="33.33%" fxFlex="50" class="m-gap p-gap">
<mat-card>
<mat-card-title>Contact</mat-card-title><hr/>
<mat-card-content>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Email Address" [formControl]="regForm.controls['email']" type="email" required>
<mat-error *ngIf="regForm.controls['email'].hasError('required') && regForm.controls['email'].touched" class="mat-text-warn">email Address Required.</mat-error>
<mat-error *ngIf="regForm.controls['email'].errors?.email && regForm.controls['email'].touched" class="mat-text-warn">Invalid Email Address.</mat-error>
</mat-form-field>
<br>
<!-- <mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Alt Email address" [formControl]="regForm.controls['altemail']" type="email">
</mat-form-field> -->
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Phone Number" [formControl]="regForm.controls['phone']" type="number" required>
<mat-error *ngIf="regForm.controls['phone'].hasError('required') && regForm.controls['phone'].touched" class="mat-text-warn">Phone Number Required.</mat-error>
<mat-error *ngIf="regForm.controls['phone'].errors?.phone && regForm.controls['phone'].touched" class="mat-text-warn">Invalid Phone Number.</mat-error>
</mat-form-field>
<br>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" >
<mat-select matInput placeholder="State" [formControl]="regForm.controls['state']" required (selectionChange)="getcity($event)" >
<mat-option>--</mat-option>
<mat-option *ngFor="let s of State" [value]="s" >
{{s.name}}
</mat-option>
</mat-select>
<mat-error *ngIf="regForm.controls['state'].hasError('required') && regForm.controls['state'].touched" class="mat-text-warn">State Required.</mat-error>
</mat-form-field><br>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" >
<mat-select matInput placeholder="City" [formControl]="regForm.controls['city']" required>
<mat-option>--</mat-option>
<mat-option *ngFor="let c of City" [value]="c">
{{c.name}}
</mat-option>
</mat-select>
<mat-error *ngIf="regForm.controls['city'].hasError('required') && regForm.controls['city'].touched" class="mat-text-warn">city Required.</mat-error>
</mat-form-field>
</div>
</mat-card-content>
</mat-card>
</div>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Last Name" [formControl]="regForm.controls['lastName']" required>
<mat-error *ngIf="regForm.controls['lastName'].hasError('required') && regForm.controls['lastName'].touched" class="mat-text-warn">Last Name Required.</mat-error>
</mat-form-field>
<!-- <mat-error *ngIf="regForm.controls['lastName'].hasError('minlength') && regForm.controls['lastName'].touched" class="mat-text-warn">Your first name must be at least 5 characters long.</mat-error>
<mat-error *ngIf="regForm.controls['lastName'].hasError('maxlength') && regForm.controls['lastName'].touched" class="mat-text-warn">Your first name cannot exceed 10 characters.</mat-error> -->
<mat-form-field style="display: none;">
<input matInput placeholder="User Id" [formControl]="regForm.controls['userid']">
</mat-form-field>
<span dividerColor="primary" class="ml-xs mr-xs" *ngIf="profileaccess">
<img [src]="profileurl" style="width: 10%;border-radius: 50%;"></span>
</div>
<mat-card-title>Account Details</mat-card-title><hr/><br/>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Email Address" [formControl]="regForm.controls['email']" type="email" required>
<mat-error *ngIf="regForm.controls['email'].hasError('required') && regForm.controls['email'].touched" class="mat-text-warn">email Address Required.</mat-error>
<mat-error *ngIf="regForm.controls['email'].errors?.email && regForm.controls['email'].touched" class="mat-text-warn">Invalid Email Address.</mat-error>
</mat-form-field>
<!-- <mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Alt Email address" [formControl]="regForm.controls['altemail']" type="email">
</mat-form-field> -->
<mat-form-field dividerColor="primary" class="ml-xs mr-xs">
<input matInput placeholder="Phone Number" [formControl]="regForm.controls['phone']" type="number" required>
<mat-error *ngIf="regForm.controls['phone'].hasError('required') && regForm.controls['phone'].touched" class="mat-text-warn">Phone Number Required.</mat-error>
<mat-error *ngIf="regForm.controls['phone'].errors?.phone && regForm.controls['phone'].touched" class="mat-text-warn">Invalid Phone Number.</mat-error>
</mat-form-field>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" >
<mat-select matInput placeholder="State" [formControl]="regForm.controls['state']" required (selectionChange)="getcity($event)" >
<mat-option>--</mat-option>
<mat-option *ngFor="let s of State" [value]="s" >
{{s.name}}
</mat-option>
</mat-select>
<mat-error *ngIf="regForm.controls['state'].hasError('required') && regForm.controls['state'].touched" class="mat-text-warn">State Required.</mat-error>
</mat-form-field>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" >
<mat-select matInput placeholder="City" [formControl]="regForm.controls['city']" required>
<mat-option>--</mat-option>
<mat-option *ngFor="let c of City" [value]="c">
{{c.name}}
</mat-option>
</mat-select>
<mat-error *ngIf="regForm.controls['city'].hasError('required') && regForm.controls['city'].touched" class="mat-text-warn">city Required.</mat-error>
</mat-form-field>
</div>
@ -134,7 +176,8 @@
<mat-error *ngIf="regForm.controls['city'].hasError('required') && regForm.controls['city'].touched" class="mat-text-warn">city Required.</mat-error>
</mat-form-field>
</div>-->
<mat-card-title>Role Information</mat-card-title><hr/><br/>
<mat-card> <mat-card-title>Role</mat-card-title><hr/>
<mat-card-content>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" >
<mat-select matInput placeholder="Enitity Type" (selectionChange)="checktype($event.value)" [formControl]="regForm.controls['type']"
@ -148,6 +191,7 @@
<mat-error *ngIf="regForm.controls['type'].errors?.phone && regForm.controls['type'].touched" class="mat-text-warn">Enitity Type Required</mat-error>
</mat-form-field>
<br>
<!-- <span *ngIf="roleload"> -->
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" *ngIf="typeValue == '2'">
<mat-select matInput placeholder="Lender Name" [formControl]="regForm.controls['lenVenName']" required>
@ -157,7 +201,9 @@
</mat-option>
</mat-select>
<mat-error *ngIf="regForm.controls['lenVenName'].hasError('required') && regForm.controls['lenVenName'].touched" class="mat-text-warn">Lender Name Required.</mat-error>
</mat-form-field>
<div></div>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" *ngIf="typeValue == '3'">
<mat-select matInput placeholder="Vendor Name" [formControl]="regForm.controls['lenVenName']" required>
<mat-option>--</mat-option>
@ -165,7 +211,10 @@
{{ent.full_name}}
</mat-option>
</mat-select><mat-error *ngIf="regForm.controls['lenVenName'].hasError('required') && regForm.controls['lenVenName'].touched" class="mat-text-warn">Vendor Name Required.</mat-error>
</mat-form-field>
</mat-form-field>
<div></div>
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" >
<mat-select matInput placeholder="Role" (selectionChange)="toggleAllSelection($event,regForm.controls['type'].value)" [formControl]="regForm.controls['role']" required>
<!-- <mat-option #allSelected (click)="toggleAllSelection()" [value]="0">ALL</mat-option> -->
@ -180,9 +229,12 @@
</mat-form-field>
</div>
<!-- <div fxLayout="row" fxLayoutAlign="start center" class="mb-2" *ngIf="roleAccess">
</mat-card-content>
</mat-card>
<!-- <mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;" >
</div>
<!-- <div fxLayout="row" fxLayoutAlign="start center" class="mb-2" *ngIf="roleAccess">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;" >
<mat-select matInput placeholder="Select Customer" [formControl]="regForm.controls['customer']" required (selectionChange)="getcity($event)">
<mat-option>--</mat-option>
<mat-option *ngFor="let C of customerSeg" [value]="C" >
@ -221,24 +273,7 @@
</mat-form-field> -->
</div>
<div fxLayout="row" class="mb-2" >
<div style="width:80%">
User Profile
<input type="file" (change)="onFileChange($event)" [formControl]="regForm.controls['userpic']" accept="image/*" />
<br/>
<div *ngIf="imageaccess">
<img [src]="filename" style="width: 14%; border-radius: 50%;">
</div>
<span *ngIf="usersData !=''">
{{img}}
</span>
</div>
<div style="width:20%">
<mat-slide-toggle color="primary" [formControl]="regForm.controls['isactive']">
Isactive
</mat-slide-toggle>
</div>
</div>
</mat-card-content>
<hr>
<!-- <pre>{{regForm.controls['userid'].value | json}}</pre> -->

162
ng6-seed/src/app/settings/users/user-list/user-list.component.html
View File

@ -1,88 +1,90 @@
<mat-card-content>
<div class="example-container mat-elevation-z8" style="margin-top:26px;">
<div *ngIf="loader">
<mat-progress-bar mode="indeterminate" color="accent" class="mb-1"></mat-progress-bar>
</div>
<div class="example-header">
<div style="font-size: 26px;">Users</div><hr/>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2" >
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
<label style="text-align: right;margin-left:50%;" fxLayoutAlign="start center" fxFlexOffset="50px">
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;"color="primary" (click)="add()"><mat-icon>add</mat-icon></button>
</label>
</div>
<div>
<mat-card>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-1">
<div class="ml-xs mr-xs">
<mat-card-title><span style="font-size:24px;"> Users</span></mat-card-title>
</div>
</div>
<mat-table [dataSource]="dataSource" matSort >
<mat-card-content>
<div class="example-container mat-elevation-z8" style="margin-top:26px;">
<div class="example-header">
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2" >
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
<label style="text-align: right;margin-left:57%;" fxLayoutAlign="start center" fxFlexOffset="50px">
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;"color="primary" (click)="add()"><mat-icon>add</mat-icon></button>
</label>
</div>
</div>
<mat-table [dataSource]="dataSource" matSort >
<ng-container matColumnDef="SerialNo">
<mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell>
<mat-cell *matCellDef="let us; let i = index;"> {{us.SerialNo}} </mat-cell>
</ng-container>
<ng-container matColumnDef="SerialNo">
<mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell>
<mat-cell *matCellDef="let us; let i = index;"> {{us.SerialNo}} </mat-cell>
</ng-container>
<ng-container matColumnDef="FullName">
<mat-header-cell *matHeaderCellDef mat-sort-header> Full Name </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.user_first_name}} {{us.user_last_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="FullName">
<mat-header-cell *matHeaderCellDef mat-sort-header>Name </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.user_first_name}} {{us.user_last_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="Email">
<mat-header-cell *matHeaderCellDef mat-sort-header> Email Id </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.email}} </mat-cell>
</ng-container>
<ng-container matColumnDef="Mobile">
<mat-header-cell *matHeaderCellDef mat-sort-header> Mobile No </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.mobile_no}} </mat-cell>
</ng-container>
<ng-container matColumnDef="Roles">
<mat-header-cell *matHeaderCellDef mat-sort-header> Roles </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.role_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="Entity">
<mat-header-cell *matHeaderCellDef mat-sort-header>Entities </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.entitytypename}} </mat-cell>
</ng-container>
<ng-container matColumnDef="IsActive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
<mat-cell *matCellDef="let us"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="us.isactive == 1;else notactive;"
class="example-margin"
matTooltip="Active" matTooltipPosition="above"
checked="true" [color]="color"
(change)="isactive(us.userid,us.aws_name)"
onclick="return confirm('Are you sure?')">
</mat-slide-toggle>
<ng-template #notactive >
<mat-slide-toggle
class="example-margin"
matTooltip="Inactive" matTooltipPosition="above"
checked="false" [color]="color"
(change)="isactive(us.userid,us.aws_name)"
onclick="return confirm('Are you sure?')">
</mat-slide-toggle></ng-template>
<!-- <a (click)="isactive(us.userid,us.aws_name)"><mat-icon *ngIf="us.isactive == 1;else notactive;" class="active" matTooltip="Active" matTooltipPosition="above">done</mat-icon></a>
<a (click)="isactive(us.userid,us.aws_name)"><ng-template #notactive ><mat-icon class="deactive" matTooltip="Inactive" matTooltipPosition="above">close</mat-icon></ng-template></a> -->
</mat-cell>
</ng-container>
<ng-container matColumnDef="Email">
<mat-header-cell *matHeaderCellDef mat-sort-header> Email </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.email}} </mat-cell>
</ng-container>
<ng-container matColumnDef="Mobile">
<mat-header-cell *matHeaderCellDef mat-sort-header> Mobile </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.mobile_no}} </mat-cell>
</ng-container>
<ng-container matColumnDef="Roles">
<mat-header-cell *matHeaderCellDef mat-sort-header> Role</mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.role_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="Entity">
<mat-header-cell *matHeaderCellDef mat-sort-header>Entity </mat-header-cell>
<mat-cell *matCellDef="let us"> {{us.entitytypename}} </mat-cell>
</ng-container>
<ng-container matColumnDef="IsActive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let us"><!--{{row.isactive}}-->
<mat-slide-toggle *ngIf="us.isactive == 1;else notactive;"
class="example-margin"
matTooltip="Active" matTooltipPosition="above"
checked="true" [color]="color"
(change)="isactive(us.userid,us.aws_name)"
(click)=deactive()>
</mat-slide-toggle>
<ng-template #notactive >
<mat-slide-toggle
class="example-margin"
matTooltip="Inactive" matTooltipPosition="above"
checked="false" [color]="color"
(change)="isactive(us.userid,us.aws_name)"
(click)=active()>
</mat-slide-toggle></ng-template>
<!-- <a (click)="isactive(us.userid,us.aws_name)"><mat-icon *ngIf="us.isactive == 1;else notactive;" class="active" matTooltip="Active" matTooltipPosition="above">done</mat-icon></a>
<a (click)="isactive(us.userid,us.aws_name)"><ng-template #notactive ><mat-icon class="deactive" matTooltip="Inactive" matTooltipPosition="above">close</mat-icon></ng-template></a> -->
</mat-cell>
</ng-container>
<ng-container matColumnDef="Actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-cell *matCellDef="let us">
<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)="adminedituser(us)"><mat-icon>account_circle</mat-icon></a> -->
</mat-cell>
</ng-container>
<ng-container matColumnDef="Actions">
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let us">
<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)="adminedituser(us)"><mat-icon>account_circle</mat-icon></a> -->
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;">
</mat-row>
</mat-table>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;">
</mat-row>
</mat-table>
<!-- <div *ngIf="dataSource.length === 0">No records found</div> -->
<mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
</mat-card-content>
</mat-card>
</div>
<mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
</mat-card-content>

39
ng6-seed/src/app/settings/users/user-list/user-list.component.ts
View File

@ -5,7 +5,8 @@ import { MatPaginator, MatTableDataSource,MatSort } from '@angular/material';
import { UserService } from '../../service/user.service';
import { DataSource } from '@angular/cdk/table';
import { CognitoService } from '../../../AwsService/cognito.service';
/**sweet alert */
import Swal from 'sweetalert2'
@Component({
selector: 'app-user-list',
@ -146,5 +147,41 @@ export class UserListComponent implements OnInit {
this.getusers();
})
}
//Sweetalert2 for active and deactive
active(){
Swal({
title: 'Are you sure?',
type: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Yes, activate it!'
}).then((result) => {
if (result.value) {
Swal(
'Activated!',
'success'
)
}
})
}
deactive()
{
Swal({
title: 'Are you sure?',
type: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Yes, deactivate it!'
}).then((result) => {
if (result.value) {
Swal(
'Deactivated!',
'success'
)
}
})
}
}

2
ng6-seed/src/app/template/questions/add/add.component.html
View File

@ -12,7 +12,7 @@
<div fxLayout="row" fxLayoutAlign="start none">
<mat-form-field class="ml-xs example-full-width">
<mat-select placeholder="Select Category" formControlName="fk_question_catagory">
<mat-option *ngFor="let ct of categories" [value]="ct.question_categroy_id">{{ ct.categroy_name }}</mat-option>
<mat-option *ngFor="let ct of categories" [value]="ct.question_category_id">{{ ct.category_name }}</mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_question_catagory.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
</mat-form-field>

2
ng6-seed/src/app/template/questions/edit/edit.component.html
View File

@ -13,7 +13,7 @@
<div fxLayout="row" fxLayoutAlign="start none">
<mat-form-field class="ml-xs example-full-width">
<mat-select placeholder="Select Category" formControlName="fk_question_catagory">
<mat-option *ngFor="let ct of categories" [value]="ct.question_categroy_id">{{ ct.categroy_name }}</mat-option>
<mat-option *ngFor="let ct of categories" [value]="ct.question_category_id">{{ ct.category_name }}</mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_question_catagory.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
</mat-form-field>

12
ng6-seed/src/app/template/questions/list/list.component.html
View File

@ -12,8 +12,8 @@
<mat-select placeholder="Category" formControlName="category">
<!--<ngx-mat-select-search [formControl]="masterFilterCtrl" ></ngx-mat-select-search>-->
<mat-option *ngFor="let cat of categories" [value]="cat.question_categroy_id" (click)="getQuestionsMasters()">
{{cat.categroy_name}}
<mat-option *ngFor="let cat of categories" [value]="cat.question_category_id" (click)="getQuestionsMasters()">
{{cat.category_name}}
</mat-option>
</mat-select>
</div>
@ -33,11 +33,11 @@
<div fxFlex="90%" style="padding: 12px 8px;">
<!--<div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="start none">
<div class="category-label"> {{ product.categroy_name }}</div>
<div class="category-label"> {{ product.category_name }}</div>
</div>-->
<div fxLayout="row" fxLayoutWrap fxLayoutAlign="none none">
<div class="ml-xs" fxFlex="20%">
{{ product.categroy_name }}
{{ product.category_name }}
</div>
<div class="ml-xs" fxFlex="80%">
<div class="text-line-limit">{{ product.question }}
@ -84,9 +84,9 @@
<div class="example-container mat-elevation-z8">
<mat-table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="categroy_name">
<ng-container matColumnDef="category_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Category </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.categroy_name}} </mat-cell>
<mat-cell *matCellDef="let row"> {{row.category_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="question">

5
ng6-seed/src/index.html
View File

@ -124,6 +124,11 @@
.mat-cell{
font-size:1.2em !important;
}
.mat-header-cell{
font-size:1.2em !important;
font-weight:800 !important;
}
.swal2-header {
text-align:left !important;
}