From 85f6f208856b0c1efa27d3984adecf6108ae21d4 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 30 Sep 2020 13:18:07 +0530
Subject: [PATCH] Fairoj : Ui changes and question added

---
 .../start-pd/forms/address/address.component.html      |  8 +++++---
 .../forms/final-remarks/final-remarks.component.html   |  2 +-
 .../forms/final-remarks/final-remarks.component.ts     |  9 +++++++--
 .../forms/neighbour-hood/neighbour-hood.component.html | 10 +++++++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index 6ed6fc463..4df5eb549 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -5,7 +5,9 @@
         <div fxFlex="70" align="left" style="padding: 10px !important;">
             <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span
                     *ngIf="subproduct_abbr">-
-                    {{subproduct_abbr}} </span><span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span></span><br>
+                    {{subproduct_abbr}} </span>
+                    <!-- <span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span> -->
+                </span><br>
             {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
@@ -20,11 +22,11 @@
         <mat-tab-group>
             <mat-tab label="Questions">
                 <ng-template matTabContent>
-                    <mat-card style="min-height: 550px;">
+                    <mat-card style="min-height: 550px;background-color: #b9e9f1 !important">
                         <mat-card-title>
                             <p>Address Details</p>
                         </mat-card-title>
-                        <mat-card-content>
+                        <mat-card-content style="background-color: #b9e9f1 !important">
                             <div fxLayout="row wrap">
                                 <div fxFlex="100">
                                     <div formArrayName="addresses">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
index 625303e55..b29bb24b3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
@@ -31,7 +31,7 @@
                 <mat-card>
                     <mat-card-content>
                         <mat-card-subtitle>Location</mat-card-subtitle>
-                        <mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
+                        <mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3'">
                             <mat-select placeholder="Is the location of the business / profession suited to the nature of business / service provided? "
                                 formControlName="is_service_provided" >
                                 <mat-option>Select</mat-option>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
index be84f89b2..58e775de5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
@@ -108,14 +108,19 @@ export class FinalRemarksComponent implements OnInit {
       final_form_remarks: ['']
     });
 
-    if(this.fk_pd_type == '3' || this.fk_pd_type == '2'){        
+    if(this.fk_pd_type == '3'){        
       this._finalRemarkForm.controls['is_service_provided'].clearValidators();
       this._finalRemarkForm.controls['is_service_provided'].updateValueAndValidity();
-
+      
       this._finalRemarkForm.controls['mode_of_transport_during_visit'].clearValidators();
       this._finalRemarkForm.controls['mode_of_transport_during_visit'].updateValueAndValidity();
   }
 
+  if(this.fk_pd_type == "2") {
+    this._finalRemarkForm.controls['mode_of_transport_during_visit'].clearValidators();
+    this._finalRemarkForm.controls['mode_of_transport_during_visit'].updateValueAndValidity();
+  }
+
     if((this.fk_pd_type != '3') && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){  
       this.prod_catagory == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
        this._finalRemarkForm.addControl('is_competition', new FormControl(''));
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 78c4f2afd..5e5ce4ff7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -5,7 +5,9 @@
             <div fxLayout="row wrap">
                 <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
                     <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
-                            {{subproduct_abbr}} </span><span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span></span><br>
+                            {{subproduct_abbr}} </span>
+                            <!-- <span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span> -->
+                        </span><br>
                     {{pageTitle}}
                 </div>
 
@@ -28,7 +30,7 @@
                             <div formArrayName="neighbourhood_list">
                                     <mat-card *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index; let last = last"
                                         [formGroupName]="n">
-                                        <mat-card-content>
+                                        <mat-card-content style="background-color: #b9e9f1 !important">
                                             <mat-form-field style="width: 42%" *ngIf="fk_pd_type != '3'">
                                                 <input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name" appCustomTitleCase
                                                 [value]="neighbourhood.get('neighbourhood_name').value" type="text">
@@ -108,7 +110,8 @@
                                         </mat-card-actions>
                                     </mat-card>
                             </div>
-                            <mat-form-field style="width: 40%">
+                            <mat-card-content style="background-color: #b9e9f1 !important">
+                            <mat-form-field style="width: 40%;background-color: #b9e9f1 !important">
                                         <mat-select placeholder="Status of the check as per PD officer?" formControlName="neighbourhood_status">
                                             <mat-option>Select</mat-option>
                                             <mat-option value="Positive">Positive</mat-option>
@@ -117,6 +120,7 @@
                                         </mat-select>
                                         <mat-error *ngIf="_neighbourhoodForm.controls['neighbourhood_status'].hasError('required')">Status Required</mat-error>
                             </mat-form-field>
+                            </mat-card-content>
                         </div>
                     <div *ngIf="types.id==1">
                             <mat-card-content formArrayName="referencecheck_list">