Fairoj: Dynamic PD List count is implemented in Sales PD and Sales PD Alert incomplete goBack is disabled

src/app/app.component.ts

@@ -64,14 +64,14 @@ export class MyApp {
 
       this.shared.getAccessToken().then(()=>{
         this.getuserDetails();
-       
+        this.getCommonSettings()
           this.rootPage = AuthPage
       }).catch(()=>{
       setTimeout(() => {
           this.rootPage = LoginPage;
       }, 1000);
     });
-    this.getCommonSettings()
+   
   })
   
    this.platform.registerBackButtonAction(()=>{

src/pages/login/login.ts

@@ -20,6 +20,7 @@ import { PasswordPage } from '../password/password';
 import { ToastProvider } from '../../providers/common-provider/toast';
 import { ConstantsProvider } from '../../providers/constants/constants';
 import { SalesPDlistPage } from '../sales_pd/pages/sales-p-dlist/sales-p-dlist';
+import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger';
 
 
 @Component({
@@ -47,9 +48,10 @@ config: MatDialogConfig = {
   }
 };
   userDetails: any;
+  commonDetails: any;
 constructor( public aws: AwsServiceProvider, public dialog: MatDialog,
 public shared:CognitoServiceProvider,public navCtrl:NavController,public Menu:MenuController
-,public toast:ToastProvider,public load:LoadingController,private events:Events,private constantProvider:ConstantsProvider) {
+,public toast:ToastProvider,public load:LoadingController,private events:Events,private constantProvider:ConstantsProvider,private pdtrigger:PdtriggerProvider) {
   
 }
 ngOnInit(){
@@ -83,6 +85,7 @@ login() {
     this.presentLoading()
     setTimeout(()=>{
         this.getlenderpddetails()
+        this.getCommonSettings()
       // this.navCtrl.setRoot(PdListPage);
     },1000)       
       
@@ -94,6 +97,7 @@ login() {
     console.log(JSON.stringify(err.message));
     if (err.message == "New password is required.") {
       //console.log("if");
+      this.getCommonSettings()
       this.navCtrl.setRoot(PasswordPage,{'Username':this.email,'Password':this.password});
     } else {
       console.log(JSON.stringify(err.message));
@@ -107,6 +111,15 @@ login() {
     this.toast.lenderappmessage('Enter Email or Password');
   }
 }
+getCommonSettings(){
+  // getCommonConfig
+  this.pdtrigger.getCommonSettingsConfig().subscribe(res=>{
+    this.commonDetails = res;
+   if(this.commonDetails.dataStatus == true){
+         localStorage.setItem("commonSettings",JSON.stringify(this.commonDetails.records));
+   }
+  })
+  }
 getlenderpddetails()
 {
   let userid = this.aws.getlocale();

src/pages/sales_pd/components/ques-template/ques-template.ts

@@ -1029,9 +1029,9 @@ this.proceedonChangeProperty(modified)
         }
           let alert=this.toastProvider.setAlertWithOkButton("<small>Sales PD is incomplete<small>","The Following sections are not Saved <b>"+section_dis_names+'</b>')
           alert.present()
-          alert.onDidDismiss(()=>{
-            this.redirect_to_section('')
-          })
+          // alert.onDidDismiss(()=>{
+          //   this.redirect_to_section('')
+          // })
          
           }
           else{

src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.html

@@ -79,7 +79,7 @@
   <div *ngIf="sales_displayValue.length == 0" style="padding: 10px; margin:5px;">
     <h6 style="font-size: 20px">No Records Found</h6>
    </div>
-  <p *ngIf="sales_displayValue.length > 0 && filterMsg" class="note">Showing data for last 60days. To see older records, please use <ion-icon name="options" style="color: black;font-size:15px;"></ion-icon> advanced filter</p>
+  <p *ngIf="sales_displayValue.length > 0 && filterMsg" class="note">Showing data for last {{common}}. To see older records, please use <ion-icon name="options" style="color: black;font-size:15px;"></ion-icon> advanced filter</p>
   </mat-card>
   </ion-grid>
   </ion-list>

src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.ts

@@ -27,8 +27,11 @@ export class SalesPDlistPage {
   reportSrc: any;
   filter_drop_down_data: { product_ids: any[]; lender_ids: any[]; pd_status: any[]; };
   filterMsg: boolean = false;
+  common: any;
 
   constructor(public actionSheetCtrl: ActionSheetController,public navCtrl: NavController, public navParams: NavParams,private salesPDService:SalesPdProvider,private toastProvider:ToastProvider,private loaderProvider:LoadingProvider,private modalCtrl:ModalController) {
+    this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count;
+    this.common = this.common.count+' '+this.common.factor
   }
 
   ionViewDidLoad() {

www/build/0.js

@@ -1 +1 @@
-webpackJsonp([0],{528:function(a,_,e){"use strict";Object.defineProperty(_,"__esModule",{value:!0}),e.d(_,"SectionListPageModuleNgFactory",function(){return j});var t=e(0),n=e(271),c=e(396),u=e(397),l=e(398),i=e(399),o=e(400),r=e(401),b=e(402),f=e(403),s=e(404),d=e(405),v=e(3),y=e(8),p=e(15),g=e(272),k=e(6),B=e(63),M=e(118),P=e(162),j=t.Y(n.a,[],function(a){return t._12([t._13(512,t.i,t.U,[[8,[c.a,u.a,l.a,i.a,o.a,r.a,b.a,f.a,s.a,d.a]],[3,t.i],t.t]),t._13(4608,v.l,v.k,[t.s,[2,v.u]]),t._13(4608,y.B,y.B,[]),t._13(4608,y.f,y.f,[]),t._13(6144,p.b,null,[v.c]),t._13(4608,p.c,p.c,[[2,p.b]]),t._13(512,v.b,v.b,[]),t._13(512,y.y,y.y,[]),t._13(512,y.l,y.l,[]),t._13(512,y.v,y.v,[]),t._13(512,g.a,g.a,[]),t._13(512,g.b,g.b,[]),t._13(512,p.a,p.a,[]),t._13(256,k.e,!0,[]),t._13(512,k.l,k.l,[[2,k.e]]),t._13(512,B.f,B.f,[]),t._13(512,n.a,n.a,[]),t._13(256,M.a,P.a,[])])})}});
+webpackJsonp([0],{529:function(a,_,e){"use strict";Object.defineProperty(_,"__esModule",{value:!0}),e.d(_,"SectionListPageModuleNgFactory",function(){return j});var t=e(0),n=e(274),c=e(397),u=e(398),l=e(399),i=e(400),o=e(401),r=e(402),b=e(403),f=e(404),s=e(405),d=e(406),v=e(3),y=e(8),p=e(15),g=e(275),k=e(6),B=e(68),M=e(119),P=e(165),j=t.Y(n.a,[],function(a){return t._12([t._13(512,t.i,t.U,[[8,[c.a,u.a,l.a,i.a,o.a,r.a,b.a,f.a,s.a,d.a]],[3,t.i],t.t]),t._13(4608,v.l,v.k,[t.s,[2,v.u]]),t._13(4608,y.B,y.B,[]),t._13(4608,y.f,y.f,[]),t._13(6144,p.b,null,[v.c]),t._13(4608,p.c,p.c,[[2,p.b]]),t._13(512,v.b,v.b,[]),t._13(512,y.y,y.y,[]),t._13(512,y.l,y.l,[]),t._13(512,y.v,y.v,[]),t._13(512,g.a,g.a,[]),t._13(512,g.b,g.b,[]),t._13(512,p.a,p.a,[]),t._13(256,k.e,!0,[]),t._13(512,k.l,k.l,[[2,k.e]]),t._13(512,B.f,B.f,[]),t._13(512,n.a,n.a,[]),t._13(256,M.a,P.a,[])])})}});