From 4897ae18f30d5d20c819bb5eb4d980f9e1d46973 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 19 Oct 2021 19:00:57 +0530 Subject: [PATCH] url changes --- .../components/ques-template/ques-template.ts | 7 ++++++ .../pages/sales-p-dlist/sales-p-dlist.ts | 22 +++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/pages/sales_pd/components/ques-template/ques-template.ts b/src/pages/sales_pd/components/ques-template/ques-template.ts index bb08d84..a7e099b 100755 --- a/src/pages/sales_pd/components/ques-template/ques-template.ts +++ b/src/pages/sales_pd/components/ques-template/ques-template.ts @@ -1245,11 +1245,13 @@ this.proceedonChangeProperty(modified) } let storage_param=this.questions_JSON + storage_param.questions=this.quesAnsForm.getRawValue().questions storage_param.is_complete=flag this.spinner_access=true if (this.submit_btn && flag == 0) { + alert('empty') // this.insertSectionDataLocally(storage_param) storage_param.questions=this.questions_JSON.questions @@ -1264,10 +1266,14 @@ this.proceedonChangeProperty(modified) if(this.local_ques_JSON.section_id == 1 || this.submit_btn){ this.salesPDProvider.getData_fromLocal('sales_pd_id_PRIMARYKEY').then(result=>{ if(result != null && !this.submit_btn){ + alert('a'); + console.log('storage_param'); + console.log(storage_param); this.sendSectiontoApi(storage_param) } else{ this.sendDatatoApi(storage_param) + alert('b'); } }) } @@ -1369,6 +1375,7 @@ this.proceedonChangeProperty(modified) } else{ + section_data.questions=this.questions_JSON.questions section_data.is_completed=true setTimeout(()=>{ diff --git a/src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.ts b/src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.ts index 30a94dd..1207bac 100755 --- a/src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.ts +++ b/src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.ts @@ -43,6 +43,8 @@ export class SalesPDlistPage { constructor(public actionSheetCtrl: ActionSheetController,public navCtrl: NavController, public navParams: NavParams,private salesPDService:SalesPdProvider,private toastProvider:ToastProvider,private loaderProvider:LoadingProvider,private modalCtrl:ModalController,private offlineManager:OfflineManagerProvider, private ionicStorageService:IonicStorageProvider,private cameraProvider:CameraProvider,private constantProvider:ConstantsProvider,private _creditPdService:ApiServiceProvider) { let userDetails = localStorage.getItem('user_details'); + console.log('userdetails'); + console.log(userDetails); let role= this.constantProvider.takeDecisionRouting(JSON.parse(userDetails)) if(role == 'sales'){ this.is_sales_login = true @@ -137,19 +139,25 @@ export class SalesPDlistPage { this.sales_displayValue.map(val=>{ console.log('vvvaaall'); console.log(val); - let link = "https://gstapp.devopsmcfinance.com/home?saltkey=VQDa79tyBlpu7ZuKt6U&data=" + let link = "http://gstapp.devopsmcfinance.com/home?saltkey=VQDa79tyBlpu7ZuKt6U" var string:any = { EmpName:user.user_first_name, EmpCode:"", PDID:val.sales_pd_sno, //PD_NO:val.sales_pd_sno, } - console.log(string); - var encodedString = btoa(JSON.stringify(string)); - console.log("encode",encodedString); // Outputs: "SGVsbG8gV29ybGQh" - var decodedString = atob(encodedString); - console.log("decode",JSON.parse(decodedString)); - let finallink=link+encodedString; + //console.log(string); + //var encodedString = btoa(JSON.stringify(string)); + //console.log("encode",encodedString); // Outputs: "SGVsbG8gV29ybGQh" + //var decodedString = atob(encodedString); + //console.log("decode",JSON.parse(decodedString)); + //let email="mwisesales1@sine.com"; + let PDID=val.sales_pd_sno; + // let mail="&Email=manojsahrawat@smcfinance.com" + let finallink=link+"&Email="+user.email+"&PDID="+PDID; + + console.log('finallink') + console.log(finallink); val.link = finallink; if(products.length > 0 ){ if(products.filter(pro=>pro == val.product_id).length == 0 ){