credit manager queries form changes

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html

@@ -1,38 +1,36 @@
 <form [formGroup]="_EditPDRequirementForm" novalidate>
 
-    <h2 mat-dialog-title class="paragraph_change">
+        <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left" style="padding: 10px !important;">
+                <div fxFlex="70" align="left" style="padding: 10px !important;">
-                    {{pageTitle}}
+                        {{pageTitle}}
-            </div>
+                </div>
-            <div fxFlex="30" align="end" style="padding: 10px !important;">
+                <div fxFlex="30" align="end" style="padding: 10px !important;">
-                    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
+                        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
                 
-            </div>
+                </div>
-    </h2>
+        </h2>
         
-    <mat-dialog-content>
+        <mat-dialog-content>
         
-      <mat-card formArrayName="addtional_requirements" *ngFor="let requirements of pdRequirements.controls; let i = index;">
+          <mat-card formArrayName="addtional_requirements" *ngFor="let requirements of pdRequirements.controls; let i = index;">
-          <mat-card-content [formGroupName]="i" *ngIf="requirements.value.isactive != 0">
+              <mat-card-content [formGroupName]="i" *ngIf="requirements.value.isactive != 0">
-                  <mat-form-field style="width: 90%;" >
+                      <mat-form-field style="width: 90%;" >
-                          <input matInput placeholder="Requirement" formControlName="add_requirement">
+                              <input matInput placeholder="Requirement" formControlName="add_requirement">
-                  </mat-form-field>
+                      </mat-form-field>
     
-                  <button mat-raised-button mat-icon-button color="primary" matTooltip="Delete" matTooltipPosition="above" (click)="removeRequirements(i)" type="button"><mat-icon>delete</mat-icon></button>
+                      <button mat-raised-button mat-icon-button color="primary" matTooltip="Delete" matTooltipPosition="above" (click)="removeRequirements(i,_EditPDRequirementForm.value)" type="button"><mat-icon>delete</mat-icon></button>
-          </mat-card-content>
+              </mat-card-content>
                   
-      </mat-card>
+          </mat-card>
                
         
-    </mat-dialog-content>
+        </mat-dialog-content>
-    <mat-dialog-actions align="end">
+        <mat-dialog-actions align="end">
     
-    <button type="button" mat-raised-button mat-icon-button (click)="addRequiremnts(const_requirement)" matTooltip="Add More Additional Requirements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button"> <mat-icon>add</mat-icon> </button>
+        <button type="button" mat-raised-button mat-icon-button (click)="addRequiremnts(const_requirement)" matTooltip="Add More Additional Requirements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button"> <mat-icon>add</mat-icon> </button>
-    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="updateAdditionalRequirement(_EditPDRequirementForm.value)"><mat-icon>save</mat-icon></button>           
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="updateAdditionalRequirement(_EditPDRequirementForm.value)"><mat-icon>save</mat-icon></button>           
-    </mat-dialog-actions>
+        </mat-dialog-actions>
-    
-    </form>
-
-<!-- <notifier-container></notifier-container> -->
         
+        </form>
     
+    <!-- <notifier-container></notifier-container> -->

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts

@@ -22,7 +22,9 @@ export class PdRequirementComponent implements OnInit {
     "earning_ans": '',
     "isactive": 1,
   };
-  constructor(private _fb: FormBuilder,
+  form_data: any=[];
+  records: { addtional_requirements: any; createdby: string; pdid: any; };
+  constructor(private _fb: FormBuilder, private pdTriggerService:PdTrigerService,
     private _pd: PdTrigerService, notifier: NotifierService,private dialogRef: MatDialogRef<PdRequirementComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any) {
       this.notifier=notifier 
@@ -54,6 +56,8 @@ export class PdRequirementComponent implements OnInit {
         add_req_id:[receive.add_req_id],
         add_requirement: [receive.add_requirement, Validators.compose([Validators.required])],
         isactive: [receive.isactive],
+        is_insert_json:[receive.is_insert_json],
+        
       });
     };
     addRequiremnts(getData:any) {
@@ -66,8 +70,56 @@ export class PdRequirementComponent implements OnInit {
       }
     }
 
-    removeRequirements(index: number) {
+    removeRequirements(index: number,formValue: any) {
+      console.log(index)
+      console.log(formValue)
+      console.log(formValue.pdid)
      
+      console.log( formValue.addtional_requirements[index].add_requirement)
+    
+      if(formValue.addtional_requirements[index].add_requirement !=''){
+
+      
+      let remove_name = formValue.addtional_requirements[index].add_requirement;
+      let params = {"fk_pd_id":formValue.pdid,"fk_form_id":"18"}
+      this.pdTriggerService.getSMCCreditPDSectionData(params).subscribe(result=>{
+        console.log(result)
+        if(result['dataStatus']) {
+          let records = result['records']
+          let formValues:any ={};
+          if(records && records.hasOwnProperty('json') && records.json) {
+           formValues = JSON.parse(records.json)
+           console.log(formValues)
+
+                   formValues.cm_queries.forEach(element => {
+          element.parent_id
+          console.log(element.parent_id)
+          if(element.question == remove_name){
+            var formula_index:any =   formValues.cm_queries.indexOf(element); 
+            console.log(formula_index)
+            const index = formula_index
+          if (index > -1) {
+            formValues.cm_queries.splice(index, 1);
+          }
+          }
+         
+        });
+        console.log(formValues)
+        this.form_data = formValues
+        console.log( this.form_data)
+        let param :any = {"fk_pd_id":formValue.pdid,"fk_form_id":"18","json": this.form_data,createdby:''}
+     
+        console.log(param)
+         
+      this.pdTriggerService.saveSMCCreditPDsection(param).subscribe(result=>{
+        if(result['dataStatus']) {
+          console.log("insert")
+        }
+      })
+          }
+        }
+      })
+    }
       const requirement_control = <FormArray>this._EditPDRequirementForm.controls['addtional_requirements'];
       console.log(requirement_control)
       if(requirement_control.value[index].add_req_id != ''){
@@ -81,14 +133,68 @@ export class PdRequirementComponent implements OnInit {
     }
 
       updateAdditionalRequirement(formValue: any) {
+        console.log(formValue)
+        console.log(formValue.addtional_requirements)
+        let cm_queries =[];
+        console.log(formValue)
         if(this._EditPDRequirementForm.invalid) {
           this.validateAllFormFields(this._EditPDRequirementForm)
           return;
         }
         else {
+          let params = {"fk_pd_id":formValue.pdid,"fk_form_id":"18"}
+          this.pdTriggerService.getSMCCreditPDSectionData(params).subscribe(result=>{
+            console.log(result)
+            if(result['dataStatus'] == false) {
+              console.log("result")
+                   for (let i = 0; i < formValue.addtional_requirements.length; ++i) { 
+            console.log(formValue.addtional_requirements[i].is_insert_json)
+          console.log(formValue.addtional_requirements[i].add_requirement)
+          // const result =  formValues.cm_queries.filter(word =>  word.question ==  this.queries_value[i].add_requirement);
+          // console.log(result)
+          // var formula_index:any =   formValues.cm_queries.indexOf(formValues.cm_queries.filter(word =>  word.question ==  this.queries_value[i].add_requirement)); 
+          // console.log(formula_index)
+          // let tmp_data =  {question:this.queries_value[i].add_requirement, answer: ''}
+          if(formValue.addtional_requirements[i].is_insert_json == null){
+            cm_queries.push({question:formValue.addtional_requirements[i].add_requirement, answer: ''})
+          }
+         
+
+          } 
+          //formValues.cm_queries.push({question:this.queries_value[i].add_requirement, answer: '',parent_id:this.queries_value[i].add_req_id})
+          this.form_data={cm_queries:cm_queries,common_remarks: ""}
+          let param :any = {"fk_pd_id":formValue.pdid,"fk_form_id":"18","json": this.form_data,createdby:''}
+     
+          console.log(param)
+          formValue.addtional_requirements.forEach(element => {
+            element.is_insert_json ="0"
+           });
+
+          this.records ={
+            "addtional_requirements": formValue.addtional_requirements,
+            "createdby":"",
+            "pdid": formValue.pdid ,
+          }
+          console.log(this.records)
+        this.pdTriggerService.saveSMCCreditPDsection(param).subscribe(result=>{
+          if(result['dataStatus']) {
+            console.log("insert")
+            this._pd.saveAdditionalRequirements( this.records).subscribe(result => {
+              if (result.status == 200) {
+                console.log( "updated")
+                this.notifier.notify('success', 'Additional Requirements Updated.');
+                this.dialogRef.close();
+              }
+            })
+          }
+        })
+            }else{
+              console.log("dd")
+        
          let records:any=formValue;
         
         this._pd.saveAdditionalRequirements(records).subscribe(result => {
+          console.log(result)
           if (result.status == 200) {
             this.notifier.notify('success', 'Additional Requirements Updated.');
             this.dialogRef.close();
@@ -99,7 +205,11 @@ export class PdRequirementComponent implements OnInit {
         }, error => {
           this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
         });
+      }
+    })
+
         }
+        
       }
 
         // validate all form group and form array fields

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/ques-form/ques-form.service.ts

@@ -70,48 +70,50 @@ export class QuesFormService {
        if(val.group_key=='cm_queries')
        {
        
-        this.pdTriggerService.getAdditionalRequirements(pdid).subscribe(res=>{
+      //   this.pdTriggerService.getAdditionalRequirements(pdid).subscribe(res=>{
-          if(res['dataStatus']){
+      //     if(res['dataStatus']){
-           this.queries_docs=res['records'].pd_additional_requirements
+      //      this.queries_docs=res['records'].pd_additional_requirements
-           localStorage.setItem('queriesviewdata',this.queries_docs)
+      //      localStorage.setItem('queriesviewdata',this.queries_docs)
-           console.log('quesries');
+      //      console.log('quesries');
-           console.log(this.queries_docs);
+      //      console.log(this.queries_docs);
-            for (let i = 0; i < this.queries_docs.length; ++i) { 
+      //       for (let i = 0; i < this.queries_docs.length; ++i) { 
-           childControl.push(this._fb.group(control_names))
+      //      childControl.push(this._fb.group(control_names))
-           console.log('groupquestion');
+      //      console.log('groupquestion');
-           console.log(val);
+      //      console.log(val);
-           val.group_questions.push([
+      //      val.group_questions.push([
-            {  
+      //       {  
-              "question":this.queries_docs[i].add_requirement,
+      //         "question":this.queries_docs[i].add_requirement,
-              "question_key":"question",
+      //         "question_key":"question",
-              "place_holder":this.queries_docs[i].add_requirement,
+      //         "place_holder":this.queries_docs[i].add_requirement,
-              "type":"1",
+      //         "type":"1",
-              "text_value":this.queries_docs[i].add_requirement,
+      //         "query":"1",
-              "api_properties":null,
+      //         "text_value":this.queries_docs[i].add_requirement,
-              "answers":this.queries_docs[i].add_requirement,
+      //         "api_properties":null,
-              "onchange_properties":null,
+      //         "answers":this.queries_docs[i].add_requirement,
-              "is_repeatable":null,
+      //         "onchange_properties":null,
-              "field_type":"string",
+      //         "is_repeatable":null,
-              "validations":[
+      //         "field_type":"string",
-              ]
+      //         "validations":[
-           },
+      //         ]
-           {  
+      //      },
-              "question":"Answer",
+      //      {  
-              "question_key":"answer",
+      //         "question":"Answer",
-              "place_holder":"Enter the answer here",
+      //         "question_key":"answer",
-              "type":"7",
+      //         "place_holder":"Enter the answer here",
-              "api_properties":null,
+      //         "type":"7",
-              "answers":null,
+      //         "query_value":"1",
-              "onchange_properties":null,
+      //         "api_properties":null,
-              "is_repeatable":null,
+      //         "answers":null,
-              "validations":[  
+      //         "onchange_properties":null,
-              ]
+      //         "is_repeatable":null,
-           }
+      //         "validations":[  
+      //         ]
+      //      }
 
-           ])
+      //      ])
-           }
+      //      }
-          }
+      //     }
-       })
+      //  })
       }
         if(this.len=='3' && val.form_name=='Key Stakeholders in Business')
         {

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts

@@ -35,6 +35,10 @@ export class FormComponent implements OnInit {
   @ViewChild(DynamicFormComponent) formComponent:DynamicFormComponent
   is_loading: boolean = false;
   queries_docs: any;
+  queries_value: any=[];
+  additional_query: any[];
+  records: { addtional_requirements: any[]; createdby: string; pdid: any; };
+  additional_requirements: any;
   constructor(notifier: NotifierService,
     private fb: FormBuilder,
     private route: ActivatedRoute,
@@ -67,7 +71,7 @@ export class FormComponent implements OnInit {
 
   ngOnInit() {
     
-    
+    this.getSectionData()
     if(this.pd_all_details.form_id=='5' && this.pd_all_details.pdmaster_details.product_abbr=='LFMP')
     {
      
@@ -76,7 +80,7 @@ export class FormComponent implements OnInit {
     let params = {"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id,"fk_form_id":this.pd_all_details.form_id}
     
     this.pdTriggerService.getSMCCreditPDSectionData(params).subscribe(result=>{
-      
+      console.log(result)
        if(result['dataStatus']) {
         
          
@@ -85,6 +89,7 @@ export class FormComponent implements OnInit {
      
         if(records && records.hasOwnProperty('json') && records.json) {
          formValues = JSON.parse(records.json)
+         console.log(formValues)
          if(formValues.key_stakeholders[0].stakeholder_length=='2')
           {
             let controlcount='2';
@@ -178,6 +183,7 @@ else
               question_template =JSON.parse(question_template.template);
               this.commonFormGroup = new FormGroup({})
               this.questions_JSON = question_template;
+              console.log(this.questions_JSON)
             
               // setTimeout(() => {
               //   this.covidAnswers = null
@@ -199,6 +205,7 @@ else
                   question_template =JSON.parse(question_template.template);
                   this.commonFormGroup = new FormGroup({})
                   this.questions_JSON = question_template;
+                  console.log( this.questions_JSON)
                   // console.log(this.questions_JSON);
                   // setTimeout(() => {
                   //   this.covidAnswers = null
@@ -215,15 +222,70 @@ else
     })
   }
   getSectionData() {
+   let pdid = localStorage.getItem('pdid')
+  
+   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
+      
+       for (let i = 0; i < this.queries_value.length; ++i) { 
+       let d =  {question:this.queries_value[i].add_requirement, answer: ''}
+       this.additional_query.push({question:this.queries_value[i].add_requirement, answer: ''})
+       }
+       //localStorage.setItem('queriesviewdata',this.queries_docs)
+       console.log( this.additional_query)
+      }
+      })
     let params = {"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id,"fk_form_id":this.pd_all_details.form_id}
     this.pdTriggerService.getSMCCreditPDSectionData(params).subscribe(result=>{
+      console.log(result)
       if(result['dataStatus']) {
         let records = result['records']
         let formValues:any ={};
         if(records && records.hasOwnProperty('json') && records.json) {
          formValues = JSON.parse(records.json)
+         console.log(formValues)
+        let s =   this.queries_value
+        console.log(s)
+//         formValues.cm_queries.forEach(element => {
+//           element.parent_id
+//           console.log(element.parent_id)
+//           if(element.question == "dd"){
+//             var formula_index:any =   formValues.cm_queries.indexOf(element); 
+//             console.log(formula_index)
+//             const index = formula_index
+//           if (index > -1) {
+//             formValues.cm_queries.splice(index, 1);
+// }
+//           }
+         
+//         });
+        console.log(formValues.cm_queries)
+       // var formula_index:any =  tableCrtlName.indexOf(element); 
+          console.log(formValues)
+          setTimeout(()=>{   
+           
+            for (let i = 0; i < this.queries_value.length; ++i) { 
+                console.log(this.queries_value[i].is_insert_json)
+              console.log(this.queries_value[i].add_requirement)
+              // const result =  formValues.cm_queries.filter(word =>  word.question ==  this.queries_value[i].add_requirement);
+              // console.log(result)
+              // var formula_index:any =   formValues.cm_queries.indexOf(formValues.cm_queries.filter(word =>  word.question ==  this.queries_value[i].add_requirement)); 
+              // console.log(formula_index)
+              // let tmp_data =  {question:this.queries_value[i].add_requirement, answer: ''}
+              if(this.queries_value[i].is_insert_json == null){
+               formValues.cm_queries.push({question:this.queries_value[i].add_requirement, answer: '',parent_id:this.queries_value[i].add_req_id})
+              }
+             
+
+              }                        //<<<---using ()=> syntax
+            this.quesService.formanswers= formValues
+       }, 1000);
+         
     
-          this.quesService.formanswers= formValues
           this.loaderService.showMatSpinnerDialog("")
         // setTimeout(()=>{
         //   this.quesService.formanswers = null
@@ -373,23 +435,43 @@ else
 
     let pdid = localStorage.getItem('pdid')
     
+   
    // if("pd_additional_requirements1" in pddata)
    let formname = localStorage.getItem('formname');
   
-    let queries_docs='';
+    let queries_docs;
     this.pdTriggerService.getAdditionalRequirements(pdid).subscribe(res=>{
+      console.log(res)
       if(res['dataStatus']){
+        console.log(res)
        queries_docs=res['records'].pd_additional_requirements
+     
        console.log('cm');
        console.log(queries_docs);
+     
+       
        if(formname=='cm_queries')
        {
         console.log('cm');
         console.log(queries_docs); 
+       
        }
       }
-      })
+      console.log(res)
 
+      })
+      this.queries_value.forEach(element => {
+        element.is_insert_json ="1"
+       });
+       this.additional_requirements = this.queries_value
+    
+      console.log(queries_docs); 
+    
+      this.records ={
+        "addtional_requirements": this.additional_requirements,
+        "createdby":"",
+        "pdid": this.pdid ,
+      }
   console.log(this.commonFormGroup);
   console.log('data');
 
@@ -411,14 +493,23 @@ else
     if(checkProperty == false){
       return;
     }
+    console.log(this.commonFormGroup.getRawValue())
     this.loaderService.showMatSpinnerDialog('')
     let params :any = {"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id,"fk_form_id":this.pd_all_details.form_id,"json":this.commonFormGroup.getRawValue(),createdby:''}
     if(this.pd_all_details.pdmaster_details.re_uploaded == '1') {
-      params.is_reupload_data_fetched = '1'
+      params.is_reupload_data_fetched = '0'
     }
+    console.log(params)
     this.pdTriggerService.saveSMCCreditPDsection(params).subscribe(result=>{
       if(result['dataStatus']) {
         this.notifier.notify("success","Saved successfully..")
+      
+        console.log(  this.records)
+        this._pd.saveAdditionalRequirements( this.records).subscribe(result => {
+          if (result.status == 200) {
+            console.log( "updated")
+          }
+        })
         setTimeout(()=>{
           this.dialogRef.close('refresh')
         },1500)

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html

@@ -4,20 +4,20 @@
     <div fxLayout="row" *ngFor="let master of pdMasterData" fxLayoutAlign="flex-end">
       <div fxLayout="row" fxLayoutAlign="flex-end" fxLayoutGap="68px" fxLayoutGap.xs="8px">
          <!-- ENABLING THE FAB COPY LINK IMAGE CAPTURE AND VIDEO CALL BUTTON FOR TELE PD -->
-         <div fxLayout="column"  *ngIf="master.fk_pd_type == '3' && master.lender_short_name == 'MWISE'" >
+         <div fxLayout="column"  *ngIf="master.fk_pd_type == '3' && master.lender_short_name == 'MWISE' && LenderRoleID != '29' && LenderRoleID != '28'" >
           <app-speed-dial-fab fxFlex="30" class="fab-group" [options]="FabOptions" (fabClick)="copyCusURL($event)"></app-speed-dial-fab>
         </div>
           <!-- END OF COPY LINK IMAGE CAPTURE AND VIDEO CALL BUTTON FOR TELE PD -->
       <div fxFlex="100" align="right"> 
         <!-- <span  matTooltip="{{!videoplayback.enableBtn ? 'Recorded video is available after the PD is completed' : 'Play Recorded Video'}}" matTooltipPosition="above"> -->
           <!--  [disabled]="!videoplayback.enableBtn" -->
-          <button  mat-stroked-button class="mr-1 mb-1"  color="primary" (click)="openPlayer()" *ngIf="master.fk_pd_type == '3' && master.lender_short_name == 'MWISE'" >
+          <button  mat-stroked-button class="mr-1 mb-1"  color="primary" (click)="openPlayer()" *ngIf="master.fk_pd_type == '3' && master.lender_short_name == 'MWISE' && LenderRoleID != '29' && LenderRoleID != '28'" >
               <mat-icon>play_circle_filled</mat-icon>&nbsp;
             <strong>Play</strong>
             </button>
           <!-- </span> -->
           <!-- *ngIf="master.fk_pd_type == '3' || master.fk_pd_type == '2'" -->
-                <button  mat-button mat-raised-button class="mr-1 mb-1"  color="primary" (click)="openVideoChat()" *ngIf="master.fk_pd_type == '3' && master.lender_short_name == 'MWISE'" >
+                <button  mat-button mat-raised-button class="mr-1 mb-1"  color="primary" (click)="openVideoChat()" *ngIf="master.fk_pd_type == '3' && master.lender_short_name == 'MWISE' && LenderRoleID != '29' && LenderRoleID != '28'" >
                     <mat-icon>videocam</mat-icon>&nbsp;
                     <strong>Call</strong>
                   </button>