From d5770c616fb0e70a1f4dcb8a7af2fd6affbf6546 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 30 May 2019 17:34:03 +0530 Subject: [PATCH] issues fixes ps --- src/pages/pd-allocation/pd-allocation.ts | 2 +- src/pages/pd-list/pd-list.html | 24 +++++++++++++++++++++--- src/pages/pd-list/pd-list.ts | 15 +++++++-------- src/providers/constants/constants.ts | 10 +++++----- src/providers/pdtrigger/pdtrigger.ts | 6 +++--- 5 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/pages/pd-allocation/pd-allocation.ts b/src/pages/pd-allocation/pd-allocation.ts index 914ca5f..3439eeb 100755 --- a/src/pages/pd-allocation/pd-allocation.ts +++ b/src/pages/pd-allocation/pd-allocation.ts @@ -41,7 +41,7 @@ pdDetailLender:any = []; this.pdDetailLender = res; if(this.pdDetailLender.dataStatus == true) { - console.log("Pd",this.pdDetailLender) + // console.log("Pd",this.pdDetailLender) this.pdFullDetails = this.pdDetailLender.records.pd_master_details[0]; this.addresses=this.pdDetailLender.records.pd_address this.qccompleted = this.pdFullDetails.pd_status.replace("_"," "); diff --git a/src/pages/pd-list/pd-list.html b/src/pages/pd-list/pd-list.html index 3fd2a22..26b38c8 100755 --- a/src/pages/pd-list/pd-list.html +++ b/src/pages/pd-list/pd-list.html @@ -118,10 +118,28 @@

{{progess.pd_id}}

- + - + !--

28 Sep 2018 10:00 AM

-- + --> + + + + + +

{{progess.applicat_details[0].applicant_name | titlecase}}

+
+
+
+ + + + +

Add On for {{progess.parent_pd_id}}

+
+
+ +
{{progess.pd_date_of_initiation}}
diff --git a/src/pages/pd-list/pd-list.ts b/src/pages/pd-list/pd-list.ts index 49f0e8e..59edce2 100755 --- a/src/pages/pd-list/pd-list.ts +++ b/src/pages/pd-list/pd-list.ts @@ -68,8 +68,8 @@ export class PdListPage { this.userDetails = res; if(this.userDetails.dataStatus == true){ this.userDetails = this.userDetails.records[0]; - - this.pdofficer.getpddetails(this.userDetails.fk_entity_id).subscribe(res=> + // console.log('this.userDetails.records[0]',this.userDetails.records[0]); + this.pdofficer.getpddetails(this.userDetails.fk_entity_id,this.userDetails.userid).subscribe(res=> { this.pdlistdetails = res; if(this.pdlistdetails.dataStatus == true) @@ -77,7 +77,6 @@ export class PdListPage { this.pdlistaccess = true; this.pdinprogress = this.pdlistdetails.records.filter(past=>past.pd_status !="QC_COMPLETED"); this.searchinprogress = this.pdinprogress; - console.log(this.pdinprogress); this.pdlistdetails = this.pdlistdetails.records.filter(past=>past.pd_status =="QC_COMPLETED"); this.searchpast = this.pdlistdetails; this.random_bg_color(); @@ -103,7 +102,7 @@ export class PdListPage { // if the value is an empty string don't filter the items if(this.pdlist == "inpro"){ - console.log('if'); + // console.log('if'); if (q.trim() == '') { return ; }else{ @@ -117,8 +116,8 @@ export class PdListPage { }else { if (q.trim() == '') { - console.log(q.trim()); - console.log(this.pdlistdetails); + // console.log(q.trim()); + // console.log(this.pdlistdetails); return ; }else{ this.pdlistdetails = this.searchpast.filter((v) => { @@ -160,11 +159,11 @@ export class PdListPage { } doRefresh(refresher) { this.bgColor = []; - console.log('Begin async operation', refresher); + // console.log('Begin async operation', refresher); this.shared.refresh(); this.getlenderpddetails(); setTimeout(() => { - console.log('Async operation has ended'); + // console.log('Async operation has ended'); refresher.complete(); }, 2000); } diff --git a/src/providers/constants/constants.ts b/src/providers/constants/constants.ts index bf0f616..296e806 100755 --- a/src/providers/constants/constants.ts +++ b/src/providers/constants/constants.ts @@ -17,14 +17,14 @@ export class ConstantsProvider { apiurl() { - let testapiurl = 'http://ssa.sineedge.com/sparqtest/api/'; - let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/'; - let localapiurl = 'http://192.168.0.9/sparqapi/api/'; - return devapiurl; + let testapiurl = 'https://ssa.sineedge.com/sparqtest/api/'; + let devapiurl = 'https://ssa.sineedge.com/sparqapi/api/'; + let localapiurl = 'https://192.168.0.9/sparqapi/api/'; + return testapiurl; } //For Searching Fields searchValue(exist_data,value,option){ - console.log("option",option) + // console.log("option",option) let returnDataVal:any if(!exist_data){ return diff --git a/src/providers/pdtrigger/pdtrigger.ts b/src/providers/pdtrigger/pdtrigger.ts index e5772be..8fbefc5 100755 --- a/src/providers/pdtrigger/pdtrigger.ts +++ b/src/providers/pdtrigger/pdtrigger.ts @@ -48,10 +48,10 @@ export class PdtriggerProvider { /**Get list of PD Trigger */ - getpddetails(userid) + getpddetails(lendersentityid,lendersuserid) { - //console.log(userid); - return this.http.get(this.apiurl+'listLessPDDetails/get?lenderid='+userid); + return this.http.get(this.apiurl+'listLessPDDetails/get?lenderid='+lendersuserid); + // return this.http.get(this.apiurl+'listLessPDDetails/get?lenderid='+lendersentityid+'/?userid='+lendersuserid); } getfullpddetails(pdid) {