From 76a63e31cc2a786ceac5fee7ff4e016aedb65992 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Mon, 9 Dec 2019 18:53:29 +0530 Subject: [PATCH] queries changes --- .../pd-question-final-remark.html | 6 +++-- .../pd-question-rental-dash.ts | 24 +++++++++++++------ src/pages/queries-docs/queries-docs.html | 8 ++++--- src/providers/constants/constants.ts | 2 +- .../question-category/question-category.ts | 5 ++++ 5 files changed, 32 insertions(+), 13 deletions(-) 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 + + 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 @@ - + + diff --git a/src/providers/constants/constants.ts b/src/providers/constants/constants.ts index cd0ae242..991fb35e 100755 --- a/src/providers/constants/constants.ts +++ b/src/providers/constants/constants.ts @@ -66,7 +66,7 @@ public commonimage = "http://pdgenie.com/logo/avatar.jpg"; userPoolId:'ap-south-1_qQ85yQZJO', clientId:'2o5c3cs9k3als16nqhp3irh8rs' //for mobile } - return production; + return testing; } getcurrentDate() diff --git a/src/providers/question-category/question-category.ts b/src/providers/question-category/question-category.ts index ac443574..47211b42 100755 --- a/src/providers/question-category/question-category.ts +++ b/src/providers/question-category/question-category.ts @@ -77,6 +77,11 @@ apiurl:any; return this.http.post(this.apiurl + 'deactiveFormData', { "records": params }) } + getPropertyCount(params :any): Observable { + console.log('service params',params) + return this.http.get(this.apiurl + 'getNextRentalCount?pdid=' +params) + +} /**Assessed Form Details API */ saveassessedForms(api,saveData)