diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index 6aa704baa..7de75ace6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -52,8 +52,9 @@ - - Applicant {{i+2}} +
+ + Applicant {{coDetails.value.coapplicantindex}} @@ -100,8 +101,17 @@ --> - +
+
+ +
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index f1fa6f527..8fb0c569f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -20,12 +20,13 @@ export class EditPdApplicantComponent implements OnInit { public notifier: NotifierService; mainApplicantData: any[]; coApplicantData: any[]; + coApplicantDataIndex: number=1 ; coApplicantItems:FormArray; emptyData:any; relationShipList:any; titleList: any; CSAbbr:any; - disableAfterSubmit: boolean; + disableAfterSubmit: boolean; constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService, private dialogRef: MatDialogRef, @@ -40,6 +41,8 @@ export class EditPdApplicantComponent implements OnInit { if(this.data.records.length>0){ this.mainApplicantData= this.data.records.filter(item => item.applicant_type == 1); this.coApplicantData= this.data.records.filter(item => item.applicant_type == 0); + // this.coApplicantDataIndex= this.data.records.filter(item => item.applicant_type == 0 && item.isactive == 1); + // console.log(this.coApplicantDataIndex); this.loadApplicantFormData(); } else{ @@ -85,7 +88,7 @@ export class EditPdApplicantComponent implements OnInit { applicant_type: [this.mainApplicantData[0].applicant_type, Validators.compose([Validators.required])], applicant_title_name: [this.mainApplicantData[0].applicant_title_name, Validators.compose([Validators.required])], - coApplicantItems: this._fb.array([]), + coApplicantItems: this._fb.array([]), }); // bind dynamic co applicant data if(this.coApplicantData.length > 0){ @@ -95,8 +98,14 @@ export class EditPdApplicantComponent implements OnInit { } } - createItem(listData): FormGroup { - if(listData){ + createItem(listData): FormGroup { + if(listData){ + if(listData.hasOwnProperty('isactive')){ + if(listData.isactive == 1 ){ + this.coApplicantDataIndex+=1 + } + } + // console.log(listData); let stdcode; let landline; if(listData.landline != null){ @@ -119,9 +128,12 @@ export class EditPdApplicantComponent implements OnInit { // relationship: [listData.relation], applicant_type: [listData.applicant_type, Validators.compose([Validators.required])], company_name: [listData.company_name], + coapplicantindex:[listData.isactive == 1 ? this.coApplicantDataIndex:''], + isactive: [listData.isactive || 1], }); } else{ + this.coApplicantDataIndex+=1 return this._fb.group({ label: ['Co Applicant'], fk_applicant_primary_id: [null], @@ -134,17 +146,44 @@ export class EditPdApplicantComponent implements OnInit { // relationship: [null], applicant_type: [0], company_name: [null], + coapplicantindex:[this.coApplicantDataIndex], + isactive: [1], }); } - + }; addCoApplicant(listData) { if(this._EditApplicantForm.valid){ this.coApplicantItems = this._EditApplicantForm.get('coApplicantItems') as FormArray; this.coApplicantItems.push(this.createItem(listData)); } + else{ + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); + } } + + removecoapplicant(codetails,i){ + console.log(codetails); + let control: any = this._EditApplicantForm.get('coApplicantItems') as FormArray; + console.log(control); + if(codetails.value.fk_applicant_primary_id == null){ + control.removeAt(i); + this.coApplicantDataIndex-=1 + } + else{ + control.controls[i].controls.isactive.setValue(0); + control.controls[i].controls.applicant_title_name.clearValidators(); + control.controls[i].controls.coapplicantName.clearValidators(); + control.controls[i].controls.coapplicant_mobile_no.clearValidators(); + control.controls[i].controls.coapplicant_stdcode.clearValidators(); + control.controls[i].controls.coapplicant_landline.clearValidators(); + control.controls[i].controls.company_name.clearValidators(); + control.controls[i].controls.applicant_type.clearValidators(); + this.coApplicantDataIndex-=1 + + } + } get pdMainApplicant() { return this._EditApplicantForm.controls; } get pdCoApplicant() { return this._EditApplicantForm.get('coApplicantItems') as FormArray; } @@ -248,7 +287,7 @@ export class EditPdApplicantComponent implements OnInit { "landline":concat_landline, "applicant_type":itemElement.applicant_type, "company_name":itemElement.company_name, - "isactive":1 + "isactive": itemElement.isactive, } pd_applicant_details.push(obj1) }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index ffe210926..c22312cf2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -302,7 +302,8 @@ - + +

@@ -320,6 +321,7 @@ {{applicant.relation_name}}

+
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 d2380d6c5..b37b110ca 100755 --- 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,4 +1,4 @@ -
+
diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts index 6e3aa81c9..adb00948c 100755 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts @@ -60,8 +60,7 @@ export class EntityListComponent implements OnInit { } ngOnInit() { - this.getCategorMaster(); - this.getEntityListMasters(); + } // get question master list details @@ -77,6 +76,8 @@ export class EntityListComponent implements OnInit { // this.questionListData = data.records; this.dataLength = data.records.length; this.dataSource.data = this.enityList; + this.dataSource.paginator = this.paginator; + } else { this.enityList = []; this.dataLength = null; @@ -104,6 +105,8 @@ export class EntityListComponent implements OnInit { } ngAfterViewInit() { + this.getCategorMaster(); + this.getEntityListMasters(); this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; } diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html index 6d38e18e1..1904d5a68 100755 --- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html +++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html @@ -1,4 +1,4 @@ -
+