From c85303971613b8aca537ce661680935a51fa521a Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 6 Oct 2018 19:04:53 +0530 Subject: [PATCH 1/5] master screen color changes : ps --- ng6-seed/package-lock.json | 13 ++++-- .../branch-dialog.component.html | 35 +++------------ .../branch-dialog/branch-dialog.component.ts | 1 + .../branch-list/branch-list.component.html | 16 ++++--- .../branch-list/branch-list.component.scss | 2 +- .../city-dialog/city-dialog.component.html | 9 ++-- .../city/city-dialog/city-dialog.component.ts | 1 + .../city/city-list/city-list.component.html | 12 ++--- ...comments-on-locality-dialog.component.html | 9 ++-- .../comments-on-locality-dialog.component.ts | 2 +- .../comments-on-locality-list.component.html | 7 +-- .../customer-behaviour-dialog.component.html | 9 ++-- .../customer-behaviour-dialog.component.ts | 2 +- .../customer-behaviour-list.component.html | 8 ++-- .../customer-segment-dialog.component.html | 3 +- .../customer-segment-dialog.component.ts | 2 +- .../customer-segment-list.component.html | 7 +-- .../designation-dialog.component.html | 3 +- .../designation-dialog.component.ts | 1 + .../designation-list.component.html | 3 +- .../frequency-dialog.component.html | 9 ++-- .../frequency-dialog.component.ts | 1 + .../frequency-list.component.html | 7 +-- ...ustry_classification-dialog.component.html | 14 +++--- ...ndustry_classification-dialog.component.ts | 1 + ...ndustry_classification-list.component.html | 7 +-- .../lender-hierarchy-dialog.component.html | 14 +++--- .../lender-hierarchy-dialog.component.ts | 2 +- .../lender-hierarchy-list.component.html | 8 ++-- .../members-occupation-dialog.component.html | 14 +++--- .../members-occupation-dialog.component.ts | 2 +- .../members-occupation-list.component.html | 7 +-- ...pd-location-approach-dialog.component.html | 14 +++--- .../pd-location-approach-dialog.component.ts | 2 +- .../pd-location-approach-list.component.html | 7 +-- .../pd-team-dialog.component.html | 12 ++--- .../pd-team-dialog.component.ts | 2 + .../pd-team-list/pd-team-list.component.html | 7 +-- .../pd-type-dialog.component.html | 14 +++--- .../pd-type-dialog.component.ts | 1 + .../pd-type-list/pd-type-list.component.html | 7 +-- .../product-dialog.component.html | 14 +++--- .../product-dialog.component.ts | 2 +- .../product-list/product-list.component.html | 7 +-- .../question-category-dialog.component.html | 8 ++-- .../question-category-dialog.component.ts | 2 +- .../question-category-list.component.html | 7 +-- .../regions-dialog.component.html | 14 +++--- .../regions-dialog.component.ts | 2 +- .../regions-list/regions-list.component.html | 7 +-- .../relation-ship-dialog.component.html | 14 +++--- .../relation-ship-dialog.component.ts | 2 +- .../relation-ship-list.component.html | 3 +- .../states-dialog.component.html | 14 +++--- .../states-dialog/states-dialog.component.ts | 1 + .../states-list/states-list.component.html | 3 +- .../sub-product-dialog.component.html | 14 +++--- .../sub-product-dialog.component.ts | 1 + .../sub-product-list.component.html | 3 +- .../title-dialog/title-dialog.component.html | 12 ++--- .../title-dialog/title-dialog.component.ts | 2 +- .../title-list/title-list.component.html | 7 +-- .../activity-dialog.component.html | 14 +++--- .../activity-dialog.component.ts | 2 +- .../activity-list.component.html | 7 +-- .../uom/uom-dialog/uom-dialog.component.html | 8 ++-- .../uom/uom-dialog/uom-dialog.component.ts | 2 +- .../uom/uom-list/uom-list.component.html | 7 +-- .../settings/masters/masters.component.html | 20 +++------ .../settings/masters/masters.component.scss | 5 ++- .../app/settings/masters/masters.module.ts | 45 +++++++++++++++++++ .../styles/scss/_material.variables.scss | 6 ++- 72 files changed, 307 insertions(+), 245 deletions(-) diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 78ab38287..6caf2406c 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -4273,7 +4273,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4688,7 +4689,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4744,6 +4746,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4787,12 +4790,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html index 81a5024e9..7f43ff212 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html @@ -1,21 +1,15 @@ -

Branch                                                 

- +
- -
+
@@ -35,38 +29,21 @@ fxLayoutAlign="center">
- You must inculde a Name + You must inculde a Branch Name
- -
- + - - +
-
- - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts index 183d58b2d..0e35cc58c 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts @@ -27,6 +27,7 @@ export class BranchDialogComponent implements OnInit { citydatas: City[]; errorMessage:string; + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html index f3e00b871..9b5981aff 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html @@ -1,12 +1,16 @@ - -
- +
+ + + + +
-
+ +
@@ -106,4 +110,6 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss index 6e1848231..ed0fe77d4 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss @@ -6,6 +6,7 @@ min-width: 300px; } + .example-header { min-height: 56px; max-height: 56px; @@ -116,7 +117,6 @@ .example-margin { margin: 10px; } - .mat-table { display: table; diff --git a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html index 884aaaed6..6f5600dcf 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html @@ -19,7 +19,8 @@ fxLayoutAlign="center">

City                                                 

- + +
@@ -53,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 87f89c8ed..fdd1d5a31 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 @@ -25,6 +25,7 @@ export class CityDialogComponent implements OnInit { stateDatas: any[]; errorMessage:string; + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, 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 a8d021ddc..b5ef3d3da 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,12 +1,8 @@ -
- + +
-
-
- -
-
+ - +
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 4100cd447..da65e3715 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 @@ -18,7 +18,8 @@ fxLayout="row" fxLayoutAlign="center">

Comment On Locality            

- + +
@@ -38,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 4277c6146..d749b2872 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 @@ -21,7 +21,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./comments-on-locality-dialog.component.scss'] }) export class CommentsOnLocalityDialogComponent implements OnInit { - + color = 'primary'; public _CommentOnLocalityForm: FormGroup; 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 7622723c5..d7f628353 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,9 @@ - +
- + +
-
+ +
@@ -42,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 b3d208980..fbc696095 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 @@ -19,7 +19,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./customer-behaviour-dialog.component.scss'] }) export class CustomerBehaviourDialogComponent implements OnInit { - + color = 'primary'; public _customerBehaviourForm: FormGroup; constructor(private _formBuilder: FormBuilder, 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 d7f29801f..314f11272 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,8 +1,10 @@ - +
- + + +
-
+ + 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 4714ea906..a7adc1812 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 @@ -19,7 +19,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./customer-segment-dialog.component.scss'] }) export class CustomerSegmentDialogComponent implements OnInit { - + color = 'primary'; public _customerSegmentForm: FormGroup; constructor(private _formBuilder: FormBuilder, 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 6865392b7..fd4dea311 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,9 @@ - +
- + +
-
+ + 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 cd886b1d6..94214d429 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 @@ -21,6 +21,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class DesignationDialogComponent implements OnInit { public _designationForm: FormGroup; + color="primary"; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, 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 1ef859cfa..de2a8199e 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,6 +1,7 @@
- + +

+ @@ -40,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 25670082e..02829d87e 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 @@ -21,6 +21,7 @@ export class FrequencyDialogComponent implements OnInit { public _frequencyForm: FormGroup; + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, 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 4f6729632..bfc4115fd 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,9 @@ - +
- + +
-
+

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 f2f843a38..1494a853c 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 @@ -20,6 +20,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; }) export class IndustryClassificationDialogComponent implements OnInit { + color = 'primary'; public _IndustryClassificationForm: FormGroup; constructor(private _formBuilder: FormBuilder, 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 8ae413df0..4d70efb16 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,8 +1,9 @@ - +
- + +
-
+ 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 b4bc0c60c..319f9b2ca 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 3ee7db23b..9ca74bfa7 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 @@ -17,7 +17,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./lender-hierarchy-dialog.component.scss'] }) export class LenderHierarchyDialogComponent implements OnInit { - + color = 'primary'; public _lenderHierarchyForm: FormGroup; constructor(private _formBuilder: FormBuilder, 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 52c0bdde5..1eaddf134 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,8 +1,10 @@ - +
- + + +
-
+ 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 dc323c978..4cd3dc4d3 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 0d73c6013..6c82b49e6 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 @@ -18,7 +18,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; }) export class MembersOccupationDialogComponent implements OnInit { - + color = 'primary'; public _occupationForm: FormGroup; constructor(private _formBuilder: FormBuilder, 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 ec2dbb980..4cdcf83d9 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,9 @@ - +
- + +
-
+ 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 44465d8c9..4b63560c1 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 c149eb043..f9252ab89 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 @@ -17,7 +17,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./pd-location-approach-dialog.component.scss'] }) export class PdLocationApproachDialogComponent implements OnInit { - + color = 'primary'; public _pdLocationApproachForm: FormGroup; constructor(private _formBuilder: FormBuilder, 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 047d41d03..acdb67fcd 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,9 @@ - +
- + +
-
+ 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 e1d6b0de3..120d8d569 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" [color]='color' 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 26b0e8920..a67ff1781 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 @@ -22,6 +22,7 @@ import { PdTeamService } from '../../../../service/masters/pd-team.service'; export class PdTeamDialogComponent implements OnInit { public _pdTeamForm: FormGroup; +color = 'primary'; citydatas: any[]; lenderdatas: any[]; errorMessage:string; @@ -261,6 +262,7 @@ Object.keys(pdTeamFormValues).forEach( //this._memberService.addMasterDetails(OccupationFormValues,'OCCUPATIONMEMBERS').subscribe( this._pdTeamService.addPdTeamDetail(pdTeamFormValues).subscribe( dataresult=>{ + console.log(dataresult); if (dataresult.dataStatus == true){ //After Saving the data then popup close this.dialogRef.close(); 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 5e9b2f1c6..aa1b1cc64 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,9 @@ - +
- + +
-
+ 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 9e7d68b31..2a68e3ebd 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 fe757e694..d6c747deb 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 @@ -19,6 +19,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class PdTypeDialogComponent implements OnInit { public _pdTypeForm: FormGroup; + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, 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 38a05026d..4ac05075d 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,9 @@ - +
- + +
-
+ 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 b74575fad..56e694fbc 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 6ce52a005..6e41d7071 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 @@ -20,7 +20,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class ProductDialogComponent implements OnInit { public _productMasterForm: FormGroup; - + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, private _MastersService: MastersService, 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 de0d0df93..728b2eff4 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,8 +1,9 @@ - +
- + +
-
+ + -
+

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 d3304d889..60f5d0993 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 @@ -20,7 +20,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class RegionsDialogComponent implements OnInit { public _regionsForm: FormGroup; - + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, private _regionsService: MastersService, 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 70a17c3a1..b996ab716 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,9 @@ - +
- + +
-
+

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 d9b63c2f0..3ef249e8a 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 @@ -22,7 +22,7 @@ export class RelationShipDialogComponent implements OnInit { public _relationShipForm: FormGroup; - + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef< RelationShipDialogComponent>, private _MastersService: MastersService, 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 d05e1b1fc..25c797dda 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,6 +1,7 @@
- + +

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 cfe28ef85..5ad861ec4 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 @@ -20,6 +20,7 @@ import { States } from '../../../model/states'; export class StatesDialogComponent implements OnInit { public _statesForm: FormGroup; + color = 'primary'; regionDatas : any[]; foundBooks: any; errorMessage:string; 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 e5a9a6c96..da044d3df 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,6 +1,7 @@
- + +

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 cf6ce3b43..9654d6d22 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 @@ -24,6 +24,7 @@ export class SubProductDialogComponent implements OnInit { public _subProductMasterForm: FormGroup; productDatas : any[]; errorMessage:string; + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, 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 ac0d0d151..4e466c0bd 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,6 +1,7 @@
- + +

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 8677b06b2..b71ed6772 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 @@ -22,7 +22,7 @@ export class TitleDialogComponent implements OnInit { public _titleForm: FormGroup; - + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, private _MastersService: MastersService, 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 bea5993fe..81e520228 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,9 @@ - +
- + +
-
+ @@ -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 f4c738932..24c29bada 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 @@ -22,7 +22,7 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class ActivityDialogComponent implements OnInit { public _activityMasterForm: FormGroup; - + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, private _MastersService: MastersService, 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 0b15f7c8a..5830ee319 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,9 @@ - +
- + +
-
+ - + - + - + 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 27d6118d5..f37faef24 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 @@ -22,7 +22,7 @@ export class UomDialogComponent implements OnInit { public _uomForm: FormGroup; - + color = 'primary'; constructor(private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, private _mastersService: MastersService, 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 3ec3f22ba..7c394dab3 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,8 +1,9 @@ -
- + +
-
+ + - + + @@ -185,10 +193,11 @@
+
Document
- + @@ -204,9 +213,7 @@ - - + @@ -227,4 +234,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html index 92e007b0b..125b81296 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html @@ -70,5 +70,4 @@ - \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html index cec20aecb..b1145bcb8 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html @@ -115,4 +115,3 @@ - diff --git a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts index 37558080b..fc7405eac 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts @@ -21,7 +21,7 @@ export class EditPdMasterComponent implements OnInit { @Input() masterChild: any; @Output() loadPdView = new EventEmitter(); public _EditPDtriggerForm:FormGroup; - private notifier: NotifierService; + public notifier: NotifierService; constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService,) { this.notifier=notifier diff --git a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html index ec2759fa7..814237603 100644 --- a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html @@ -1,19 +1,21 @@ -
- +
+ +
- All PD Details + All +
- +

{{details.applicat_details[0].applicant_name}}

-

{{details.lender_full_name}}    {{details.lender_applicant_id}}   {{details.pd_date_of_initiation}}

-

{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}   {{details.loan_amount}}    {{details.city_name}}/{{details.state_name}}-{{details.pincode}}

+

{{details.lender_full_name}} {{details.lender_applicant_id}}{{details.pd_date_of_initiation}}

+

{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}}  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}

- In Progress PD Details + In Progress - {{tile.text}} @@ -78,9 +80,47 @@ -
+
--> - --> + + + Scheduled + + + + + + Completed + + + + diff --git a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts index 5d6597f80..f7d1c702e 100644 --- a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts @@ -1,6 +1,6 @@ import { Component, ViewChild, OnInit, ViewEncapsulation, EventEmitter, Output } from '@angular/core'; -import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; import { PdTrigerService } from '../pd-service/pd-triger.service'; +import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; @Component({ selector: 'app-list-pd', @@ -109,9 +109,6 @@ export class ListPdComponent implements OnInit { } }, error => this.errorMessage = error); } - ngAfterViewInit() { - this.dataSource.paginator = this.paginator; - } addPdDetails(){ this.showParentComponent=false this.showEditComponent=false @@ -152,7 +149,6 @@ export class ListPdComponent implements OnInit { this.pdListData = data.records; this.dataLength = data.records.length; this.dataSource.data = this.pdListData; - this.recordStatus=false; } else{ diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html deleted file mode 100644 index 15ad414a8..000000000 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html +++ /dev/null @@ -1,27 +0,0 @@ - - - {{pageTitle}} - - - -
- -
- - - {{ ct.categroy_name }} - - Select name. - -
-
- - -
- -
- - - - \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts deleted file mode 100644 index c2547603e..000000000 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PdAllocationComponent } from './pd-allocation.component'; - -describe('PdAllocationComponent', () => { - let component: PdAllocationComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PdAllocationComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PdAllocationComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts deleted file mode 100644 index e146a8df3..000000000 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; -import { NotifierService } from 'angular-notifier'; -import { PdTrigerService } from '../pd-service/pd-triger.service'; - -@Component({ - selector: 'app-pd-allocation', - templateUrl: './pd-allocation.component.html', - styleUrls: ['./pd-allocation.component.scss'] -}) -export class PdAllocationComponent implements OnInit { - public pageTitle: string = "PD Allocation To"; - public _pdAllocationForm: FormGroup; - public pdOfficerList: any = []; - errorMessage: any; - notifier : NotifierService; - constructor( notifier: NotifierService, - private _fb: FormBuilder, - private dialogRef: MatDialogRef, - private _pd: PdTrigerService, - @Inject(MAT_DIALOG_DATA) public data: any) { - this.notifier=notifier; - console.log(this.data) - this.getPDOfficerList(); - } - - ngOnInit() { - this._pdAllocationForm = this._fb.group({ - pd_primary_id: [null], - allocation_id: [null, Validators.compose([Validators.required])], - }); - } - -// convenience getter for easy access to form fields -get readForm() { return this._pdAllocationForm.controls; } - -// pd officer list - getPDOfficerList(){ - this._pd.getPdOfficerList().subscribe( - data => { - if (data.status == 200) { - this.pdOfficerList=data.records.pd_master_details; - - } - }, error => this.errorMessage = error); - - } - /** To Save/Edited Popup Data */ - onSubmit() { - // stop here if form is invalid - if (this._pdAllocationForm.invalid) { - this.errorMessage = "Please Fill All Mandate Fields."; - return; - } else { - var updateData = this._pdAllocationForm.value; - - //To Remove The "Null" With Key also - Object.keys(updateData).forEach((key) => (updateData[key] == null) && delete updateData[key]); - - //Add BRANCH data with help Service File - this._pd.updatePdOfficer(updateData).subscribe( - result => { - if (result.status == 200) { - this.notifier.notify('success', 'Your Changes Updated.!'); - this.dialogRef.close(); - } - else { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - this.errorMessage = "Something Wents Wrong Try Again.!"; - } - }, error => { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - this.errorMessage = "Some Thing Wents Wrong Try Again.!"; - this.dialogRef.close(); - }); - //After Saving the BRANCH data then popup close - // this.dialogRef.close(); - } - } -/** For Popup Close Button */ -closeAllocationComponent(): void { - this.dialogRef.close(); -} -} diff --git a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts index c77b0d72a..a6e35101c 100644 --- a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts @@ -21,7 +21,7 @@ export interface Master { export class PdTrigerService { private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; - //private apiUrl = "http://192.168.15.5:9999/AWSEC2/sparqapi/api/"; + //private apiUrl = "http://192.168.0.17:9999/AWSEC2/sparqapi/api/"; @@ -113,6 +113,7 @@ export class PdTrigerService { updatePdApplicant(editData:any):Observable{ // editData.fk_updatedby = this._aws.getlocale(); // editData.updatedon = currentdate; + console.log(editData) return this._http.post(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":editData}) .pipe( @@ -120,24 +121,10 @@ export class PdTrigerService { ) } - // get pd allocation to details - getPdOfficerList(): Observable { - return this._http.get(this.apiUrl+"getListPDOfficers") - .pipe( - catchError(this.handleError('operation', [])) - ) - } - // update pd officer - updatePdOfficer(updateData: any): Observable { - return this._http.post(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":updateData}) - .pipe( - catchError(this.handleError('operation', [])) - ) - } - - private handleError(operation = 'operation', result?: T) { - return (error: any): Observable => { - return of(result as T); - }; - } + + private handleError(operation = 'operation', result?: T) { + return (error: any): Observable => { + return of(result as T); + }; + } } diff --git a/ng6-seed/src/app/pd-triger/pd-triger.module.ts b/ng6-seed/src/app/pd-triger/pd-triger.module.ts index fa393eedf..9ea40fdf6 100644 --- a/ng6-seed/src/app/pd-triger/pd-triger.module.ts +++ b/ng6-seed/src/app/pd-triger/pd-triger.module.ts @@ -19,8 +19,6 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; -import {MatDatepickerModule} from '@angular/material/datepicker'; - import 'hammerjs'; import { PdTrigerRoutes } from './pd-triger-routing.module'; @@ -31,11 +29,10 @@ import { EditPdComponent } from './edit-pd/edit-pd.component'; import { ViewPdComponent } from './view-pd/view-pd.component'; import { EditPdMasterComponent } from './edit-pd-master/edit-pd-master.component'; import { EditPdApplicantComponent } from './edit-pd-applicant/edit-pd-applicant.component'; -import { PdAllocationComponent } from './pd-allocation/pd-allocation.component'; /** * Custom angular notifier options */ -const customNotifierOptions: NotifierOptions = { +const pdCustomNotifierOptions: NotifierOptions = { position: { horizontal: { position: 'right', @@ -79,7 +76,7 @@ const customNotifierOptions: NotifierOptions = { imports: [ CommonModule, RouterModule.forChild(PdTrigerRoutes), - NotifierModule.withConfig(customNotifierOptions), + NotifierModule.withConfig(pdCustomNotifierOptions), MatCardModule, MatIconModule, MatInputModule, @@ -97,10 +94,9 @@ const customNotifierOptions: NotifierOptions = { FileUploadModule, TreeModule, MatDialogModule,MatSortModule, - NgxMatSelectSearchModule,MatTooltipModule, MatDatepickerModule, + NgxMatSelectSearchModule,MatTooltipModule, ], - declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent], - entryComponents: [PdAllocationComponent], + declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent], providers: [PdTrigerService] }) export class PdTrigerModule { } diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html index 7e0b016bd..6e01a9e6c 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html @@ -1,13 +1,14 @@ -
- - + + +
+
- - -
@@ -17,7 +18,6 @@  {{master.city_name}} / {{master.state_name}}-{{master.pincode}} -

{{master.product_name}} / {{master.subproduct_name}}

{{master.pd_type_name}}   {{master.pd_allocation_type_name}}    {{master.pd_allocated_to}}

@@ -40,7 +40,7 @@ Applicants - +

@@ -53,31 +53,31 @@ + + - +

+ +
Documents - + -

- {{documents.pd_document_title}}     - -  {{documents.pd_document_name}} -

+ - + + + @@ -86,11 +86,4 @@ - - - diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss index 542c06744..fd48f4449 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss @@ -1,3 +1,3 @@ .cardEdit { - display: inline;float:right; + display: inline;float:right;padding-top:3%; } \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts index 29e3ba07a..bfb32830f 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts @@ -1,9 +1,8 @@ import { Component, OnInit,ViewEncapsulation, EventEmitter, Input, Output } from '@angular/core'; -import { MatDialog } from '@angular/material'; import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; +import { CustomValidators } from 'ng2-validation'; import { NotifierService } from 'angular-notifier'; import { PdTrigerService } from '../pd-service/pd-triger.service'; -import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component'; @Component({ selector: 'app-view-pd', templateUrl: './view-pd.component.html', @@ -26,7 +25,7 @@ export class ViewPdComponent implements OnInit { @Output() loadParent = new EventEmitter(); public _EditPDtriggerForm:FormGroup; constructor(private _fb: FormBuilder, - private _pd: PdTrigerService, notifier:NotifierService, private dialog: MatDialog,) { + private _pd: PdTrigerService, notifier:NotifierService) { this.notifier=notifier } @@ -43,7 +42,6 @@ export class ViewPdComponent implements OnInit { if (data.status == 200) { this.pdMasterData=data.records.pd_master_details; this.pdApplicantData= data.records.applicants_details; - this.pdDocumentsData=data.records.pd_documnets; this.pdLogsData=data.records.pd_logs; } }, error => this.errorMessage = error); @@ -61,18 +59,6 @@ export class ViewPdComponent implements OnInit { this.editApplicantData=applicantData; this.showEditApplicantComponent=!this.showEditApplicantComponent; } - // pd allocation to - // edit questions master details popup model - pdAllocationTo(pdID:any) { - const dialogRef = this.dialog.open(PdAllocationComponent, { - data: pdID, - disableClose: true - }); - dialogRef.afterClosed() - .subscribe(dataresult => { - //this.getQuestionsMasters(); - }); - } updateViewComponent(editBack:string) { if(editBack=='1'){ diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html index 5a7d3deef..dc2b65856 100644 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html @@ -1,13 +1,14 @@
+

{{pageTitle}}

- +
- +
@@ -17,8 +18,7 @@ You must Select Entity Type. -
-
+
@@ -65,8 +65,16 @@
- + You must Include Address. + + + + + + + + @@ -82,8 +90,8 @@ - - You must Select Alternet Email. + + @@ -93,7 +101,7 @@ - You must Include Mobile Number. +
@@ -103,10 +111,12 @@ You must Include Remarks.
-
+ + +

{{subTitle1}}

- + You must Include Pan Number. @@ -124,14 +134,16 @@ You must Include TAT.
-
+ +
+

{{subTitle2}}

- +
@@ -157,8 +169,9 @@
- -
+ + +
@@ -172,8 +185,9 @@
+ - +
diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts index 1f5484466..899778a06 100644 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts @@ -36,7 +36,9 @@ import { EntityService } from './../../service/entity/entity.service'; }) export class EntityAddComponent implements OnInit { - public pageTitle: string = "Add Entity Master Details"; + public pageTitle: string = "Entity"; + public subTitle1: string = "Tax Info"; + public subTitle2: string = "Contacts"; public _addQuesFrom: FormGroup; public submitted = false; public categories: any = []; @@ -72,10 +74,8 @@ export class EntityAddComponent implements OnInit { fk_branch: [null, Validators.compose([Validators.required])], addressline1: [null, Validators.compose([Validators.required])], pincode: [null, Validators.compose([Validators.required])], - official_email: [null, Validators.compose([Validators.required, Validators.email])], - alt_email: [null, Validators.compose([Validators.required, Validators.email])], - phone_number: [null, Validators.compose([Validators.required])], - mobile_no: [null, Validators.compose([Validators.required])], + official_email: [null, Validators.compose([Validators.required, Validators.email])], + phone_number: [null, Validators.compose([Validators.required])], remarks: [null, Validators.compose([Validators.required])], pan: [null, Validators.compose([Validators.required])], gst_no: [null, Validators.compose([Validators.required])], diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html index a002c9080..fa3cb8bf2 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html @@ -1,13 +1,14 @@
+

{{pageTitle}}

- +
- +
@@ -17,8 +18,7 @@ You must Select Entity Type. -
-
+
@@ -65,8 +65,16 @@
- + You must Include Address. + + + + + + + + @@ -82,8 +90,8 @@ - - You must Select Alternet Email. + + @@ -93,7 +101,7 @@ - You must Include Mobile Number. +
@@ -103,10 +111,12 @@ You must Include Remarks.
-
+ + +

{{subTitle1}}

- + You must Include Pan Number. @@ -124,7 +134,10 @@ You must Include TAT.
-
+ + + +

{{subTitle2}}

@@ -160,8 +173,8 @@
- -
+ +
@@ -175,6 +188,7 @@ (click)="onReset()">settings_backup_restore - + + diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts index 300fb31a0..750cd6fbe 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts @@ -33,7 +33,9 @@ export class EntityEditComponent implements OnInit{ @Input() public childMessage: any; -public pageTitle: string = "Edit Entity Master Details"; +public pageTitle: string = "Entity"; + public subTitle1: string = "Tax Info"; + public subTitle2: string = "Contacts"; public _addQuesFrom: FormGroup; public submitted = false; public categories: any = []; @@ -95,12 +97,10 @@ public pageTitle: string = "Edit Entity Master Details"; fk_state: [this.childMessage.fk_state, Validators.compose([Validators.required])], fk_city: [this.childMessage.fk_city, Validators.compose([Validators.required])], fk_branch: [this.childMessage.fk_branch, Validators.compose([Validators.required])], - addressline1: [this.childMessage.addressline1, Validators.compose([Validators.required])], + addressline1: [this.childMessage.addressline1, Validators.compose([Validators.required])], pincode: [this.childMessage.pincode, Validators.compose([Validators.required])], - official_email: [this.childMessage.official_email, Validators.compose([Validators.required, Validators.email])], - alt_email: [this.childMessage.alt_email, Validators.compose([Validators.required, Validators.email])], - phone_number: [this.childMessage.phone_number, Validators.compose([Validators.required])], - mobile_no: [this.childMessage.mobile_no, Validators.compose([Validators.required])], + official_email: [this.childMessage.official_email, Validators.compose([Validators.required, Validators.email])], + phone_number: [this.childMessage.phone_number, Validators.compose([Validators.required])], remarks: [this.childMessage.remarks, Validators.compose([Validators.required])], pan: [this.childMessage.pan, Validators.compose([Validators.required])], gst_no: [this.childMessage.gst_no, Validators.compose([Validators.required])], diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html index 1f33e28f2..ade078062 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html @@ -1,12 +1,13 @@
- +
-
Entity Master
-
List of Entity Master Details
+
Entity Master
+ +
-
+
- + +
- + -
- - - {{ ct.categroy_name }} - - Select name. - -
+ + + +

+ {{officer.first_name}} +

+

+ Allocated +

+

+ Scheduled +

+

+ Inprogress +

+ + + + + +

PD officer not available..

+ +
- +
- - + +
+ + + - \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss index e69de29bb..6e263adae 100644 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss +++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss @@ -0,0 +1,3 @@ +.example-full-width{ + width: 100%; +} \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts index e146a8df3..5bde0ee3e 100644 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts +++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts @@ -15,54 +15,61 @@ export class PdAllocationComponent implements OnInit { public pdOfficerList: any = []; errorMessage: any; notifier : NotifierService; + selectedItem:any; + isDisabled: boolean; constructor( notifier: NotifierService, private _fb: FormBuilder, private dialogRef: MatDialogRef, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier=notifier; - console.log(this.data) - this.getPDOfficerList(); } ngOnInit() { - this._pdAllocationForm = this._fb.group({ - pd_primary_id: [null], - allocation_id: [null, Validators.compose([Validators.required])], - }); + this.isDisabled=true; + this.getPDOfficerList(this.data.pd_id); + + // this._pdAllocationForm = this._fb.group({ + // pd_primary_id: [null], + // allocation_id: [null], + // }); } // convenience getter for easy access to form fields -get readForm() { return this._pdAllocationForm.controls; } +// get readForm() { return this._pdAllocationForm.controls; } // pd officer list - getPDOfficerList(){ - this._pd.getPdOfficerList().subscribe( + getPDOfficerList(pdID:string){ + this._pd.getPdOfficerList(pdID).subscribe( data => { if (data.status == 200) { - this.pdOfficerList=data.records.pd_master_details; + this.pdOfficerList=data.records; } }, error => this.errorMessage = error); } - /** To Save/Edited Popup Data */ - onSubmit() { - // stop here if form is invalid - if (this._pdAllocationForm.invalid) { - this.errorMessage = "Please Fill All Mandate Fields."; - return; - } else { - var updateData = this._pdAllocationForm.value; + // select pd officer list + selectPdOfficer(selected:any){ + this.isDisabled=false; + this.selectedItem=selected; + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - //To Remove The "Null" With Key also - Object.keys(updateData).forEach((key) => (updateData[key] == null) && delete updateData[key]); - - //Add BRANCH data with help Service File + } + /** To update pd officer*/ + updatePdOfficer(allocateDate:any) { + if(this.isDisabled){ + this.notifier.notify('warning', 'Please Choose Minimum One PD Officer.!'); + } + else { + let updateData = { + "pd_id":this.data.pd_id, + "fk_pd_allocated_to":allocateDate.fk_user_id, + } this._pd.updatePdOfficer(updateData).subscribe( result => { if (result.status == 200) { - this.notifier.notify('success', 'Your Changes Updated.!'); + // this.notifier.notify('success', 'Your Changes Updated.!'); this.dialogRef.close(); } else { @@ -72,14 +79,12 @@ get readForm() { return this._pdAllocationForm.controls; } }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); this.errorMessage = "Some Thing Wents Wrong Try Again.!"; - this.dialogRef.close(); + // this.dialogRef.close(); }); - //After Saving the BRANCH data then popup close - // this.dialogRef.close(); } } /** For Popup Close Button */ -closeAllocationComponent(): void { - this.dialogRef.close(); -} + closeAllocationComponent(): void { + this.dialogRef.close(); + } } diff --git a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts index c77b0d72a..9f75af2fe 100644 --- a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts @@ -20,8 +20,8 @@ export interface Master { export class PdTrigerService { - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; - //private apiUrl = "http://192.168.15.5:9999/AWSEC2/sparqapi/api/"; + //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/"; @@ -121,15 +121,17 @@ export class PdTrigerService { } // get pd allocation to details - getPdOfficerList(): Observable { - return this._http.get(this.apiUrl+"getListPDOfficers") + getPdOfficerList(pdID:string): Observable { + return this._http.post(this.apiUrl+"getListPDOfficers",{"pdid":pdID}) .pipe( catchError(this.handleError('operation', [])) ) } // update pd officer updatePdOfficer(updateData: any): Observable { - return this._http.post(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":updateData}) + updateData.fk_updatedby = this._aws.getlocale(); + updateData.updatedon = currentdate; + return this._http.post(this.apiUrl+"allocatePD",{"records":updateData}) .pipe( catchError(this.handleError('operation', [])) ) diff --git a/ng6-seed/src/app/pd-triger/pd-triger.module.ts b/ng6-seed/src/app/pd-triger/pd-triger.module.ts index fa393eedf..78c182bd0 100644 --- a/ng6-seed/src/app/pd-triger/pd-triger.module.ts +++ b/ng6-seed/src/app/pd-triger/pd-triger.module.ts @@ -8,7 +8,7 @@ import { MatRadioModule, MatButtonModule,MatTableModule,MatPaginatorModule, MatProgressBarModule,MatDialogModule, MatSortModule, - MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule } from '@angular/material'; + MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule } from '@angular/material'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; @@ -92,7 +92,7 @@ const customNotifierOptions: NotifierOptions = { FlexLayoutModule, NgxDatatableModule, FormsModule,MatSlideToggleModule, - MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, + MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule, ReactiveFormsModule, FileUploadModule, TreeModule, diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts index 29e3ba07a..56f0dd791 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts @@ -11,7 +11,7 @@ import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component' encapsulation: ViewEncapsulation.None }) export class ViewPdComponent implements OnInit { - public notifier:NotifierService; + private notifier:NotifierService; errorMessage: any; pdMasterData: any; pdApplicantData: any; @@ -70,7 +70,9 @@ export class ViewPdComponent implements OnInit { }); dialogRef.afterClosed() .subscribe(dataresult => { - //this.getQuestionsMasters(); + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + + this.viewPdDetails(this.childData) }); } updateViewComponent(editBack:string) { From e9433f3c42cc38b72ce77f3e9a2e77e1358b8f19 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 6 Oct 2018 21:53:37 +0530 Subject: [PATCH 4/5] pd changes --- .../app/pd-triger/add-pd/add-pd.component.ts | 8 +++---- .../edit-pd-applicant.component.html | 2 ++ .../edit-pd-applicant.component.ts | 2 +- .../edit-pd-master.component.ts | 2 +- .../pd-triger/list-pd/list-pd.component.html | 1 + .../pd-allocation/pd-allocation.component.ts | 4 ++-- .../pd-triger/pd-service/pd-triger.service.ts | 19 ++------------- .../src/app/pd-triger/pd-triger.module.ts | 4 +++- .../pd-triger/view-pd/view-pd.component.html | 24 ++++++++++--------- .../pd-triger/view-pd/view-pd.component.ts | 15 ++++++------ 10 files changed, 36 insertions(+), 45 deletions(-) diff --git a/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts b/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts index 2880b9299..1613e5c92 100644 --- a/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts @@ -12,7 +12,7 @@ import { AwsService } from '../../AwsService/aws.service'; }) export class AddPdComponent implements OnInit { @Output() loadParent = new EventEmitter(); - public notifier: NotifierService; + private notifier: NotifierService; public _PDtriggerForm: FormGroup; items: FormArray; productList:any; @@ -31,8 +31,8 @@ export class AddPdComponent implements OnInit { subAllocationTypeCheck: boolean; allocationLabel: string; subAllocationLabel: string; - constructor(private _fb: FormBuilder, - private _pd: PdTrigerService, private _aws:AwsService, notifier: NotifierService) { + constructor(notifier: NotifierService,private _fb: FormBuilder, + private _pd: PdTrigerService, private _aws:AwsService) { this.notifier = notifier; } public totalfiles: Array =[]; @@ -290,7 +290,7 @@ export class AddPdComponent implements OnInit { this._pd.addPdDetails(pd_form).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'PD Saved Successfully.!'); + this.notifier.notify('success', 'PD Saved.'); this.loadPdListCompoent(); } else { diff --git a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html index 125b81296..198e3fb58 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html @@ -70,4 +70,6 @@ + + \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts index b0c20d303..7d42232cf 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts @@ -105,7 +105,7 @@ export class EditPdApplicantComponent implements OnInit { this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'PD Saved Successfully.!'); + this.notifier.notify('success', 'Applicants updated..'); this.loadPdMasterCompoent(); } else { diff --git a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts index fc7405eac..9ed6604ac 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts @@ -121,7 +121,7 @@ export class EditPdMasterComponent implements OnInit { } } loadPdMasterCompoent() { - this.notifier.notify('success', 'Your Changes Updated.!'); + // this.notifier.notify('success', 'Your Changes Updated.!'); this.loadPdView.emit('1') } diff --git a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html index 814237603..60888e66e 100644 --- a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html @@ -128,3 +128,4 @@ + diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts index 5bde0ee3e..ac56fdf9e 100644 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts +++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts @@ -59,7 +59,7 @@ export class PdAllocationComponent implements OnInit { /** To update pd officer*/ updatePdOfficer(allocateDate:any) { if(this.isDisabled){ - this.notifier.notify('warning', 'Please Choose Minimum One PD Officer.!'); + this.notifier.notify('warning', 'Please Choose PD Officer.!'); } else { let updateData = { @@ -69,7 +69,7 @@ export class PdAllocationComponent implements OnInit { this._pd.updatePdOfficer(updateData).subscribe( result => { if (result.status == 200) { - // this.notifier.notify('success', 'Your Changes Updated.!'); + this.notifier.notify('success', 'PD Allocated.!'); this.dialogRef.close(); } else { diff --git a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts index c49f7aabd..62f166ac7 100644 --- a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts @@ -20,16 +20,10 @@ export interface Master { export class PdTrigerService { -<<<<<<< HEAD - //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; - private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/"; -======= private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; - //private apiUrl = "http://192.168.0.17:9999/AWSEC2/sparqapi/api/"; ->>>>>>> 4133406fb5c648cd6dc4e0fd326d6301cf87939f + //private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/"; + //private apiUrl = "http://ssa.sineedge.com/sparqtest/api/"; - - constructor(private _http: HttpClient, private _aws:AwsService) { } // get add pd master details @@ -126,7 +120,6 @@ export class PdTrigerService { ) } -<<<<<<< HEAD // get pd allocation to details getPdOfficerList(pdID:string): Observable { return this._http.post(this.apiUrl+"getListPDOfficers",{"pdid":pdID}) @@ -143,18 +136,10 @@ export class PdTrigerService { catchError(this.handleError('operation', [])) ) } - - private handleError(operation = 'operation', result?: T) { - return (error: any): Observable => { - return of(result as T); - }; - } -======= private handleError(operation = 'operation', result?: T) { return (error: any): Observable => { return of(result as T); }; } ->>>>>>> 4133406fb5c648cd6dc4e0fd326d6301cf87939f } diff --git a/ng6-seed/src/app/pd-triger/pd-triger.module.ts b/ng6-seed/src/app/pd-triger/pd-triger.module.ts index c947c0495..ce716f451 100644 --- a/ng6-seed/src/app/pd-triger/pd-triger.module.ts +++ b/ng6-seed/src/app/pd-triger/pd-triger.module.ts @@ -29,6 +29,7 @@ import { EditPdComponent } from './edit-pd/edit-pd.component'; import { ViewPdComponent } from './view-pd/view-pd.component'; import { EditPdMasterComponent } from './edit-pd-master/edit-pd-master.component'; import { EditPdApplicantComponent } from './edit-pd-applicant/edit-pd-applicant.component'; +import { PdAllocationComponent } from './pd-allocation/pd-allocation.component'; /** * Custom angular notifier options */ @@ -96,7 +97,8 @@ const pdCustomNotifierOptions: NotifierOptions = { MatDialogModule,MatSortModule, NgxMatSelectSearchModule,MatTooltipModule, ], - declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent], + declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent], + entryComponents:[PdAllocationComponent], providers: [PdTrigerService] }) export class PdTrigerModule { } diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html index 6e01a9e6c..f5d233149 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html @@ -1,14 +1,11 @@ - - -
+
+ +
@@ -62,21 +59,24 @@ -
- -
+ Documents - +

+ {{documents.pd_document_title}}     + +  {{documents.pd_document_name}} +

- @@ -87,3 +87,5 @@ + + diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts index 1e348b334..f0324f37e 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts @@ -1,8 +1,9 @@ import { Component, OnInit,ViewEncapsulation, EventEmitter, Input, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; -import { CustomValidators } from 'ng2-validation'; +import { MatDialog } from '@angular/material'; import { NotifierService } from 'angular-notifier'; import { PdTrigerService } from '../pd-service/pd-triger.service'; +import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component'; @Component({ selector: 'app-view-pd', templateUrl: './view-pd.component.html', @@ -24,8 +25,8 @@ export class ViewPdComponent implements OnInit { @Input() childData: string; @Output() loadParent = new EventEmitter(); public _EditPDtriggerForm:FormGroup; - constructor(private _fb: FormBuilder, - private _pd: PdTrigerService, notifier:NotifierService) { + constructor(notifier:NotifierService,private dialog: MatDialog,private _fb: FormBuilder, + private _pd: PdTrigerService) { this.notifier=notifier } @@ -42,6 +43,7 @@ export class ViewPdComponent implements OnInit { if (data.status == 200) { this.pdMasterData=data.records.pd_master_details; this.pdApplicantData= data.records.applicants_details; + this.pdDocumentsData=data.records.pd_documnets; this.pdLogsData=data.records.pd_logs; } }, error => this.errorMessage = error); @@ -59,7 +61,6 @@ export class ViewPdComponent implements OnInit { this.editApplicantData=applicantData; this.showEditApplicantComponent=!this.showEditApplicantComponent; } -<<<<<<< HEAD // pd allocation to // edit questions master details popup model pdAllocationTo(pdID:any) { @@ -69,13 +70,11 @@ export class ViewPdComponent implements OnInit { }); dialogRef.afterClosed() .subscribe(dataresult => { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - + // this.notifier.notify('success', 'Successfully allocated.!'); this.viewPdDetails(this.childData) }); } -======= ->>>>>>> 4133406fb5c648cd6dc4e0fd326d6301cf87939f + updateViewComponent(editBack:string) { if(editBack=='1'){ From dc93b1e186498aca2ebbfe2480c356041bedeb38 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sun, 7 Oct 2018 00:17:56 +0530 Subject: [PATCH 5/5] master :ps --- .../layouts/admin/admin-layout.component.html | 2 +- .../app/session/login/login-component.html | 6 +-- .../branch-dialog.component.html | 6 +-- .../branch-dialog/branch-dialog.component.ts | 25 +++++++++--- .../branch-list/branch-list.component.html | 37 ++++++++++++------ .../city-dialog/city-dialog.component.html | 8 ++-- .../city/city-dialog/city-dialog.component.ts | 20 +++++++--- .../city/city-list/city-list.component.html | 24 +++++++++--- ...comments-on-locality-dialog.component.html | 8 ++-- .../comments-on-locality-dialog.component.ts | 21 +++++++--- .../comments-on-locality-list.component.html | 26 +++++++++--- .../customer-behaviour-dialog.component.html | 8 ++-- .../customer-behaviour-dialog.component.ts | 20 +++++++--- .../customer-behaviour-list.component.html | 23 ++++++++--- .../customer-segment-dialog.component.html | 2 +- .../customer-segment-dialog.component.ts | 18 ++++++--- .../customer-segment-list.component.html | 21 +++++++--- .../designation-dialog.component.html | 2 +- .../designation-dialog.component.ts | 20 +++++++--- .../designation-list.component.html | 21 ++++++++-- .../frequency-dialog.component.html | 8 ++-- .../frequency-dialog.component.ts | 20 +++++++--- .../frequency-list.component.html | 22 ++++++++--- ...ustry_classification-dialog.component.html | 14 +++---- ...ndustry_classification-dialog.component.ts | 20 +++++++--- ...ndustry_classification-list.component.html | 23 ++++++++--- .../lender-hierarchy-dialog.component.html | 14 +++---- .../lender-hierarchy-dialog.component.ts | 20 +++++++--- .../lender-hierarchy-list.component.html | 24 +++++++++--- .../members-occupation-dialog.component.html | 14 +++---- .../members-occupation-dialog.component.ts | 20 +++++++--- .../members-occupation-list.component.html | 24 +++++++++--- .../pd-allocation-type-list.component.html | 16 ++++++-- .../pd-allocation-type-list.component.ts | 12 ++++-- ...pd-location-approach-dialog.component.html | 14 +++---- .../pd-location-approach-dialog.component.ts | 20 +++++++--- .../pd-location-approach-list.component.html | 22 ++++++++--- .../pd-notification-list.component.html | 18 ++++++--- .../pd-notification-list.component.ts | 19 +++++++-- .../pd-team-dialog.component.html | 12 +++--- .../pd-team-dialog.component.ts | 17 +++++--- .../pd-team-list/pd-team-list.component.html | 23 ++++++++--- .../pd-type-dialog.component.html | 14 +++---- .../pd-type-dialog.component.ts | 21 +++++++--- .../pd-type-list/pd-type-list.component.html | 23 ++++++++--- .../product-dialog.component.html | 14 +++---- .../product-dialog.component.ts | 20 +++++++--- .../product-list/product-list.component.html | 26 ++++++++---- .../question-category-dialog.component.html | 8 ++-- .../question-category-dialog.component.ts | 18 ++++++--- .../question-category-list.component.html | 28 +++++++++---- .../regions-dialog.component.html | 14 +++---- .../regions-dialog.component.ts | 18 ++++++--- .../regions-list/regions-list.component.html | 24 +++++++++--- .../relation-ship-dialog.component.html | 14 +++---- .../relation-ship-dialog.component.ts | 18 ++++++--- .../relation-ship-list.component.html | 25 +++++++++--- .../states-dialog.component.html | 14 +++---- .../states-dialog/states-dialog.component.ts | 18 ++++++--- .../states-list/states-list.component.html | 24 +++++++++--- .../sub-product-dialog.component.html | 12 +++--- .../sub-product-dialog.component.ts | 18 ++++++--- .../sub-product-list.component.html | 18 +++++++-- .../title-dialog/title-dialog.component.html | 12 +++--- .../title-dialog/title-dialog.component.ts | 18 ++++++--- .../title-list/title-list.component.html | 22 ++++++++--- .../activity-dialog.component.html | 14 +++---- .../activity-dialog.component.ts | 18 ++++++--- .../activity-list.component.html | 21 +++++++--- .../uom/uom-dialog/uom-dialog.component.html | 8 ++-- .../uom/uom-dialog/uom-dialog.component.ts | 18 ++++++--- .../uom/uom-list/uom-list.component.html | 22 ++++++++--- .../users/user-list/user-list.component.html | 2 +- .../users/user-list/user-list.component.ts | 6 +++ ng6-seed/src/favicon.ico | Bin 5430 -> 15086 bytes 75 files changed, 866 insertions(+), 398 deletions(-) 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 8081c7ceaf2be08bf59010158c586170d9d2d517..cfeddd3c13fb1f351eb467a7c016348ee8ecfe23 100644 GIT binary patch literal 15086 zcmeI23yhT2702&4v#`Umu-oNn7j{=t2)5NCG+J8Q)hdr5P_UIgXq2Qi*v8tliAH1F zUBrfvHl@b20>xL*#$u$k*j8JS0b~&$ zlsY`3MZ6qh4E2)J8OL#4u+4GId&v*e$baZK!A8gV_OKT02)XtOJgc7BzIX|uy| zy44#qlD3mT`C1;TpS?UwmG)3)JJ^hv?;3OcJI2(4yUBmz-!$F=4hI6Mx-nbngLZ~K z`fN1jkqySY1pPXE6|JWnYR(3OZT54Bw)?>WAij4P6Qu0~`dA4T)9)>mb)n2`YoiC` zbav84>)>|jVrwknm%awk{u##K4_!b%BaTu>d@^UPJ?$|jMBOR$Kc9LF!Lw@TVG-?* zG8ZniiL&1y<52i$ofO8_SY@>T9(6W&bz{_h4a^0<_b?ASpY}i5ZcKll0m;pLn>F!% z`qR%(>1PXA1Fz#*g9@HkLd%akPT(Li!1G4}cpdGA(zjU_r;`1bUO#*Jzlwh6ZDn0G z-%Sbfd(B%3b8XksMQIrSI@&%-+gIs(Oa!^b>xGgMemhR=X+t{$uR;2`3Cy66$+R!h zGwr=p$z{*Lv+W1@yD`tz&~dcy)4)8WYVSWk${wbj?FU`$vDqTlI_EfrM;vD$`d+++@uhdHLC)AXiTvnl?_G{Fmi_l-#@BvKYad?; zCeeNKKEQSrp%atY&$Zx7M*@MMbh0rAbAgSuwsS6&u}2{PQ|R>L*!OE?5M}3O%d?#% zt85*1xC~l@ommfklzFLoBVKOM@2s+M0^6kX=oB`Yc^C%|Yq6E}@bP1OfqtubhMhi!*sc*^39w>v> zG7rB0aD@DPbY!?22srSQmXD@BGflFKIydombY72VJ*;1%`QZNn_?XS}A;=PkIx{OIyY{Ad@c7ut^M}x(@)fEB;FsTy6E?7vx?_;*PH+djBtmvk zn8dTMfr(%O7)RMRSo^=gLyOM?RDRk<%BQ2NW#r9Hc(~93ADn+7*6?=Z`4@dfK}>xn z;XL_doTDt7Ft(is<<*uw`lk5B#|UXIj;4_}4e zO8ISxpzJm<3XH{WU5DLl<1`dQ}X3FK+=`QZNt@b(~gs$%IqeP0B% z72wm}Jyb`K-EMFGdGxWQ^GJPgMh6*VBz!Dn?BgCETH8M}&W+fFie%t#Uv(hiKJl^6 z(=3p`&fc--B739|e#SEH68JbHKA?wLlLils(0u~DzK-24O>>x()h^&`>kdobqMG+_ z!p926zu>P6d5yge=-hsh@q4E1IKv8@%eqV2vk{-E7ku2ycpKp(#`s%UkIC5T(g-}_ z&!#p!8IJE)KTOxU?|3$D0P;QzAG_h>ApakL#~#{qx(8-6$#;~k{{xWiXWf4dAC1h# z%k0_Dh(Gi$>q++q>7jQ94u_AY;GvE=n2LYUwVvl4-A}I+gF2@*@61a9x^gRP@f`V? z#4-lxe!(5_N)6R+KZ;jKSCC(GU&Opj0zc!t`~rJ6sChV>13ol{bVYn{$14M)xnGaO zhb}swgYg;GCg}=eo7Dh)C?h`ByQPD3$ZvP0sdQ0DH?wN(?5Z7+EcK!luS;1}(r9!qjbsMl0#9 z#ElQp2#o@p6b~H+rUA!P@k{ztoc#Yc|7Jjbk>UmE_|y5vJeJI>GHyAe5F<(@kV8`V{JF!`tXobXqzuO`10|9KR?lI}0f ztjV*i%?*?XbZ_sB*mx%Mrg`QbCV#VnHJHmiB#InO$T0^W@S3qa)BRU>{CrKin=|Ly zGll5&G~K6kw`5KBu+M&hPhI&Bp3ApBk;igKw_k=wWEqA|{FSw^F(KsGj9fp$*7j8# zSvHq5h2Q*3inB|%;jv6}&srSz;tegxREKVVmvgWu<@Oy#KH91?$e_C~yamv0#q!tt zu?p!2a=b?Qc+Qj%_A4jvI4)(S6&rk;hUl?ka*DUw*pIg!Cn)<9XZcr72Lc7ilb3## z{8rgf&bJUcpmzxk{#uA?e_^ZUVxxxfe%O&6$o9J)hR8TcXP*Y}_j&fu-&u>+_?IWg ze)MG)Yc+Tt^|b%8{jP{1GD=kwNXrPJ+|r|`G@PM9|5|1Urv&()815kxRH*8y&m>Kh5ZTe z%S8Qpi4^_S**pmPOrmc4@=$i3y%t8d@AUmc*@R0?;-45)57xgN^pEgf6B#VvtDgX` zKKhdP(T93Idh=iCB~Ygnl*8jA%(*=)eExlk9H)`-73{!hVnWtGyp%hj_@`YZ{mi1j zjf}SgY-5hv!&aUN^a7BG9#%tzI-dDh&Hpu&tzYVm z)kS-Y@}um#8R&R_&gH^GyvOH$QzS5ccW5Gt>DvOES1c$`onq=1qlY~N>{3tcVJUhY zYGvvY{wO}nTFSl_BF`A)Xnog}xF)iRJX?&c*S?Ri*y9d?t+g>gNY>L? z={Te4+=TXm&*|{H0Xbrca*#hMy}^!L1OF8r0si~3=K@)0K4Ac2j@Gsibm~LYr z=^=V+JhqHI|jqZ_T-r+TZj?2!k zD{lQ32A+3Qem6F;C-JZlau*SQDa2=Wa?Wf!11kQ7?Y8#;B&UkA>^XVSoi>0`>{Bib?XbJ0b7jnD}|Mq^S{li+^r26u6-0q#C!WzEAqCQUkbu3TuImPLg0O-}&s#@fTAcxNF7ts45I=3(99z*l2 zC%tRaxvYfE{j}#FHX)0?HMxVcB`BMm&F?Vn;FtL$e~10=`-eBO2G1iyBl653wfV)5AU{$^?pk} zYQ87kWA(lboi@Aprh^#dG|QvkJibKz#Nw==~64Oa;kx z^Et2YY`p#NAX6{S#LK#ib(XBUgK16vSN2b5%~P(%jejk~*CtA7MyvIQ zOQOCyg1Y)_Nwn6Zk(zj3-!-YcMISpsV@{mf@0ZBCVJe75s301pC(#xl8Z*_Fy0stM(Kiwwi{8m))ZPA@o3beEgp4!8urFT0=1I_mLh7L hhCLdoiRYu$aT?S3O0zu5h1lkgd(>-Z`LYj;`7aaVY+(QZ literal 5430 zcmc(je{54#6vvCoAI3i*G5%$U7!sA3wtMZ$fH6V9C`=eXGJb@R1%(I_{vnZtpD{6n z5Pl{DmxzBDbrB>}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975; z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G zQLe{yWA(Y6(;>y|-efAy11k<09(@Oo1B2@0`PtZSkqK&${ zgEY}`W@t{%?9u5rF?}Y7OL{338l*JY#P!%MVQY@oqnItpZ}?s z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8 z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&Wo^4P^Y z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>vtNq_5AB|0N5U*d^T?X9{xQnJYeU{ zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|( z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS- zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn= z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky humW;*g7R+&|Ledvc-