diff --git a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
index 47420a0d..b0a975f7 100755
--- a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
+++ b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
@@ -132,8 +132,10 @@
- Reason for Marking PD Status as Positive
-
+ Reason for Marking PD Status as Positive
+
+
1">
diff --git a/src/pages/pd-question/pd-question-loans/pd-question-loans.ts b/src/pages/pd-question/pd-question-loans/pd-question-loans.ts
index 80ac2aff..674ca9bd 100755
--- a/src/pages/pd-question/pd-question-loans/pd-question-loans.ts
+++ b/src/pages/pd-question/pd-question-loans/pd-question-loans.ts
@@ -462,7 +462,8 @@ export class PdQuestionLoansPage {
mortage_type(mortage_value)
{
let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id==mortage_value)[0];
- let property_name = mortagetypes.property_name.replace(/\s/g, "").toLowerCase();
+ if(mortagetypes != undefined){
+ let property_name = mortagetypes.property_name.replace(/\s/g, "").toLowerCase();
if(property_name=='others(pleasespecify)' || property_name=='others')
{
this.mortageAccess = true;
@@ -470,6 +471,9 @@ export class PdQuestionLoansPage {
{
this.mortageAccess = false;
}
+
+ }
+
}
@@ -507,6 +511,7 @@ export class PdQuestionLoansPage {
data => {
this.m_endUseForLoan = data['records'].filter(data => data.isactive == 1);
});
+ this.loanDetailsForm.controls['end_use'].setValue('');
}
ChangeProperty(subproduct_id){
@@ -538,7 +543,9 @@ export class PdQuestionLoansPage {
//this.endUserList = [];
event.forEach(option => {
let othresData = this.m_endUseForLoan.filter(sub=>sub.enduse_of_loan_id==option)[0];
+ if(othresData != undefined){
othresData = othresData.enduse_of_loan.substr(0,6).toLowerCase();
+ }
this.endUserList.push({ end_use: option });
if (othresData == 'others') {
@@ -625,9 +632,13 @@ export class PdQuestionLoansPage {
// }
// get end user final group data
let dataEnd_user_data = [];
- this.loanDetailsForm.controls['end_use'].value.forEach(element => {
- dataEnd_user_data.push({end_use: element})
- });
+ console.log(this.loanDetailsForm.controls['end_use'].value.length> 0);
+ if(this.loanDetailsForm.controls['end_use'].value.length> 0){
+ this.loanDetailsForm.controls['end_use'].value.forEach(element => {
+ dataEnd_user_data.push({end_use: element})
+ });
+ }
+
records.end_use_group = dataEnd_user_data;
if (this.isOtherPurpose) {
diff --git a/src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.ts b/src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.ts
index 50510524..31165698 100755
--- a/src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.ts
+++ b/src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.ts
@@ -116,13 +116,23 @@ this.loadingProvider.dataLoader();
console.log("d",values)
}
addMore(){
- let passValues: any = {
- manage_status: 1,
- // parentData: this.parentData,
- // masterData: this.masterData,
- existing_rental_count_id: this.existing_rental_count_id + 1,
- }
- this.navCtrl.push(PdQuestionRentalInfoPage,{"values":passValues,'pdDetails':this.pdDetails,'FormId':this.form_details});
+ let params: any = {};
+ console.log('add params',params);
+ params.pd_id = this.pdDetails.pd_id;
+ console.log(this.pdDetails.pd_id);
+ this.qustCat.getPropertyCount(this.pdDetails.pd_id).subscribe(data => {
+ if (data.status == 200){
+ let passValues: any = {
+ manage_status: 1,
+ // parentData: this.parentData,
+ // masterData: this.masterData,
+ existing_rental_count_id: data.records,
+ }
+ this.navCtrl.push(PdQuestionRentalInfoPage,{"values":passValues,'pdDetails':this.pdDetails,'FormId':this.form_details});
+
+ }
+ })
+
}
isactiveProperty(info){
diff --git a/src/pages/queries-docs/queries-docs.html b/src/pages/queries-docs/queries-docs.html
index 93101270..ff28b11a 100755
--- a/src/pages/queries-docs/queries-docs.html
+++ b/src/pages/queries-docs/queries-docs.html
@@ -36,8 +36,9 @@
-
+ -->
+
+
@@ -75,7 +76,8 @@