From cc46c619a8edd72370011ff36a6a385c17595f66 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 19 Jun 2019 15:00:13 +0530 Subject: [PATCH] address form field changes : ps --- .../list-pd/all-pd/all-pd.component.html | 6 +- .../completed-pd/completed-pd.component.ts | 1 + .../inprogress-pd/inprogress-pd.component.ts | 1 + .../qc-completed-pd.component.ts | 2 +- .../scheduled-pd/scheduled-pd.component.ts | 1 + .../forms/address/address.component.html | 58 +++++++++++++- .../forms/address/address.component.ts | 80 ++++++++++++++++--- 7 files changed, 132 insertions(+), 17 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 8346f205f..2702d8782 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -12,7 +12,7 @@
- + {{type.type_name}} @@ -21,7 +21,7 @@ {{status.pd_status_name}} - +     @@ -71,7 +71,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index 33c765f6f..80beed35b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -24,6 +24,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { errorMessage:any[]=[]; tabStatus:string="COMPLETED"; pipe = new DatePipe('en-US'); + todaydate:Date = new Date(); private notifier: NotifierService; public dataLengthTab4: number; public dataSourceTab4 = new MatTableDataSource(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index c8c5e79f3..fa03c54e9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -22,6 +22,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { errorMessage:any[]=[]; tabStatus:string="INPROGRESS"; pipe = new DatePipe('en-US'); + todaydate:Date = new Date(); private notifier: NotifierService; public dataLengthTab2: number; public dataSourceTab2 = new MatTableDataSource(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index 048ae469c..e718e85b5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -24,7 +24,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { errorMessage: any[] = []; tabStatus: string = "QC_COMPLETED"; pipe = new DatePipe('en-US'); - + todaydate:Date = new Date(); public dataLengthTab5: number; public dataSourceTab5 = new MatTableDataSource(); tempStore = new MatTableDataSource(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index aff7f1ffd..5bb90b5de 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -23,6 +23,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { tabStatus:string="SCHEDULED"; pipe = new DatePipe('en-US'); searchForm:FormGroup; + todaydate:Date = new Date(); public dataLengthTab3: number; public dataSourceTab3 = new MatTableDataSource(); private notifier: NotifierService; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index d0e84a8a8..0df28f78d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -32,7 +32,7 @@
- @@ -43,7 +43,7 @@
+ (selectionChange)="getCityAndPincodeDetails($event.value,i,1)"> Select {{SL.name}} @@ -67,11 +67,63 @@ Pincode Required -
+
+ + Is This Address PD is being done ? ( {{item.get('pd_is_done_on_initiated_address').value===true ? 'Yes' : 'No'}} ) + +
+
+ +
+ + + + Alternative Address Required + +
+ +
+ + + Select + {{SL.name}} + + + + + + Select + {{CL.city_name}} + + + + + + Select + {{PL.pincode}} + + + + + + Pincode Required + +
+ +
+ + + Reason Required + +
+
element.address_type_id == datas.address_type)[0]; if(selectedAddressType){ this.selectedAddressType(selectedAddressType.address_type, index); @@ -159,7 +163,23 @@ export class AddressComponent implements OnInit { if (datas.address_type == 1) { this.selectedAddressType(datas.address_type_others, index); } + control.push(this.createAddresses(obj)); + + if(datas.pd_is_done_on_initiated_address === false){ + this.getCityAndPincodeDetails(datas.alternative_state,index,2); + console.log('datas.pd_is_done_on_initiated_address',datas.pd_is_done_on_initiated_address,index); + let ChildCtrl : any = control.controls[index]; + ChildCtrl.addControl('alternative_address', new FormControl(datas.alternative_address, Validators.required)); + ChildCtrl.addControl('alternative_state', new FormControl(datas.alternative_state)); + ChildCtrl.addControl('alternative_city', new FormControl(datas.alternative_city)); + ChildCtrl.addControl('alternative_pincode', new FormControl(datas.alternative_pincode)); + ChildCtrl.addControl('alternative_pincode_others', new FormControl(datas.alternative_pincode_others, Validators.required)); + // data.alternative_pincode == 1 + // ? ChildCtrl.addControl('alternative_pincode_others', new FormControl(data.alternative_pincode_others)) + // : ChildCtrl.removeControl('alternative_pincode_others'); + ChildCtrl.addControl('reason_for_alternative_address', new FormControl(datas.reason_for_alternative_address, Validators.required)); + } }); } @@ -264,6 +284,7 @@ export class AddressComponent implements OnInit { 'pinSearch':'', 'pincode': val.pincode_id, 'pincode_others': val.other_pincode, + 'pd_is_done_on_initiated_address':true, 'locality': '', 'locality_others': '', // 'locality_mixuse': '', @@ -273,7 +294,7 @@ export class AddressComponent implements OnInit { 'uom': '', 'uom_others': '' } - this.getCityAndPincodeDetails(val.fk_state, index); + this.getCityAndPincodeDetails(val.fk_state,index,1); this.getOtherPincode(val.pincode_id, index); control.push(this.createAddresses(obj)); }); @@ -335,7 +356,9 @@ export class AddressComponent implements OnInit { /** FOR Adress */ createAddresses(AddressDetails): FormGroup { + console.log(AddressDetails); if (AddressDetails != null) { + console.log(AddressDetails); return this.fb.group({ address: [this.transformName(AddressDetails.address), Validators.compose([Validators.required])], address_type: [AddressDetails.address_type || '', Validators.compose([Validators.required])], @@ -347,6 +370,7 @@ export class AddressComponent implements OnInit { pinSearch:[''], pincode: [AddressDetails.pincode],/** ,Validators.compose([Validators.minLength(6),Validators.maxLength(6)]) */ pincode_others: [AddressDetails.pincode_others, Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], + pd_is_done_on_initiated_address:[AddressDetails.pd_is_done_on_initiated_address], locality: [AddressDetails.locality, Validators.compose([Validators.required])], locality_others: [AddressDetails.locality_others], // locality_mixuse: [AddressDetails.locality_mixuse], @@ -356,7 +380,6 @@ export class AddressComponent implements OnInit { uom: [AddressDetails.uom], uom_others: [AddressDetails.uom_others] }); - } else { return this.fb.group({ @@ -370,6 +393,7 @@ export class AddressComponent implements OnInit { pinSearch:[''], pincode: [''], pincode_others: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], + pd_is_done_on_initiated_address:[true], locality: ['', Validators.compose([Validators.required])], locality_others: [''], // locality_mixuse: [''], @@ -421,18 +445,48 @@ export class AddressComponent implements OnInit { /** To Get City And Pincode Data For Address Form * Param 'stateID' -> selected StateId */ - getCityAndPincodeDetails(stateID: string, index) { - this._pd.getStateWiseCities(stateID).subscribe(data => { - if (data.status == 200) { - this.cityData[index] = data.records.cities; - this.pincodeData[index] = data.records.pincode; - } - }); + getCityAndPincodeDetails(stateID: string, index,flag) { + + this._pd.getStateWiseCities(stateID).subscribe(data => { + if (data.status == 200) { + if(flag==1){ + this.cityData[index] = data.records.cities; + this.pincodeData[index] = data.records.pincode; + }else if(flag == 2){ + this.alertnativeCityData[index] = data.records.cities; + this.alertnativePincodeData[index] = data.records.pincode; + } + } + }); } getOtherPincode(e, i) { this.otherPincodeFlag[i] = e == 1 ? true : false; } transformName(vals){ return this.titlecasePipe.transform(vals); } + alternativeAddress(e,i,flag){ + const control = this.addressForm.controls['addresses']; + let ChildCtrl : any = control.controls[i]; + + if(e==false){ + if(flag==1){ + ChildCtrl.addControl('alternative_address', new FormControl('', Validators.required)); + ChildCtrl.addControl('alternative_state', new FormControl('')); + ChildCtrl.addControl('alternative_city', new FormControl('')); + ChildCtrl.addControl('alternative_pincode', new FormControl('')); + ChildCtrl.addControl('alternative_pincode_others', new FormControl('', Validators.required)); + ChildCtrl.addControl('reason_for_alternative_address', new FormControl('', Validators.required)); + } + } + else{ + ChildCtrl.removeControl('alternative_address'); + ChildCtrl.removeControl('alternative_state'); + ChildCtrl.removeControl('alternative_city'); + ChildCtrl.removeControl('alternative_pincode'); + ChildCtrl.removeControl('alternative_pincode_others'); + ChildCtrl.removeControl('reason_for_alternative_address'); + } + } + /** TO Save Address Forms Details*/ onSubmit() { @@ -468,6 +522,12 @@ export class AddressComponent implements OnInit { } ChildCtrl.controls['pincode_others'].updateValueAndValidity(); + if(ChildCtrl.controls.alternative_pincode){ + if(ChildCtrl.controls.alternative_pincode.value != 1){ + ChildCtrl.removeControl('alternative_pincode_others'); + } + } + // data.controls.locality.value == 5 // ? this.addressForm.controls['locality_mixuse'].setValidators([Validators.required]) // : this.addressForm.controls['locality_mixuse'].clearValidators();