diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 474e9ad..2b6a7e8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -188,6 +188,12 @@ Address Details + + + {{ val.display }} + + Required. +
@@ -250,7 +256,7 @@
- + - - + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss index ac8192c..a5c612d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss @@ -37,4 +37,24 @@ mat-radio-button,mat-checkbox{ ::ng-deep .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-thumb { background-color:rgb(212, 15, 15); +} +// .large-select { + // ::ng-deep .mat-select-panel .mat-optgroup-label, .mat-select-panel .mat-option { + // height: unset; + // } + + // ::ng-deep .mat-option-text { + // white-space: normal; + // } + + +// } +.large-select-option { + height: unset !important; + line-height: 1.2em !important; + padding-top: 0.9em !important; + padding-bottom: 0.9em !important; + span { + white-space: normal; + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 180193f..44efbc1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -73,6 +73,8 @@ export class AddPdComponent implements OnInit, OnDestroy { billingtolist: any; removedControl: any = []; excel_file_id: any = null; + choosed_address:FormControl = new FormControl('') + addressList:any = [] constructor(notifier: NotifierService, private _fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, private _aws: AwsService, private ListPdComponent: ListPdComponent, private titleCase : TitleCasePipe,private userService:UserService,private matDialog:MatDialog) { @@ -1134,6 +1136,7 @@ searchFun(control:any,i:number,option){ maxWidth:'75vw' }) dialogRef.afterClosed().subscribe(result=>{ + if(result) { this.excel_file_id = result.excel_file_id console.log(result,JSON.stringify(result)); // let formValues = {} @@ -1157,13 +1160,35 @@ searchFun(control:any,i:number,option){ this.addCoApplicant() } } + if(key_name == 'address_details') { + this.addressList = records['address_details'] + let control_address = this._PDtriggerForm.get('addresses')['controls'][0] as FormArray + control_address.get('addressline1').disable() + control_address.get('fk_state').disable() + control_address.get('fk_city').disable() + control_address.get('pincode').disable() + this.choosed_address.setValidators(Validators.required) + } // formValues[val.key_name] = val.value } }) this._PDtriggerForm.patchValue(records) } + } }) } + onChangeSelectedAddress(value) { + console.log(value) + if(value) { + let control_address = this._PDtriggerForm.get('addresses')['controls'][0] as FormArray + console.log(control_address); + control_address.get('addressline1').setValue(value.addressline) + control_address.get('fk_state').setValue(value.state) + this.getCityList(value.state,0); + control_address.get('fk_city').setValue(value.city) + control_address.get('pincode').setValue(value.pincode) + } + } changePDTypeSlideValue(event) { if(event.checked) { this._PDtriggerForm.controls['fk_pd_type'].setValue('3') diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts index 38b8c74..17cc53f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts @@ -136,8 +136,20 @@ export class DynamicFormComponent implements OnInit { control.push(this._fb.group(control_names)) json_obj.question.forEach((group_indi,arr_index)=>{ - // console.log("sd",childControl) + + + if(group_indi.is_repeatable == '2' && group_indi.hasOwnProperty('questions_level_two') && group_indi.questions_level_two.length > 0) { + group_indi.questions_level_two[0].forEach((child_val,child_index)=> { + // console.log("sd",group_indi,arr_index,control.at(control.length-1),control) + // debugger; + let child_control = control.at(control.length-1).get(group_indi.group_key) as FormArray + + this.questionService.addAdditionalControl(child_val, child_control.controls[child_control.length-1], child_index) + }) + } + else{ this.questionService.addAdditionalControl(group_indi, control.controls[control.length-1], arr_index) + } }) json_obj.question = JSON.parse(JSON.stringify(json_obj.question)) control.updateValueAndValidity(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/ques-form/ques-form.service.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/ques-form/ques-form.service.ts index 67088ae..7ec6787 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/ques-form/ques-form.service.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/ques-form/ques-form.service.ts @@ -103,7 +103,7 @@ export class QuesFormService { val.group_questions[0].forEach((group_indi,arr_index)=>{ console.log("sd",childControl,group_indi) if(group_indi.is_repeatable == '2' && group_indi.hasOwnProperty('questions_level_two') && group_indi.questions_level_two.length > 0) { - group_indi.questions_level_two.forEach((child_val,child_index)=> { + group_indi.questions_level_two[0].forEach((child_val,child_index)=> { this.addAdditionalControl(child_val, childControl.at(0).get(group_indi.group_key).controls[0], child_index) }) } 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 c6b58e0..8b8f452 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 @@ -200,8 +200,8 @@ - - + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index ded49e3..a0d0eb3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -507,7 +507,7 @@ else { /** To update pd officer*/ selfAllocation(city_id) { - if(this.LenderRoleID == '27') { + if(this.LenderRoleID == '27' || this.LenderRoleID == '25') { const dialogRef1 = this.dialog.open(PdAllocationComponent, { data: { pd_id:this.viewID, pd_status: this.pdStatusCheck.ALLOCATED,random_string:this.pdMasterData[0].random_string,dialogType:'actionOnly',city_id:city_id, lender_role_id:this.LenderRoleID }, disableClose: true, diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json index 0362048..a2857c1 100644 --- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json +++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json @@ -103,7 +103,13 @@ "answers":null, "is_repeatable":null, "validations":[ - + { + "name":"pattern", + "isactive":"1", + "validator":"[0-9]{10}", + "message":"Mobile number should be 10 digit", + "value":null + } ] } ],