diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
index 03a0c41..298d2da 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
@@ -121,6 +121,7 @@ export class PdAllocationComponent implements OnInit {
   updatePdOfficer(allocateDetails:any) {
   console.log(allocateDetails);
   console.log('test');
+  //return;
     if(!allocateDetails){
       this.notifier.notify('warning', 'Please Choose PD Officer.!');
     }
@@ -143,7 +144,7 @@ export class PdAllocationComponent implements OnInit {
       this.updateData =  {
         "pd_id":this.data.pd_id,
         // "fk_pd_allocated_to":allocateDetails.fk_user_id,
-        "fk_pd_allocated_to":this._aws.getlocale(),
+        "fk_pd_allocated_to":allocateDetails.userid,
         "pd_agency_id":allocateDetails.entity_id
       }
     }
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 1870314..453de1c 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
@@ -58,7 +58,8 @@ export class QuesFormService {
     
     let pdid = JSON.parse(localStorage.getItem('pdid'))
     const control: any = formgroup
-   
+   console.log(ques_data);
+   console.log('quesdata');
     ques_data.forEach((val, index) => {
       
       if (val.hasOwnProperty('is_repeatable') && val.is_repeatable == '1') {
@@ -78,15 +79,16 @@ export class QuesFormService {
             for (let i = 0; i < this.queries_docs.length; ++i) { 
            childControl.push(this._fb.group(control_names))
            console.log('groupquestion');
-           console.log(val.group_questions);
+           console.log(val);
            val.group_questions.push([
             {  
               "question":this.queries_docs[i].add_requirement,
               "question_key":"question",
               "place_holder":this.queries_docs[i].add_requirement,
               "type":"1",
+              "text_value":this.queries_docs[i].add_requirement,
               "api_properties":null,
-              "answers":null,
+              "answers":this.queries_docs[i].add_requirement,
               "onchange_properties":null,
               "is_repeatable":null,
               "field_type":"string",
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 655cb7f..2207b71 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
@@ -385,9 +385,11 @@ else
       }
       })
     
-  
+  console.log(this.commonFormGroup);
+  console.log('data');
+
   // console.log(this.commonFormGroup.value.cm_queries[1].question);
-  // return 
+   //return 
     //console.log("values",this.commonFormGroup.getRawValue(),this.questions_JSON)
     if(this.commonFormGroup.invalid) {
       this.commonFormGroup.markAsDirty();
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 292cc40..6a35d2d 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
@@ -40,11 +40,11 @@
                 <button *ngIf="roleAccessDetails.trigger && (LenderRoleID == '25' && (currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED)) || (currentPDStatus==pdStatusCheck.DRAFT)" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)" matTooltipPosition="above" matTooltip="Edit PD Master"><mat-icon>edit</mat-icon></button>
                  <button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master)"><mat-icon>flash_on</mat-icon></button>
                  <span *ngIf="is_agency_logged_in ==false">
-                 <button *ngIf="(master.lender_short_name != 'MWISE' && currentPDStatus=='QC COMPLETED') || (master.lender_short_name == 'MWISE' && LenderRoleID != '25' && LenderRoleID != '27' && currentPDStatus==pdStatusCheck.COMPLETED && currentVendorStatus=='QC COMPLETED') && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="smcCreditPDReport(viewID)"><mat-icon>ballot</mat-icon></button>
+                 <button *ngIf="(master.lender_short_name != 'MWISE') || (master.lender_short_name == 'MWISE' && LenderRoleID != '25' && currentPDStatus==pdStatusCheck.COMPLETED) && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="smcCreditPDReport(viewID)"><mat-icon>ballot</mat-icon></button>
                  </span>
-                 
-                 <button *ngIf="is_agency_logged_in ==true && (master.lender_short_name != 'MWISE' && currentPDStatus=='QC COMPLETED' ||currentPDStatus==pdStatusCheck.COMPLETED) || (master.lender_short_name == 'MWISE' && (LenderRoleID == '27'||LenderRoleID == '26') && ( currentVendorStatus=='QC COMPLETED'||currentVendorStatus=='COMPLETED')) && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="smcCreditPDReport(viewID)"><mat-icon>ballot</mat-icon></button>
-                 
+                 <!--<span *ngIf="is_agency_logged_in ==true">
+                 <button *ngIf="is_agency_logged_in ==true && (master.lender_short_name != 'MWISE') || (master.lender_short_name == 'MWISE' && ( currentVendorStatus=='QC COMPLETED'||currentVendorStatus=='COMPLETED')) && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="smcCreditPDReport(viewID)"><mat-icon>ballot</mat-icon></button>
+                 </span>-->
                 <span><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button></span>
       </div>
       </div>
@@ -222,7 +222,7 @@
                                   <span *ngIf="LenderRoleID =='28'&&currentVendorStatus != 'QC COMPLETED' && master.lender_short_name == 'MWISE'"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA||currentVendorStatus == pdStatusCheck.INPROGRESS ||currentVendorStatus == pdStatusCheck.ALLOCATED|| (currentVendorStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentVendorStatus == pdStatusCheck.BOUNCED && userId == master.fk_pd_allocated_to))  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
                                   
                                   <span *ngIf="master.lender_short_name == 'MWISE'  && (LenderRoleID == '26')"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || (currentPDStatus == pdStatusCheck.ALLOCATED && master.pd_allocated_to_role_id == '27'))  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Self" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_city)"><mat-icon>verified_user</mat-icon></button></span>
-                                  <span *ngIf="master.lender_short_name == 'MWISE'  && (LenderRoleID == '26')"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus == pdStatusCheck.ALLOCATED) || (currentPDStatus == pdStatusCheck.ALLOCATED && master.pd_allocated_to_role_id == '27')  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Vendor" matTooltipPosition="above" (click)="Allocationtovendor(addresses.fk_city)"><mat-icon>verified_user</mat-icon></button></span>
+                                  <span *ngIf="master.lender_short_name == 'MWISE'  && (LenderRoleID == '26')"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus == pdStatusCheck.ALLOCATED) || ( master.pd_allocated_to_role_id == '26')  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Vendor" matTooltipPosition="above" (click)="Allocationtovendor(addresses.fk_city)"><mat-icon>assignment_ind</mat-icon></button></span>
                                   <span *ngIf="master.lender_short_name == 'MWISE'  && LenderRoleID != '25' && (LenderRoleID != '26' || userId == master.fk_pd_allocated_to)"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED || currentPDStatus == pdStatusCheck.INPROGRESS)" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Send back to CPA" matTooltipPosition="above" (click)="allocateToCpa()"><mat-icon>swap_vert</mat-icon></button></span>
                                   <span *ngIf="is_agency_logged_in == false && master.lender_short_name == 'MWISE' && LenderRoleID != '25' && (LenderRoleID != '26' || userId == master.fk_pd_allocated_to)"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.BOUNCED && (LenderRoleID == '27' || LenderRoleID == '28'||currentPDStatus!=pdStatusCheck.TRIGGERED)||LenderRoleID == '29'" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].pd_status)"><mat-icon>question_answer</mat-icon></button></span>
                                   <span *ngIf="is_agency_logged_in == true && master.lender_short_name == 'MWISE' && LenderRoleID != '25' && (LenderRoleID != '29' || userId == master.fk_pd_allocated_to && currentVendorStatus!='QC COMPLETED')"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && currentVendorStatus!=pdStatusCheck.BOUNCED && currentVendorStatus!='QC COMPLETED'&& (LenderRoleID == '27' || LenderRoleID == '28'||currentVendorStatus!=pdStatusCheck.TRIGGERED)||LenderRoleID == '29'" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion1" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span>