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 ea83f02..7f69a6a 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
@@ -175,7 +175,7 @@
                 </span><br/>
                 <!--<span class="fontsize" style="font-weight: bold;font-size: 1.1rem;" [ngStyle] = "{'color' : details.fk_pd_allocated_to == user_id ? 'black' : 'gray'}" *ngIf="details.fk_pd_allocated_to != null" matTooltip="Allocated to" matTooltipPosition="above">{{details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}</span>-->
                  <br>
-               <span class="fontsize" style="font-weight: bold;font-size: 1.1rem;" [ngStyle] = "{'color' : details.fk_pd_allocated_to == user_id ? 'black' : 'gray'}" *ngIf="details.fk_pd_allocated_to != null" matTooltip="Allocated to" matTooltipPosition="above">{{details.pd_status=='ALLOCATED_TO_FIA'?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}</span>
+               <span class="fontsize" style="font-weight: bold;font-size: 1.1rem;" [ngStyle] = "{'color' : details.fk_pd_allocated_to == user_id ? 'black' : 'gray'}"  matTooltip="Allocated to" matTooltipPosition="above">{{details.pd_status=='ALLOCATED_TO_FIA' && details.SMC_vendor_agency_name!=null && details.pd_allocated_to==null?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}</span>
             </div> 
             
             <!-- *ngIf="details.fk_pd_allocated_to == null || details.fk_pd_allocated_to == user_id || details.pd_status == 'BOUNCED' || LenderRoleID == '27' || LenderRoleID == '25' -->
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
index 5e44002..85966a7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
@@ -112,7 +112,7 @@
                       <span class="lettertext" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}</span>                                   
                   </div>
                   <div fxFlex.xs="45" fxFlex.sm="45" class="webhide" style="text-align: right;">
-                    <p class="fontsize" style="margin:0;font-weight: bold;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" [ngStyle] = "{'color' : details.fk_pd_allocated_to == user_id ? 'black' : 'gray'}" *ngIf="details.fk_pd_allocated_to != null" matTooltip="Allocated to" matTooltipPosition="above">{{details.pd_status=='ALLOCATED_TO_FIA'?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}</p>         
+                    <p class="fontsize" style="margin:0;font-weight: bold;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" [ngStyle] = "{'color' : details.fk_pd_allocated_to == user_id ? 'black' : 'gray'}"  matTooltip="Allocated to" matTooltipPosition="above">{{details.pd_status=='ALLOCATED_TO_FIA' && details.SMC_vendor_agency_name!=null && details.pd_allocated_to==null?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}</p>         
                      
                   </div>
                 </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
index f1dd3cb..429c003 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
@@ -162,7 +162,7 @@
                     </span>
                     <span class="fontsize" *ngIf="details.pd_status=='SCHEDULED'" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{details.scheduled_on}}
                     </span><br/>
-                    <span class="fontsize" style="font-weight: bold;font-size: 1.1rem;" [ngStyle] = "{'color' : details.fk_pd_allocated_to == user_id ? 'black' : 'gray'}" *ngIf="details.fk_pd_allocated_to != null" matTooltip="Allocated to" matTooltipPosition="above">{{details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}</span>
+                    <span class="fontsize" style="font-weight: bold;font-size: 1.1rem;" [ngStyle] = "{'color' : details.fk_pd_allocated_to == user_id ? 'black' : 'gray'}"  matTooltip="Allocated to" matTooltipPosition="above">{{details.pd_status=='ALLOCATED_TO_FIA' && details.SMC_vendor_agency_name!=null && details.pd_allocated_to==null?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}</span>
                 </div> 
                 <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="16.66" fxFlex.lg="16.66" fxFlex.xl="16.66" class="cell center" style="justify-content:flex-end"  *ngIf="details.pd_status != 'BOUNCED' || details.fk_pd_allocated_to == user_id">
                     <a [style.visibility]="details.pd_status=='INITIATED' && details.encrypted_url!=null && details.encrypted_url!='' ? 'visible' : 'hidden'" [attr.href]="details.encrypted_url" target="_blank">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component.html
index 8187b1e..6291203 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component.html
@@ -1,196 +1,188 @@
 <section [formGroup]="formGroupN">
-    <div  *ngIf="parent_ques.sub_title" fxLayout="row" >
-      <mat-card-subtitle *ngIf="parent_ques.sub_title" fxFlex="100%">
-        {{parent_ques.sub_title}}
-      </mat-card-subtitle>
-      <br style="clear: both;"/>
-    </div>
-  <!-- {{formGroupN.value  | json}} -->
-    <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '1' && !parent_ques.is_hidden"
-     >
+  <div  *ngIf="parent_ques.sub_title" fxLayout="row" >
+    <mat-card-subtitle *ngIf="parent_ques.sub_title" fxFlex="100%">
+      {{parent_ques.sub_title}}
+    </mat-card-subtitle>
+    <br style="clear: both;"/>
+  </div>
+<!-- {{formGroupN.value  | json}} -->
+  <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '1' && !parent_ques.is_hidden"
+   >
 
-      <mat-label>{{parent_ques.question}}</mat-label>
-      <input matInput
-        [type]="parent_ques.field_type == 'num' || parent_ques.field_type == 'numtoword' ?  'number' : parent_ques.field_type== 'string' ? 'text' : parent_ques.field_type"
-        [formControlName]="parent_ques.question_key" [placeholder]="parent_ques.place_holder" autocomplete="off"
-        (change)="onChangeProperty($event,parent_ques,parent_ques.question_key)">
-      <!-- [placeholder]="parent_ques.get('field_type').value == 'num' || parent_ques.get('field_type').value == 'numtoword' ? 'Entert the Number' : 'Enter the Text'"  -->
-      <mat-hint
-        *ngIf="formGroupN.value[parent_ques.question_key] != '' && (parent_ques.field_type == 'numtoword' || parent_ques.field_type == 'str&numtoword')"
-        align="end" style="font-size: 12px;">{{"&#8377;"}} {{formGroupN.value[parent_ques.question_key] | numberToWords}}
-      </mat-hint>
-      <!-- <mat-hint align="end" style="font-size: 11.5px;color: gray;" *ngIf="parent_ques.get('is_amt_in_words').value == true">One Lack</mat-hint> -->
-      <!-- {{formGroupN.value | json}} -->
-      <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
-        <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
-          {{validation.message}}</mat-error>
-      </ng-container>
-    </mat-form-field>
- 
-    <mat-form-field style="width:100%"
-    *ngIf="parent_ques.type == '9'" >
     <mat-label>{{parent_ques.question}}</mat-label>
-    <input matInput  [type]="parent_ques.field_type == 'num' || parent_ques.field_type == 'numtoword' ?  'number' : parent_ques.field_type== 'string' || parent_ques.field_type == 'str&numtoword'  ? 'text' : parent_ques.field_type"
-    [formControlName]="parent_ques.question_key" [placeholder]="parent_ques.place_holder" 
-    (change)="onChangeProperty($event,parent_ques,parent_ques.question_key)"
-      [matAutocomplete]="auto">
-    <mat-autocomplete #auto="matAutocomplete"  (optionSelected) = "onChangeProperty($event,parent_ques,parent_ques.question_key)">
-      <mat-option *ngFor="let val of autoCompleteAns | async"  [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer"
-      >
-        <span>{{val.answer}}</span>
-      </mat-option>
-    </mat-autocomplete>
+    <input matInput
+      [type]="parent_ques.field_type == 'num' || parent_ques.field_type == 'numtoword' ?  'number' : parent_ques.field_type== 'string' ? 'text' : parent_ques.field_type"
+      [formControlName]="parent_ques.question_key" [placeholder]="parent_ques.place_holder" autocomplete="off"
+      (change)="onChangeProperty($event,parent_ques,parent_ques.question_key)">
+    <!-- [placeholder]="parent_ques.get('field_type').value == 'num' || parent_ques.get('field_type').value == 'numtoword' ? 'Entert the Number' : 'Enter the Text'"  -->
     <mat-hint
-    *ngIf="formGroupN.value[parent_ques.question_key] != '' && (parent_ques.field_type == 'numtoword' || parent_ques.field_type == 'str&numtoword')"
-    align="end" style="font-size: 12px;">{{"&#8377;"}} {{formGroupN.value[parent_ques.question_key] | numberToWords}}
-  </mat-hint>
-  <!-- <mat-hint align="end" style="font-size: 11.5px;color: gray;" *ngIf="parent_ques.get('is_amt_in_words').value == true">One Lack</mat-hint> -->
-  <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
-    <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
-      {{validation.message}}</mat-error>
-  </ng-container>
+      *ngIf="formGroupN.value[parent_ques.question_key] != '' && (parent_ques.field_type == 'numtoword' || parent_ques.field_type == 'str&numtoword')"
+      align="end" style="font-size: 12px;">{{"&#8377;"}} {{formGroupN.value[parent_ques.question_key] | numberToWords}}
+    </mat-hint>
+    <!-- <mat-hint align="end" style="font-size: 11.5px;color: gray;" *ngIf="parent_ques.get('is_amt_in_words').value == true">One Lack</mat-hint> -->
+    <!-- {{formGroupN.value | json}} -->
+    <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
+      <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
+        {{validation.message}}</mat-error>
+    </ng-container>
   </mat-form-field>
 
-    <!-- <mat-form-field> -->
-    <div class="radio-gap" *ngIf="parent_ques.type == '2'">
-      <mat-label>{{parent_ques.question}}</mat-label><br />
-      <mat-radio-group aria-label="Select an option" [formControlName]="parent_ques.question_key"
-        (change)="onChangeProperty($event,parent_ques,'','','')">
-        <mat-radio-button class="radio-btn-gap" *ngFor="let val of parent_ques.answers"
-          [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer">{{val.answer}}</mat-radio-button><br />
-      </mat-radio-group>
-      <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
-        <mat-error style="font-size:12px" align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
-          {{validation.message}}</mat-error>
-      </ng-container>
-    </div>
+  <mat-form-field style="width:100%"
+  *ngIf="parent_ques.type == '9'" >
+  <mat-label>{{parent_ques.question}}</mat-label>
+  <input matInput  [type]="parent_ques.field_type == 'num' || parent_ques.field_type == 'numtoword' ?  'number' : parent_ques.field_type== 'string' || parent_ques.field_type == 'str&numtoword'  ? 'text' : parent_ques.field_type"
+  [formControlName]="parent_ques.question_key" [placeholder]="parent_ques.place_holder" 
+  (change)="onChangeProperty($event,parent_ques,parent_ques.question_key)"
+    [matAutocomplete]="auto">
+  <mat-autocomplete #auto="matAutocomplete"  (optionSelected) = "onChangeProperty($event,parent_ques,parent_ques.question_key)">
+    <mat-option *ngFor="let val of autoCompleteAns | async"  [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer"
+    >
+      <span>{{val.answer}}</span>
+    </mat-option>
+  </mat-autocomplete>
+  <mat-hint
+  *ngIf="formGroupN.value[parent_ques.question_key] != '' && (parent_ques.field_type == 'numtoword' || parent_ques.field_type == 'str&numtoword')"
+  align="end" style="font-size: 12px;">{{"&#8377;"}} {{formGroupN.value[parent_ques.question_key] | numberToWords}}
+</mat-hint>
+<!-- <mat-hint align="end" style="font-size: 11.5px;color: gray;" *ngIf="parent_ques.get('is_amt_in_words').value == true">One Lack</mat-hint> -->
+<ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
+  <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
+    {{validation.message}}</mat-error>
+</ng-container>
+</mat-form-field>
 
-    <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '3'">
-      <mat-label>{{parent_ques.question}}</mat-label>
-      <mat-select [formControlName]="parent_ques.question_key" (selectionChange)="onChangeProperty($event,parent_ques,'','','')">
-        <mat-option>Select</mat-option>
-        <mat-option *ngFor="let val of parent_ques.answers"
-          [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer"
-          (click)="newAnswerCreateDialog(val,parent_ques)" class="large-select-option"><mat-icon *ngIf="val.is_others == '-1'">add_circle_outline</mat-icon> <span>{{val.answer}}</span></mat-option>
-      </mat-select>
-      <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
-        <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
-          {{validation.message}}</mat-error>
-      </ng-container>
-    </mat-form-field>
+  <!-- <mat-form-field> -->
+  <div class="radio-gap" *ngIf="parent_ques.type == '2'">
+    <mat-label>{{parent_ques.question}}</mat-label><br />
+    <mat-radio-group aria-label="Select an option" [formControlName]="parent_ques.question_key"
+      (change)="onChangeProperty($event,parent_ques,'','','')">
+      <mat-radio-button class="radio-btn-gap" *ngFor="let val of parent_ques.answers"
+        [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer">{{val.answer}}</mat-radio-button><br />
+    </mat-radio-group>
+    <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
+      <mat-error style="font-size:12px" align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
+        {{validation.message}}</mat-error>
+    </ng-container>
+  </div>
 
-    <div class="radio-gap" [formArrayName]="parent_ques.question_key" *ngIf="parent_ques.type == '5'">
-      <mat-label>{{parent_ques.question}}</mat-label>
-      <mat-checkbox class="radio-btn-gap" *ngFor="let val of parent_ques.answers;let i=index"
+  <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '3'">
+    <mat-label>{{parent_ques.question}}</mat-label>
+    <mat-select [formControlName]="parent_ques.question_key" (selectionChange)="onChangeProperty($event,parent_ques,'','','')">
+      <mat-option>Select</mat-option>
+      <mat-option *ngFor="let val of parent_ques.answers"
         [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer"
-        (change)="onChange_checkbox($event,parent_ques);onChangeProperty($event,parent_ques,'','','')">{{val.answer}}</mat-checkbox><br />
-        <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
-          <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
-            {{validation.message}}</mat-error>
-        </ng-container>
-        {{formGroupN.value[parent_ques.question_key] | json}}
-    </div>
+        (click)="newAnswerCreateDialog(val,parent_ques)" class="large-select-option"><mat-icon *ngIf="val.is_others == '-1'">add_circle_outline</mat-icon> <span>{{val.answer}}</span></mat-option>
+    </mat-select>
+    <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
+      <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
+        {{validation.message}}</mat-error>
+    </ng-container>
+  </mat-form-field>
 
-    <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '4'">
-      <mat-label>{{parent_ques.question}}</mat-label>
-      <mat-select multiple [formControlName]="parent_ques.question_key"
-        (selectionChange)="onChangeProperty($event,parent_ques,'','','')">
-        <!-- <mat-option>Select</mat-option> -->
-        <mat-option *ngFor="let val of parent_ques.answers"
-          [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer">{{val.answer}}</mat-option>
-      </mat-select>
-      <!-- <mat-error align="end" style="font-style: italic;margin-right: 5px;">Field is Required</mat-error> -->
+  <div class="radio-gap" [formArrayName]="parent_ques.question_key" *ngIf="parent_ques.type == '5'">
+    <mat-label>{{parent_ques.question}}</mat-label>
+    <mat-checkbox class="radio-btn-gap" *ngFor="let val of parent_ques.answers;let i=index"
+      [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer"
+      (change)="onChange_checkbox($event,parent_ques);onChangeProperty($event,parent_ques,'','','')">{{val.answer}}</mat-checkbox><br />
       <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
         <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
           {{validation.message}}</mat-error>
       </ng-container>
-    </mat-form-field>
+      {{formGroupN.value[parent_ques.question_key] | json}}
+  </div>
 
-    <!-- <div *ngIf="parent_ques.type == '6'">
-      <ion-grid>
-        <ion-row>
-          <ion-col col-6 no-padding align-self: center text-center>
-            <div>
-              <img *ngIf="parent_ques.get('answer_value').value != ''" [src]="parent_ques.get('answer_value').value"
-                imageViewer class="doc-image-bucket"><br />
-              <label><strong>{{parent_ques.get('question').value}}</strong></label>
-            </div>
-            <ion-row style="justify-content: center">
-              <ion-col col-8>
-                <button ion-button clear color="optblue" [disabled]="sales_pd_type == '2'"
-                  (click)="captureImg('',parent_ques)">
-                  <ion-icon style="font-size: 30px" name="md-camera"></ion-icon>
-                </button>
-              </ion-col>
-            
-              <ion-col col-4 *ngIf="parent_ques.get('is_image_status').value == true">
-                <ion-spinner name="crescent" style="width: 20px;
-                height: 20px;" (click)="cancelLoader(parent_ques)" *ngIf="parent_ques.get('is_loader').value == true">
-                </ion-spinner>
-                <ion-icon style="color: #008828;float: right;
-                 margin-right: 30%;" *ngIf="parent_ques.get('is_saved').value == true" name="checkmark-circle-outline">
-                </ion-icon>
-                <span style="margin:0px;" *ngIf="(parent_ques.get('is_saved').value == false &&
-                 parent_ques.get('is_loader').value == false) && (parent_ques.value.hasOwnProperty('is_saved') &&
-                 parent_ques.value.hasOwnProperty('is_loader'))" (click)="imageReupload(parent_ques)">
-                  <ion-row style="margin-top: -17px;padding:0px;"><button ion-button clear>
-                      <ion-icon style="color:lightcoral;" name="refresh-circle"></ion-icon>
-                    </button></ion-row>
-                  <ion-row style="margin-top: -20px;padding:0px;">
-                    <p style="font-size: 10px">Click to ReUpload</p>
-                  </ion-row>
-                </span>
-              </ion-col>
-            </ion-row>
-          </ion-col>
-          <hr />
-        </ion-row>
+  <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '4'">
+    <mat-label>{{parent_ques.question}}</mat-label>
+    <mat-select multiple [formControlName]="parent_ques.question_key"
+      (selectionChange)="onChangeProperty($event,parent_ques,'','','')">
+      <!-- <mat-option>Select</mat-option> -->
+      <mat-option *ngFor="let val of parent_ques.answers"
+        [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer">{{val.answer}}</mat-option>
+    </mat-select>
+    <!-- <mat-error align="end" style="font-style: italic;margin-right: 5px;">Field is Required</mat-error> -->
+    <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
+      <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
+        {{validation.message}}</mat-error>
+    </ng-container>
+  </mat-form-field>
 
-      </ion-grid>
-      <ng-container *ngFor="let validation of parent_ques.get('validations').value;" ngProjectAs="mat-error">
-        <mat-error align="end" *ngIf="parent_ques.get('answer_value').hasError(validation.name.toLowerCase())">
-          {{validation.message}}</mat-error>
-      </ng-container>
-    </div> -->
+  <!-- <div *ngIf="parent_ques.type == '6'">
+    <ion-grid>
+      <ion-row>
+        <ion-col col-6 no-padding align-self: center text-center>
+          <div>
+            <img *ngIf="parent_ques.get('answer_value').value != ''" [src]="parent_ques.get('answer_value').value"
+              imageViewer class="doc-image-bucket"><br />
+            <label><strong>{{parent_ques.get('question').value}}</strong></label>
+          </div>
+          <ion-row style="justify-content: center">
+            <ion-col col-8>
+              <button ion-button clear color="optblue" [disabled]="sales_pd_type == '2'"
+                (click)="captureImg('',parent_ques)">
+                <ion-icon style="font-size: 30px" name="md-camera"></ion-icon>
+              </button>
+            </ion-col>
+          
+            <ion-col col-4 *ngIf="parent_ques.get('is_image_status').value == true">
+              <ion-spinner name="crescent" style="width: 20px;
+              height: 20px;" (click)="cancelLoader(parent_ques)" *ngIf="parent_ques.get('is_loader').value == true">
+              </ion-spinner>
+              <ion-icon style="color: #008828;float: right;
+               margin-right: 30%;" *ngIf="parent_ques.get('is_saved').value == true" name="checkmark-circle-outline">
+              </ion-icon>
+              <span style="margin:0px;" *ngIf="(parent_ques.get('is_saved').value == false &&
+               parent_ques.get('is_loader').value == false) && (parent_ques.value.hasOwnProperty('is_saved') &&
+               parent_ques.value.hasOwnProperty('is_loader'))" (click)="imageReupload(parent_ques)">
+                <ion-row style="margin-top: -17px;padding:0px;"><button ion-button clear>
+                    <ion-icon style="color:lightcoral;" name="refresh-circle"></ion-icon>
+                  </button></ion-row>
+                <ion-row style="margin-top: -20px;padding:0px;">
+                  <p style="font-size: 10px">Click to ReUpload</p>
+                </ion-row>
+              </span>
+            </ion-col>
+          </ion-row>
+        </ion-col>
+        <hr />
+      </ion-row>
 
-    <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '7'">
-      <mat-label>{{parent_ques.question}}</mat-label>
-      <textarea matInput type="text" rows="3" [formControlName]="parent_ques.question_key" placeholder="Enter the Text"
-        autocomplete="off"></textarea>
-      <!-- <mat-error align="end" style="font-style: italic;margin-right: 5px;">Field is Required</mat-error> -->
-      <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
-        <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
-          {{validation.message}}</mat-error>
-      </ng-container>
-    </mat-form-field>
+    </ion-grid>
+    <ng-container *ngFor="let validation of parent_ques.get('validations').value;" ngProjectAs="mat-error">
+      <mat-error align="end" *ngIf="parent_ques.get('answer_value').hasError(validation.name.toLowerCase())">
+        {{validation.message}}</mat-error>
+    </ng-container>
+  </div> -->
 
-    <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '8'" (click)="ngxFilteredValue.next(parent_ques.answers)">
-      <mat-label>{{parent_ques.question}}</mat-label>
-      <mat-select [formControlName]="parent_ques.question_key" (selectionChange)="onChangeProperty($event,parent_ques,'','','')">
-        <mat-option>
-          <ngx-mat-select-search [formControl]="commonFilterCtrl" [placeholderLabel]="'Search'"
-            [noEntriesFoundLabel]="'No Matching Result'" >
-            <mat-icon  ngxMatSelectSearchClear>close</mat-icon>
-          </ngx-mat-select-search>
-        </mat-option>
-        <mat-option>Select</mat-option>
+  <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '7'">
+    <mat-label>{{parent_ques.question}}</mat-label>
+    <textarea matInput type="text" rows="3"    (change)="onChangeProperty($event,parent_ques,parent_ques.question_key)"  [formControlName]="parent_ques.question_key" placeholder="Enter the Text"
+      autocomplete="off"></textarea>
+    <!-- <mat-error align="end" style="font-style: italic;margin-right: 5px;">Field is Required</mat-error> -->
+    <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
+      <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
+        {{validation.message}}</mat-error>
+    </ng-container>
+  </mat-form-field>
 
-        <mat-option
-          *ngFor="let val of ngxFilteredValue | async"
-          [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer"
-          (click)="newAnswerCreateDialog(val,parent_ques)" class="large-select-option"><mat-icon *ngIf="val.is_others == '-1'">add_circle_outline</mat-icon> <span>{{val.answer}}</span></mat-option>
-      </mat-select>
-      <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
-        <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
-          {{validation.message}}</mat-error>
-      </ng-container>
-    </mat-form-field>
-  </section> 
+  <mat-form-field style="width: 100%" *ngIf="parent_ques.type == '8'" (click)="ngxFilteredValue.next(parent_ques.answers)">
+    <mat-label>{{parent_ques.question}}</mat-label>
+    <mat-select [formControlName]="parent_ques.question_key" (selectionChange)="onChangeProperty($event,parent_ques,'','','')">
+      <mat-option>
+        <ngx-mat-select-search [formControl]="commonFilterCtrl" [placeholderLabel]="'Search'"
+          [noEntriesFoundLabel]="'No Matching Result'" >
+          <mat-icon  ngxMatSelectSearchClear>close</mat-icon>
+        </ngx-mat-select-search>
+      </mat-option>
+      <mat-option>Select</mat-option>
 
-
-
-
-
-
-
-  
\ No newline at end of file
+      <mat-option
+        *ngFor="let val of ngxFilteredValue | async"
+        [value]="val.hasOwnProperty('answer_id') ? val.answer_id : val.answer"
+        (click)="newAnswerCreateDialog(val,parent_ques)" class="large-select-option"><mat-icon *ngIf="val.is_others == '-1'">add_circle_outline</mat-icon> <span>{{val.answer}}</span></mat-option>
+    </mat-select>
+    <ng-container *ngFor="let validation of parent_ques.validations" ngProjectAs="mat-error">
+      <mat-error align="end" *ngIf="formGroupN.get(parent_ques.question_key).hasError(validation.name.toLowerCase())">
+        {{validation.message}}</mat-error>
+    </ng-container>
+  </mat-form-field>
+</section>
\ No newline at end of file
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 ce0a206..019b8b3 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
@@ -205,40 +205,37 @@
                               
                                 <div fxLayout="row nowrap">
                                   <div fxFlex="100"> 
-                                <div *ngIf="is_agency_logged_in == false" [attr.fxFlex]='(currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA) ? "40" : "20"' align="left" style="color: #e00201">
+                                <div *ngIf="is_agency_logged_in == false" fxFlex="40" align="left" style="color: #e00201">
                                         {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status==pdStatusCheck.ALLOCATED_TO_FIA ?'Allocated to vendor':master.pd_status | titlecase}} 
                                 </div>
-                                <div *ngIf="is_agency_logged_in == true" [attr.fxFlex]='(currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA) ? "40" : "20"' align="left" style="color: #e00201">
-                                  {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status==pdStatusCheck.ALLOCATED_TO_FIA ?'Allocated to vendor':master.pd_status | titlecase}}  
+                                <div *ngIf="is_agency_logged_in == true" fxFlex="40" align="left" style="color: #e00201">
+                                  {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status==pdStatusCheck.ALLOCATED_TO_FIA ?'Allocated to vendor':master.pd_status | titlecase}} 
                                   <br>
                                   <p style="color:blue;font-size: small;">{{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.vendor_status | titlecase}}</p>
                                  </div>
-                                 <div [attr.fxFlex]='(currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA) ? "60" : "80"' align="right"> 
+                                 <div fxFlex="60" align="right"> 
                                   <!-- <span><button *ngIf="roleAccessDetails.trigger && addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span> -->
                                   <!-- {{userId == master.fk_pd_allocated_to}} -->
-
+                                  <span *ngIf="master.lender_short_name == 'MWISE'  && LenderRoleID != '25' && userId == master.fk_pd_allocated_to"> <button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && addresses.addtional_pd_data[0].pd_status ==  pdStatusCheck.ALLOCATED" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Reject" matTooltipPosition="above" (click)="rejectPD()"><mat-icon>settings_backup_restore</mat-icon></button></span>
+                                  <span *ngIf="is_agency_logged_in == false && master.lender_short_name == 'MWISE'  && LenderRoleID == '27' || LenderRoleID == '25' && currentPDStatus == pdStatusCheck.BOUNCED "><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA ||currentPDStatus == pdStatusCheck.TRIGGERED||currentPDStatus == pdStatusCheck.ALLOCATED|| (currentPDStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentPDStatus == 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 != '25' && userId == master.fk_pd_allocated_to"> <button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && addresses.addtional_pd_data[0].pd_status ==  pdStatusCheck.ALLOCATED || currentPDStatus!=pdStatusCheck.CANCELLED" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Reject" matTooltipPosition="above" (click)="rejectPD()"><mat-icon>settings_backup_restore</mat-icon></button></span>
-                                   <span *ngIf="is_agency_logged_in == false && master.lender_short_name == 'MWISE'  && LenderRoleID == '27' || LenderRoleID == '25' && currentPDStatus == pdStatusCheck.BOUNCED "><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA ||currentPDStatus == pdStatusCheck.TRIGGERED||currentPDStatus == pdStatusCheck.ALLOCATED|| (currentPDStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentPDStatus == pdStatusCheck.BOUNCED && userId == master.fk_pd_allocated_to) || currentPDStatus==pdStatusCheck.CANCELLED)  " 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="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) || currentPDStatus!=pdStatusCheck.CANCELLED)  " 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="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.CANCELLED || (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_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_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 == '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_state)"><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 && currentPDStatus!=pdStatusCheck.CANCELLED && (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 == 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="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span>
-                                  <span *ngIf="currentPDStatus!=pdStatusCheck.CANCELLED"><button  mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Cancel PD" matTooltipPosition="above" (click)="cancelPD(addresses)"><mat-icon>cancel_presentation</mat-icon></button></span>
                                 </div>  
                                   </div>
                             </div>
                             <div fxLayout="row nowrap">
                               <div fxFlex="100">
                                   <div fxFlex="40" align="left" style="color: #e00201">
-                                      <div *ngIf="master.pd_allocated_to">
-                                        {{master.pd_allocated_to | titlecase}}                                      
-                                  </div>
+                                    <div>
+                                      {{master.pd_status=='ALLOCATED_TO_FIA' && master.SMC_vendor_agency_name!=null && master.pd_allocated_to==null?master.SMC_vendor_agency_name:master.pd_allocated_to}}
+                                  <!--{{master.pd_status=='ALLOCATED_TO_FIA'?master.SMC_vendor_agency_name:master.pd_allocated_to}} -->                                  
+                            </div>
                                   <!-- <div *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2">
                                       {{master.executive_name | titlecase}}
                                     </div>
@@ -252,10 +249,9 @@
                               </div>
                               </div> 
                     </div>
-                   
                     <div *ngSwitchCase="0">
                       <div fxLayout="row nowrap">
-                                  <div fxFlex="100" align="right">
+                                  <div fxFlex="100">
                         <mat-card-actions align="right" *ngIf="roleAccessDetails.trigger && master.fk_primary_address_id==null && addresses.addtional_pd_data.length==0">
                                <button mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
                            </mat-card-actions>