diff --git a/config.xml b/config.xml index 2b730eb..218db3a 100755 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + PD Genie info@pdgenie.com PD Genie @@ -13,7 +13,7 @@ - + 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 ad07f26..25d95bf 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 @@ -150,6 +150,8 @@ export class SalesPDlistPage { } else{ this.loader_access=false + this.sales_displayValue = [] + this.getListofLocalPD() } },err=>{ diff --git a/src/pages/sales_pd/providers/sales-pd/sales-pd.ts b/src/pages/sales_pd/providers/sales-pd/sales-pd.ts index 2b012ed..203abda 100755 --- a/src/pages/sales_pd/providers/sales-pd/sales-pd.ts +++ b/src/pages/sales_pd/providers/sales-pd/sales-pd.ts @@ -4,7 +4,7 @@ import { ConstantsProvider } from '../../../../providers/constants/constants'; import { catchError, retry } from 'rxjs/operators'; import { Storage } from '@ionic/storage'; import { AwsServiceProvider } from '../../../../providers/aws-service/aws-service'; -import { Observable, Observer } from 'rxjs'; +import { forkJoin, Observable, Observer } from 'rxjs'; import { CameraProvider } from '../camera/camera'; import { NetworkDetectionProvider, ConnectionStatus } from '../../../../providers/network-detection/network-detection'; import { IonicStorageProvider } from '../../../../providers/ionic-storage/ionic-storage'; @@ -773,4 +773,30 @@ return this.creditPDService.getStakeholderInfo().map(res=>{ getSalesPDImgDataCusLink(params) { return this.http.post(this.apiUrl+'getSalesPDImgDataCusLink',params) } +callMultipleApisForTemplate(product_arr) { + let users:any=localStorage.getItem('user_details') + users=JSON.parse(users) + let arr_call = [] + for(let val of product_arr) { + let params1 = {records:{lender_id:users.fk_entity_id,product_id:val.product_id,sales_pd_type:'1'}} + let params2 = {records:{lender_id:users.fk_entity_id,product_id:val.product_id,sales_pd_type:'2'}} + let api1= this.http.post(this.apiUrl+'loadSalesPDTemplate',params1) + let api2= this.http.post(this.apiUrl+'loadSalesPDTemplate',params2) + arr_call.push(api1) + arr_call.push(api2) + } + forkJoin(arr_call).subscribe((res:any)=>{ + console.log("rrsadfsadf",res) + res.forEach(val=>{ + if(val['dataStatus']) { + let params = {records:{lender_id:val.records.lender_id,product_id:val.records.product_id,sales_pd_type:val.records.sales_pd_type}} + // this.ionicStorageProvider.checkAndInsertApiDataLocally(val,params,'loadSalesPDTemplate',true).then(rr=>) + val.params = params + } + }) + console.log("final lksdjfl asdf", res); + this.ionicStorageProvider.inserDataWithReplace('loadSalesPDTemplate',res).then(rr=>{}) + }) + +} } diff --git a/src/providers/pdtrigger/pdtrigger.ts b/src/providers/pdtrigger/pdtrigger.ts index ae41336..17970dd 100755 --- a/src/providers/pdtrigger/pdtrigger.ts +++ b/src/providers/pdtrigger/pdtrigger.ts @@ -7,6 +7,7 @@ import { catchError } from 'rxjs/operators'; import { NetworkDetectionProvider, ConnectionStatus } from '../network-detection/network-detection'; import { IonicStorageProvider } from '../ionic-storage/ionic-storage'; import { SalesPdProvider } from '../../pages/sales_pd/providers/sales-pd/sales-pd'; +import { LoadingProvider } from '../common-provider/loading'; /* Generated class for the PdtriggerProvider provider. @@ -20,7 +21,7 @@ import { SalesPdProvider } from '../../pages/sales_pd/providers/sales-pd/sales-p export class PdtriggerProvider { apiurl:any; constructor(public http: HttpClient,public constants:ConstantsProvider,private networkProvider:NetworkDetectionProvider, - private ionicStorageProvider:IonicStorageProvider,private salesPDProvider:SalesPdProvider) { + private ionicStorageProvider:IonicStorageProvider,private salesPDProvider:SalesPdProvider, private loadingProvider:LoadingProvider) { this.apiurl = constants.environment(); this.apiurl=this.apiurl.url console.log('Hello PdtriggerProvider Provider'); @@ -86,6 +87,9 @@ getLenderContactPersons(datas){ } initiateMasterApis(type) { if(type == 'sales') { + this.loadingProvider.pdloader('') + let lender_id:any=localStorage.getItem("user_details") + lender_id=JSON.parse(lender_id).fk_entity_id; // HARD CODED API PARAMS this.salesPDProvider.getAllMasterDatas('STATE').subscribe(res=>{ // FOR MEQ PRODUCTS MASTER API @@ -98,25 +102,32 @@ initiateMasterApis(type) { }) }) // SALES PD TEMPLATE FOR WCTL AND LFMP - this.salesPDProvider.getData('8','1').subscribe(res=>{ - this.salesPDProvider.getData('9','1').subscribe(res=>{ - this.salesPDProvider.getData('8','2').subscribe(res=>{ - this.salesPDProvider.getData('9','2').subscribe(res=>{ - this.salesPDProvider.getData('22','1').subscribe(res=>{ - this.salesPDProvider.getData('22','2').subscribe(res=>{}) - }) - }) - }) - }) - }) + // this.salesPDProvider.getData('8','1').subscribe(res=>{ + // this.salesPDProvider.getData('9','1').subscribe(res=>{ + // this.salesPDProvider.getData('8','2').subscribe(res=>{ + // this.salesPDProvider.getData('9','2').subscribe(res=>{ + // this.salesPDProvider.getData('22','1').subscribe(res=>{ + // this.salesPDProvider.getData('22','2').subscribe(res=>{}) + // }) + // }) + // }) + // }) + // }) //SALES PD PRODUCTS LIST FOR LENDER MWISE - this.getEntityPreferences('35').subscribe(res=>{}) + this.getEntityPreferences(lender_id).subscribe(res=>{ + if(res.dataStatus && res.records && res.records.salespd_products && res.records.salespd_products.length > 0) { + // SALES PD TEMPLATE FOR WCTL AND LFMP + this.salesPDProvider.callMultipleApisForTemplate(res.records.salespd_products) + } + }) // GETTING CITY AND PINCODE FOR SOME STATES this.salesPDProvider.getCityPincode('5').subscribe(res=>{ this.salesPDProvider.getCityPincode('6').subscribe(res=>{ this.salesPDProvider.getCityPincode('15').subscribe(res=>{ this.salesPDProvider.getCityPincode('27').subscribe(res=>{ - this.salesPDProvider.getCityPincode('26').subscribe(res=>{}) + this.salesPDProvider.getCityPincode('26').subscribe(res=>{ + this.loadingProvider.dismissLoader(); + }) }) }) })