Merge branch 'master' of https://bitbucket.org/sriramv18/sineedgelenderapp

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

@@ -341,6 +341,8 @@ this.proceedonChangeProperty(modified)
         let storage_param=this.questions_JSON
         this.salesPDProvider.saveSalesPDImage(params).subscribe(apiresult=>{
           if(apiresult['dataStatus']){    
+            console.log("Result",apiresult['dataStatus'])
+            this.toastProvider.lenderappmessage(parent_control.value.question+ " Saved Successfully")
         storage_param.questions=this.quesAnsForm.getRawValue().questions
         this.salesPDProvider.getData_fromLocal('sales_pd_id_PRIMARYKEY').then(key_value=>{
           storage_param.sales_pd_id=key_value

src/pages/sales_pd/pages/advance-filter/advance-filter.ts

@@ -132,6 +132,11 @@ export class AdvanceFilterPage {
   }
   onReset(){
     this.searchForm.reset();
+
+    let local:any = JSON.parse(localStorage.getItem('user_details'));
+    this.searchForm.controls['pd_lender'].setValue(local.fk_entity_id);
+    this.searchForm.controls['sales_pd_officer_id'].setValue(local.userid);
+    
     this.xpandStatus=false
     this.resetFilter.emit(true);
   }

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

@@ -73,16 +73,20 @@
                   </ion-col>                                            
               </ion-row>  
         </ion-item>  
-        <div *ngIf="sales_displayValue.length == 0" style="padding: 10px; margin:5px;">
-       <h6 style="font-size: 20px">No Records Found</h6>
-      </div>
+       
         
   </ion-list>
-  
+  <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>
   </mat-card>
   </ion-grid>
   </ion-list>
   <ion-fab right bottom (click)="newForm()">
     <button ion-fab mini  color="optblue"><ion-icon color="light" name="md-add"></ion-icon></button>
     </ion-fab>
-</ion-content>
+   <!-- <ion-footer>
+     
+    </ion-footer> -->
+    </ion-content>

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

@@ -123,4 +123,13 @@ border-top:1px solid lightgray;
 .action-sheet-md .action-sheet-icon {
   margin: 0 10px 0 0;
 }
+p.note{
+  color: gray;
+  font-size: 13px;
+  font-weight: bold;
+  text-align: center;
+  border-radius: 10px;
+  padding: 10px;
+  float: center;
 
+}

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

@@ -26,6 +26,7 @@ export class SalesPDlistPage {
   loader_access:any=true
   reportSrc: any;
   filter_drop_down_data: { product_ids: any[]; lender_ids: any[]; pd_status: any[]; };
+  filterMsg: boolean = false;
 
   constructor(public actionSheetCtrl: ActionSheetController,public navCtrl: NavController, public navParams: NavParams,private salesPDService:SalesPdProvider,private toastProvider:ToastProvider,private loaderProvider:LoadingProvider,private modalCtrl:ModalController) {
   }
@@ -52,6 +53,7 @@ export class SalesPDlistPage {
       this.sales_displayValue=res['records']
       this.loader_access=false
       if(this.sales_displayValue.length > 0){
+        this.filterMsg = true
         let products=[]
         let lenders=[]
         let pd_status=[]
@@ -167,6 +169,7 @@ export class SalesPDlistPage {
       console.log(data)
       if(data){
         this.sales_displayValue = data;
+        this.filterMsg = false
       }
       
     })

www/build/0.js

@@ -1 +1 @@
-webpackJsonp([0],{527:function(a,_,e){"use strict";Object.defineProperty(_,"__esModule",{value:!0}),e.d(_,"SectionListPageModuleNgFactory",function(){return j});var t=e(0),n=e(268),c=e(392),u=e(393),l=e(394),i=e(395),o=e(396),r=e(397),b=e(398),f=e(399),s=e(400),d=e(401),v=e(3),y=e(9),p=e(16),g=e(269),k=e(6),B=e(62),M=e(116),P=e(160),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],{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,[])])})}});