diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index d604ccc09..9e0e227f6 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -6,7 +6,7 @@
-

{{userDep}} +

{{userDep}}

diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 56f2a1c6f..05091acef 100644 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -4,12 +4,12 @@
@@ -54,11 +54,11 @@ fxLayoutAlign="center">
-->
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts index fdd1d5a31..eeabab7ef 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; /** Model */ import { States } from '../../../model/states'; @Component({ @@ -22,15 +23,18 @@ export class CityDialogComponent implements OnInit { public _cityForm: FormGroup; + private notifier: NotifierService; stateDatas: any[]; errorMessage:string; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _mastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -85,10 +89,12 @@ export class CityDialogComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the City data then popup close - 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 !'); } }); @@ -100,10 +106,12 @@ export class CityDialogComponent implements OnInit { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the City data then popup close - 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 !'); } }); diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html index b5ef3d3da..1653f558a 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html @@ -1,7 +1,7 @@ -
- +
-
+ + +
+
+ + + +
+
+ + + +
@@ -153,4 +166,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html index da65e3715..4de4790c4 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html @@ -19,7 +19,7 @@ fxLayoutAlign="center">

Comment On Locality            

- +
@@ -39,11 +39,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts index d749b2872..dc0cc1e35 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts @@ -13,6 +13,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -24,11 +25,14 @@ export class CommentsOnLocalityDialogComponent implements OnInit { color = 'primary'; public _CommentOnLocalityForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _mastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { this.commentOnLocalityFormDatas(); } @@ -59,10 +63,12 @@ export class CommentsOnLocalityDialogComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the City data then popup close - 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 !'); } }); @@ -74,10 +80,13 @@ export class CommentsOnLocalityDialogComponent implements OnInit { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the City data then popup close - 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 !'); + } }); } diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html index d7f628353..55a916d08 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html @@ -1,8 +1,8 @@ -
- +
-
+ +
+
+ + + +
+
+ + + + +
@@ -126,8 +139,9 @@ - +
- \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html index 1407d2bbe..7198faac0 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html @@ -19,7 +19,7 @@ fxLayoutAlign="center">

Customer Behaviour                                                 

- +
@@ -43,11 +43,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts index fbc696095..e0b9cb434 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -21,11 +22,14 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class CustomerBehaviourDialogComponent implements OnInit { color = 'primary'; public _customerBehaviourForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } @@ -76,10 +80,12 @@ onNoClick(): void { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the data then popup close - 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 !'); } }); @@ -91,10 +97,12 @@ onNoClick(): void { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the City data then popup close - 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 !'); } }); //After Editing the data then popup close diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html index 314f11272..94659c65d 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html @@ -1,9 +1,9 @@ -
- +
-
+ +
+
+ + + +
+
+ + + +
+
@@ -135,3 +147,4 @@ + diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html index 789c9f2f1..af713ed41 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html @@ -19,7 +19,7 @@ fxLayoutAlign="center">

Customer Segment         

- +
diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts index a7adc1812..03d489b89 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -21,11 +22,12 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class CustomerSegmentDialogComponent implements OnInit { color = 'primary'; public _customerSegmentForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -74,10 +76,12 @@ export class CustomerSegmentDialogComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the BRANCH data then popup close - 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 !'); } }); @@ -88,10 +92,12 @@ export class CustomerSegmentDialogComponent implements OnInit { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the BRANCH data then popup close - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html index fd4dea311..3e3666663 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html @@ -1,8 +1,7 @@ -
- - -
+
-
+ +
+
+ + + +
+
+ +
@@ -132,4 +141,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html index 2e0ccd45f..fd3e2e99a 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html @@ -20,7 +20,7 @@ fxLayoutAlign="center">
- +
diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts index 94214d429..8cff41902 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -21,12 +22,15 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class DesignationDialogComponent implements OnInit { public _designationForm: FormGroup; + private notifier: NotifierService; color="primary"; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -71,10 +75,12 @@ export class DesignationDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -86,10 +92,12 @@ export class DesignationDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html index de2a8199e..f92d574fc 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html @@ -1,9 +1,9 @@ -
- +
-
+ +
+
+ + + +
+
+ + +
@@ -130,3 +141,5 @@ + + diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html index efdefa736..caa3b9348 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html @@ -20,7 +20,7 @@ fxLayoutAlign="center">
- +
@@ -41,11 +41,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts index 02829d87e..b46989985 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -21,12 +22,15 @@ export class FrequencyDialogComponent implements OnInit { public _frequencyForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -58,10 +62,12 @@ export class FrequencyDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -71,10 +77,12 @@ export class FrequencyDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html index bfc4115fd..daf5161f5 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html @@ -1,8 +1,8 @@ -
- +
-
+ +
+
+ + + +
+
+ + +
@@ -136,4 +147,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html index 53bb307a2..9fae64052 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html @@ -1,6 +1,6 @@

Industry Classification                                 

- +
@@ -39,12 +39,12 @@ fxLayoutAlign="center">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts index 1494a853c..8511783fb 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -22,11 +23,14 @@ export class IndustryClassificationDialogComponent implements OnInit { color = 'primary'; public _IndustryClassificationForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _contactService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -74,10 +78,12 @@ onNoClick(): void { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -88,10 +94,12 @@ onNoClick(): void { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html index 4d70efb16..c97c287c6 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html @@ -1,18 +1,28 @@ -
- - -
+
-
+ +
+
+ + + +
+
+ +
@@ -69,4 +79,5 @@
--> - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html index 319f9b2ca..e176790fd 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html @@ -1,6 +1,6 @@

Lender Hierarchy       

- +
@@ -38,12 +38,12 @@ fxLayoutAlign="center">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts index 9ca74bfa7..161e4e663 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -19,11 +20,14 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class LenderHierarchyDialogComponent implements OnInit { color = 'primary'; public _lenderHierarchyForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -71,10 +75,12 @@ export class LenderHierarchyDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -89,10 +95,12 @@ export class LenderHierarchyDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html index 1eaddf134..26e1142b1 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html @@ -1,9 +1,9 @@ -
- - +
-
+ +
+
+ + + +
+
+ + +
@@ -126,4 +137,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html index 4cd3dc4d3..21bb919a7 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html @@ -1,6 +1,6 @@

Occupation of Non earning members

- +
@@ -38,12 +38,12 @@ fxLayout="row">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts index 6c82b49e6..b86c207b2 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -20,11 +21,14 @@ export class MembersOccupationDialogComponent implements OnInit { color = 'primary'; public _occupationForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _memberService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } occupationFormDatas(){ this._occupationForm = this._formBuilder.group({ @@ -56,10 +60,12 @@ export class MembersOccupationDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -70,10 +76,12 @@ export class MembersOccupationDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html index 4cdcf83d9..99937af69 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html @@ -1,8 +1,8 @@ -
- - -
+
-
+ +
+
+ + + +
+
+ + +
@@ -144,4 +155,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html index ef344ae78..7a97c0acc 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html @@ -1,16 +1,23 @@ -
- +
-
+ +
+
+ + + +
@@ -81,3 +88,4 @@ + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts index 103ab9456..629b200a8 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MatTableDataSource } from '@angular/material'; /** Service */ import { MastersService } from '../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; /** Model */ import { PdAllocationType } from '../../model/pd'; @@ -28,7 +29,7 @@ export class PdAllocationTypeListComponent implements OnInit { noRecordFound: boolean = false; dataSourceRecords = null; color = 'primary'; - + private notifier: NotifierService; public dataLength: number; public dataSource = new MatTableDataSource(); @@ -39,8 +40,9 @@ export class PdAllocationTypeListComponent implements OnInit { @ViewChild(MatSort) sort: MatSort; - constructor(private _MastersService: MastersService) { + constructor(private _MastersService: MastersService,notifier: NotifierService) { this.getPDAllocationType(); + this.notifier = notifier; } ngOnInit() {} @@ -106,10 +108,12 @@ export class PdAllocationTypeListComponent implements OnInit { if (dataresult.dataStatus == true){ //this.getPDAllocationType(); - alert("Done"); + //alert("Done"); + this.notifier.notify('success', 'Done.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); //console.log('at last Completed Section'); diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html index 4b63560c1..bf39530f1 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html @@ -1,6 +1,6 @@

PD Location Approach                                     

- +
@@ -41,12 +41,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts index f9252ab89..86c83e83b 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -19,11 +20,14 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class PdLocationApproachDialogComponent implements OnInit { color = 'primary'; public _pdLocationApproachForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } //pd_location_approach_id, description, createdon, fk_createdby, updatedon, fk_updatedby, isactive @@ -69,10 +73,12 @@ export class PdLocationApproachDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -86,10 +92,12 @@ export class PdLocationApproachDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html index acdb67fcd..b942c7527 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html @@ -1,8 +1,8 @@ -
- - -
+
-
+ +
+
+ + + +
+
+ + +
@@ -123,3 +134,4 @@ + diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html index 3b1c9e42f..b30935485 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html @@ -1,19 +1,26 @@ -
- + + 'mail_lender', 'mail_pdincharge','mail_pdofficer'];
-
+
-->
-
+ +
+
+ + + +
@@ -134,3 +141,4 @@ + diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts index d7592c64b..5cca5ffec 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts @@ -11,6 +11,7 @@ import 'rxjs/add/operator/map'; /** Service */ import { MastersService } from '../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-pd-notification-list', @@ -29,7 +30,7 @@ export class PdNotificationListComponent implements OnInit { }; notificationData = null; noRecordFound: boolean = false; - + private notifier: NotifierService; public dataLength: number; public dataSource = new MatTableDataSource(); @@ -38,9 +39,10 @@ export class PdNotificationListComponent implements OnInit { @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - constructor(private dialog: MatDialog, + constructor(private dialog: MatDialog,notifier: NotifierService, private _MastersService: MastersService) { this.getPdNotification(); + this.notifier = notifier; } ngOnInit() {} @@ -126,6 +128,12 @@ export class PdNotificationListComponent implements OnInit { }); //console.log(this.notificationData); this.dataLength = data.records.length; + // if(data.records.length >= 1){ + // this.notificationData = this.notificationData.map((val, i)=>{ + // val['serialno'] = i + 1; + // return val; + // }) + // } this.dataSource.data = this.notificationData; }else{ this.noRecordFound = true; @@ -184,10 +192,13 @@ SaveData(dataSource){ this._MastersService.saveAllPDNotification(PDNotificationArray).subscribe( dataresult => { if(dataresult.dataStatus == true){ - alert('Updated Successfully !'); + //alert('Updated Successfully !'); this.getPdNotification(); + this.notifier.notify('success', 'Record Updated Successfully.!'); + }else{ - alert('Sorry Try Again !'); + //alert('Sorry Try Again !'); + this.notifier.notify('warning', 'Sorry Try Again !'); } }); diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html index 120d8d569..5ffd4161b 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html @@ -3,7 +3,7 @@ fxLayoutAlign="center">

PD Team Details                                 

- +
@@ -75,14 +75,14 @@
- - + + + mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForAdd()" >settings_backup_restore - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts index a67ff1781..ab11dd8a8 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; import { PdTeamService } from '../../../../service/masters/pd-team.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-pd-team-dialog', @@ -22,6 +23,7 @@ import { PdTeamService } from '../../../../service/masters/pd-team.service'; export class PdTeamDialogComponent implements OnInit { public _pdTeamForm: FormGroup; +private notifier: NotifierService; color = 'primary'; citydatas: any[]; lenderdatas: any[]; @@ -34,11 +36,13 @@ AllPDTeamMapData: any[]; PDTeamMaplen:any = 0; -constructor(private _formBuilder: FormBuilder, +constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _pdTeamService: PdTeamService, private _masterService: MastersService, -@Inject(MAT_DIALOG_DATA) public data: any) { } +@Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; +} ngOnInit() { @@ -267,7 +271,8 @@ if (dataresult.dataStatus == true){ //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + // alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ alert("SomeThing Wents Wrong Try Again !"); @@ -285,10 +290,12 @@ if (dataresult.dataStatus == true){ //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas -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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html index aa1b1cc64..cbef78bdc 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html @@ -1,8 +1,8 @@ -
- - -
+ +
+
+ + + +
+
+ +
@@ -135,4 +145,5 @@ onclick="return confirm('Are you sure?')">
- \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html index 2a68e3ebd..bbc649150 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html @@ -1,6 +1,6 @@

PD type                                                 

- +
@@ -41,12 +41,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts index d6c747deb..596776797 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts @@ -11,6 +11,8 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; + @Component({ selector: 'app-jazz-dialog', templateUrl: './pd-type-dialog.component.html', @@ -19,12 +21,15 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class PdTypeDialogComponent implements OnInit { public _pdTypeForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _pdTypeService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -68,10 +73,12 @@ export class PdTypeDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -84,10 +91,12 @@ export class PdTypeDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html index 4ac05075d..2207eeb89 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html @@ -1,8 +1,8 @@ -
- - -
+ +
+
+ + + +
+
+ + + +
@@ -122,3 +134,4 @@ + diff --git a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html index 56e694fbc..5793c6d43 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html @@ -1,6 +1,6 @@

Product Details                                        

- +
@@ -45,12 +45,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts index 6e41d7071..19c5b18ac 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -20,11 +21,14 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class ProductDialogComponent implements OnInit { public _productMasterForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { this.productFormDatas(); @@ -61,10 +65,12 @@ export class ProductDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -75,10 +81,12 @@ export class ProductDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html index 728b2eff4..adf9da364 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html @@ -1,20 +1,31 @@ -
- - -
+
-
+ +
+
+ + + +
+
+ + +
+
@@ -344,4 +355,5 @@
--> - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html index 5c58b93ec..4158e2813 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html @@ -4,7 +4,7 @@ fxLayout="row" fxLayoutAlign="center">

Question Category                                 

- +
@@ -22,11 +22,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts index 33f2a37da..f276c315f 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts @@ -10,6 +10,7 @@ import { FormBuilder, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; + import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-question-category-dialog', @@ -19,11 +20,12 @@ import { FormBuilder, export class QuestionCategoryDialogComponent implements OnInit { public _questionCategoryForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { this.formfunction(); } @@ -52,10 +54,12 @@ export class QuestionCategoryDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -66,10 +70,12 @@ export class QuestionCategoryDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html index d6a494b2a..9519b5708 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html @@ -1,21 +1,32 @@ -
- - -
+ -
+
-
+ +
+
+ + + +
+
+ + +
+
@@ -67,4 +78,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html index 7d4ddb487..92891a919 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html @@ -1,6 +1,6 @@

Region                                                 

- +
@@ -41,12 +41,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts index 60f5d0993..2fbc640d4 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -20,11 +21,12 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class RegionsDialogComponent implements OnInit { public _regionsForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _regionsService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -66,10 +68,12 @@ onNoClick(): void { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -81,10 +85,12 @@ onNoClick(): void { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html index b996ab716..ac665e0a7 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html @@ -1,8 +1,8 @@ -
- - -
+
-
+ +
+
+ + + +
+
+ + +
@@ -129,4 +140,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html index cd80f7262..415e9ff95 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html @@ -1,6 +1,6 @@

Relation Ship                                                 

- +
@@ -40,12 +40,12 @@ fxLayoutAlign="center">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts index 3ef249e8a..6791ad3a1 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @@ -22,11 +23,12 @@ export class RelationShipDialogComponent implements OnInit { public _relationShipForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef< RelationShipDialogComponent>, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -68,10 +70,12 @@ onNoClick(): void { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -83,10 +87,12 @@ onNoClick(): void { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html index 25c797dda..7e67fd576 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html @@ -1,9 +1,9 @@ -
- - +
-
+ +
+
+ + + +
+
+ + + +
@@ -145,4 +157,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html index 48fe8ccbc..78827813d 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html @@ -1,6 +1,6 @@

State                                                 

- +
@@ -65,12 +65,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts index 5ad861ec4..85acbc4da 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; import { States } from '../../../model/states'; @Component({ @@ -20,15 +21,16 @@ import { States } from '../../../model/states'; export class StatesDialogComponent implements OnInit { public _statesForm: FormGroup; + private notifier: NotifierService; color = 'primary'; regionDatas : any[]; foundBooks: any; errorMessage:string; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } @@ -89,10 +91,12 @@ export class StatesDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -104,10 +108,12 @@ export class StatesDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html index da044d3df..8645bbeee 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html @@ -1,9 +1,9 @@ -
- - +
-
+ +
+
+ + + +
+
+ + +
@@ -169,4 +180,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html index 1ed48f986..e0193cf07 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html @@ -11,7 +11,7 @@ fxLayoutGap="35px" fxLayoutGap.xs="0">
Sub Product Details
-
+
-->

Sub Product Details                                       

- +
@@ -72,12 +72,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts index 9654d6d22..99a731df2 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts @@ -13,6 +13,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -22,14 +23,15 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class SubProductDialogComponent implements OnInit { public _subProductMasterForm: FormGroup; + private notifier: NotifierService; productDatas : any[]; errorMessage:string; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { this.subProductFormDatas(); @@ -83,10 +85,12 @@ export class SubProductDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -98,10 +102,12 @@ export class SubProductDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html index 4e466c0bd..c359ea303 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html @@ -1,7 +1,7 @@
- +

+
+
+ + + +
+
+ + +
@@ -159,4 +170,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html index 00f976532..c841bcd07 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html @@ -1,6 +1,6 @@

Title                                                 

- +
@@ -40,11 +40,11 @@ fxLayoutAlign="center">

- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts index b71ed6772..ee59fc61d 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts @@ -12,6 +12,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -22,11 +23,12 @@ export class TitleDialogComponent implements OnInit { public _titleForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -70,10 +72,12 @@ export class TitleDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -84,10 +88,12 @@ export class TitleDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html index 81e520228..af8fbf74c 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html @@ -1,8 +1,5 @@ -
- - -
+ +
+
+ + + +
+
+ + + +
@@ -144,4 +153,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html index 622246263..548195fed 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html @@ -1,6 +1,6 @@ @@ -11,7 +11,7 @@ fxLayoutGap="35px" fxLayoutGap.xs="0">
Type of activity
-
+
-->

Type of activity                                

- +
@@ -40,12 +40,12 @@ fxLayoutAlign="center">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts index 24c29bada..e178eb52f 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts @@ -12,6 +12,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -22,11 +23,12 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class ActivityDialogComponent implements OnInit { public _activityMasterForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } @@ -61,10 +63,12 @@ onSubmit() { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -76,10 +80,12 @@ onSubmit() { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html index 5830ee319..351c2e113 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html @@ -1,8 +1,8 @@ -
+ - -
+ +
-
+ +
+
+ + + +
+
+ +
@@ -137,4 +147,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html index a2547848f..6e73ecfda 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html @@ -18,7 +18,7 @@ fxLayout="row" fxLayoutAlign="center">

Unit of Measurement      

- +
@@ -39,11 +39,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts index f37faef24..63c0090fc 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts @@ -12,6 +12,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -22,11 +23,12 @@ export class UomDialogComponent implements OnInit { public _uomForm: FormGroup; + private notifier: NotifierService; color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _mastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -73,10 +75,12 @@ export class UomDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - 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 !'); } }); @@ -88,10 +92,12 @@ export class UomDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - 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 !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html index 7c394dab3..e51108937 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html @@ -1,7 +1,7 @@ -
- +
-
+ +
+
+ + + +
+
+ + +
@@ -139,4 +150,5 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.html b/ng6-seed/src/app/settings/users/user-list/user-list.component.html index f1f9c37fa..cc5a4df7a 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.html +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.html @@ -20,7 +20,7 @@ Sl - {{i+1}} + {{us.SerialNo}} diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts index 99448064f..6e6e4be5d 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts @@ -70,6 +70,12 @@ export class UserListComponent implements OnInit { console.log(data.records.length); this.dataLength = data.records.length; this.dataSource.data = this.userdata; + if(data.records.length >= 1){ + this.userdata = this.userdata.map((val, i)=>{ + val['SerialNo'] = i + 1; + return val; + }) + } } }) } diff --git a/ng6-seed/src/favicon.ico b/ng6-seed/src/favicon.ico index 8081c7cea..cfeddd3c1 100644 Binary files a/ng6-seed/src/favicon.ico and b/ng6-seed/src/favicon.ico differ