From ce5fc13f314c271d28ae95bfeeec52c14efe7653 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 1 Feb 2022 13:15:37 +0530 Subject: [PATCH] credit manager query issue fixed. --- .../dynamic-form/dynamic-form.component.ts | 34 +++++++++++++++-- .../start-pd/forms/form/form.component.ts | 38 +++++++++++++++---- 2 files changed, 62 insertions(+), 10 deletions(-) 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 07fb301..bbb2443 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 @@ -22,6 +22,7 @@ export class DynamicFormComponent implements OnInit { @ViewChild('mapanel') matExpansionPanel:MatExpansionPanel @ViewChild('accordion') Accordion: MatAccordion queries_docs: any; + records: { addtional_requirements: any; createdby: string; pdid: any; }; constructor(private _fb:FormBuilder,private questionService:QuesFormService,private pdTriggerService:PdTrigerService) { } ngOnInit() { @@ -214,17 +215,44 @@ export class DynamicFormComponent implements OnInit { removeData(index,json_obj) { // debugger; + console.log(json_obj); + let control = this.form_group_name.get(json_obj.group_key) as FormArray console.log(control) control.removeAt(index) if(this.json_answers){ + console.log(this.json_answers[json_obj.group_key]) + if(this.json_answers.cm_queries instanceof Array){ + console.log(this.json_answers.cm_queries[index].question); + let data = localStorage.getItem('pd_additional_requirements'); + console.log(JSON.parse(data)); + let additional_requirements; + let tmp = JSON.parse(data) + if(tmp.length != 0){ + tmp.forEach(element => { + if(element.add_requirement == this.json_answers.cm_queries[index].question){ + element.isactive = '0' + + } + tmp.forEach(element => { + element.is_insert_json ="1" + }); + console.log(tmp); + additional_requirements = tmp; + }); + localStorage.setItem('pd_additional_requirements', JSON.stringify( additional_requirements)); + localStorage.setItem('check', '1'); + + console.log(additional_requirements); + } + + + } if(this.json_answers[json_obj.group_key] != null && this.json_answers[json_obj.group_key] instanceof Array){ this.json_answers[json_obj.group_key].splice(index,1) } - if(this.json_answers.cm_queries instanceof Array){ - this.json_answers.cm_queries.splice(index,1) - } + } console.log(control) json_obj.group_questions.splice(index,1) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts index 67a9903..3d287ff 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts @@ -227,9 +227,11 @@ else console.log(pdid) this.pdTriggerService.getAdditionalRequirements(pdid).subscribe(res=>{ console.log(res) + if(res['dataStatus']){ this.additional_query =[]; this.queries_value=res['records'].pd_additional_requirements + localStorage.setItem('pd_additional_requirements', JSON.stringify( this.queries_value)); } }) @@ -433,13 +435,35 @@ else }); this.additional_requirements = this.queries_value - console.log(queries_docs); - - this.records ={ - "addtional_requirements": this.additional_requirements, - "createdby":"", - "pdid": this.pdid , - } + console.log(this.queries_value); + + let check = localStorage.getItem('check'); + if(check == "1"){ + let data = localStorage.getItem('pd_additional_requirements'); + console.log(JSON.parse(data)); + let additional_requirements = JSON.parse(data) + this.additional_requirements.forEach(element => { + element.is_insert_json ="1" + }); + this.records ={ + "addtional_requirements": additional_requirements, + "createdby":"", + "pdid": this.pdid , + } + localStorage.setItem('check', '0'); + + }else{ + this.queries_value.forEach(element => { + element.is_insert_json ="1" + }); + this.additional_requirements = this.queries_value + this.records = { + "addtional_requirements": this.additional_requirements, + "createdby":"", + "pdid": this.pdid , + } + } + console.log(this.commonFormGroup); console.log('data');