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 @@ -
- + +
-
+ +