Sineedge/sineedgelenderapp
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

url changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2021-10-19 19:00:57 +05:30
parent c79a3bd743
commit 4897ae18f3
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/sales_pd/components/ques-template/ques-template.ts
View File

@ -1245,11 +1245,13 @@ this.proceedonChangeProperty(modified)
} }
let storage_param=this.questions_JSON let storage_param=this.questions_JSON
storage_param.questions=this.quesAnsForm.getRawValue().questions storage_param.questions=this.quesAnsForm.getRawValue().questions
storage_param.is_complete=flag storage_param.is_complete=flag
this.spinner_access=true this.spinner_access=true
if (this.submit_btn && flag == 0) { if (this.submit_btn && flag == 0) {
alert('empty')
// this.insertSectionDataLocally(storage_param) // this.insertSectionDataLocally(storage_param)
storage_param.questions=this.questions_JSON.questions 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){ if(this.local_ques_JSON.section_id == 1 || this.submit_btn){
this.salesPDProvider.getData_fromLocal('sales_pd_id_PRIMARYKEY').then(result=>{ this.salesPDProvider.getData_fromLocal('sales_pd_id_PRIMARYKEY').then(result=>{
if(result != null && !this.submit_btn){ if(result != null && !this.submit_btn){
alert('a');
console.log('storage_param');
console.log(storage_param);
this.sendSectiontoApi(storage_param) this.sendSectiontoApi(storage_param)
} }
else{ else{
this.sendDatatoApi(storage_param) this.sendDatatoApi(storage_param)
alert('b');
} }
}) })
} }
@ -1369,6 +1375,7 @@ this.proceedonChangeProperty(modified)
} }
else{ else{
section_data.questions=this.questions_JSON.questions section_data.questions=this.questions_JSON.questions
section_data.is_completed=true section_data.is_completed=true
setTimeout(()=>{ setTimeout(()=>{

22
src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.ts
View File

@ -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, 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) { private ionicStorageService:IonicStorageProvider,private cameraProvider:CameraProvider,private constantProvider:ConstantsProvider,private _creditPdService:ApiServiceProvider) {
let userDetails = localStorage.getItem('user_details'); let userDetails = localStorage.getItem('user_details');
console.log('userdetails');
console.log(userDetails);
let role= this.constantProvider.takeDecisionRouting(JSON.parse(userDetails)) let role= this.constantProvider.takeDecisionRouting(JSON.parse(userDetails))
if(role == 'sales'){ if(role == 'sales'){
this.is_sales_login = true this.is_sales_login = true
@ -137,19 +139,25 @@ export class SalesPDlistPage {
this.sales_displayValue.map(val=>{ this.sales_displayValue.map(val=>{
console.log('vvvaaall'); console.log('vvvaaall');
console.log(val); 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 = { var string:any = {
EmpName:user.user_first_name, EmpName:user.user_first_name,
EmpCode:"", EmpCode:"",
PDID:val.sales_pd_sno, PDID:val.sales_pd_sno,
//PD_NO:val.sales_pd_sno, //PD_NO:val.sales_pd_sno,
} }
console.log(string); //console.log(string);
var encodedString = btoa(JSON.stringify(string)); //var encodedString = btoa(JSON.stringify(string));
console.log("encode",encodedString); // Outputs: "SGVsbG8gV29ybGQh" //console.log("encode",encodedString); // Outputs: "SGVsbG8gV29ybGQh"
var decodedString = atob(encodedString); //var decodedString = atob(encodedString);
console.log("decode",JSON.parse(decodedString)); //console.log("decode",JSON.parse(decodedString));
let finallink=link+encodedString; //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; val.link = finallink;
if(products.length > 0 ){ if(products.length > 0 ){
if(products.filter(pro=>pro == val.product_id).length == 0 ){ if(products.filter(pro=>pro == val.product_id).length == 0 ){