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 @@
{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} -
- {{subproduct_abbr}} (Vendor Answer)
+ {{subproduct_abbr}}
+
+
{{pageTitle}}
@@ -20,11 +22,11 @@
-
+
Address Details
-
+
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 @@
Location
-
+
Select
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 @@
{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} -
- {{subproduct_abbr}} (Vendor Answer)
+ {{subproduct_abbr}}
+
+
{{pageTitle}}
@@ -28,7 +30,7 @@
-
+
@@ -108,7 +110,8 @@
-
+
+
Select
Positive
@@ -117,6 +120,7 @@
Status Required
+