Showing data for last {{common}}. To see older records, please use advanced filter
+
{{pdlistdetails}}
diff --git a/src/pages/pd-list/pd-list.scss b/src/pages/pd-list/pd-list.scss
index 6f09527..7ee7faf 100755
--- a/src/pages/pd-list/pd-list.scss
+++ b/src/pages/pd-list/pd-list.scss
@@ -3,6 +3,16 @@ page-pd-list{
mat-grid-tile {
background: white!important;
}
+ p.note{
+ color: gray;
+ font-size: 13px;
+ font-weight: bold;
+ text-align: center;
+ border-radius: 10px;
+ padding: 10px;
+ float: center;
+
+ }
.grid{
padding:0px;
}
diff --git a/src/pages/pd-list/pd-list.ts b/src/pages/pd-list/pd-list.ts
index 52e88ee..f120e77 100755
--- a/src/pages/pd-list/pd-list.ts
+++ b/src/pages/pd-list/pd-list.ts
@@ -1,11 +1,12 @@
import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams, Events } from 'ionic-angular';
+import { IonicPage, NavController, NavParams, Events, ModalOptions, ModalController } from 'ionic-angular';
import { InputPage } from '../input/input';
import { AwsServiceProvider } from '../../providers/aws-service/aws-service';
import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger';
import { CognitoServiceProvider } from '../../providers/aws-service/cognito.service';
import { parseDate } from 'ionic-angular/util/datetime-util';
import { PdAllocationPage } from '../pd-allocation/pd-allocation';
+import { PdAdvanceFilterPage } from './pd-advance-filter/pd-advance-filter';
/**
@@ -38,10 +39,14 @@ export class PdListPage {
status:any;
searchitem:any;
loader_access:boolean=true
-
+ filter_drop_down_data: { product_ids: any[]; lender_ids: any[]; pd_status: any[]; };
+ filterMsg: boolean = false;
+ common: any;
// public category:string="inpro"
// public categories:Array
=['inpro','past']
- constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public pdofficer:PdtriggerProvider,public shared:CognitoServiceProvider,private events:Events) {
+ constructor(public navCtrl: NavController,private modalCtrl:ModalController, public navParams: NavParams,public aws:AwsServiceProvider,public pdofficer:PdtriggerProvider,public shared:CognitoServiceProvider,private events:Events) {
+ this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count;
+ this.common = this.common.count+' '+this.common.factor
}
ionViewDidLoad() {
@@ -84,6 +89,7 @@ export class PdListPage {
if(this.pdlistdetails.dataStatus == true)
{
this.loader_access=false
+ this.filterMsg=true
this.pdlistaccess = true;
this.pdinprogress = this.pdlistdetails.records.filter(past=>past.pd_status !="QC_COMPLETED");
this.searchinprogress = this.pdinprogress;
@@ -133,7 +139,54 @@ export class PdListPage {
});
}
+ openFilterModal(){
+ const modalOption:ModalOptions={
+ cssClass:'filterModal'
+ }
+ const modalCtrl=this.modalCtrl.create(PdAdvanceFilterPage,{'drop_down_datas':this.filter_drop_down_data},modalOption)
+ modalCtrl.present();
+ modalCtrl.onDidDismiss((data)=>{
+ console.log(data)
+ if(data){
+ // this.sales_displayValue = data;
+ this.filterMsg=false
+ this.loader_access=false
+ this.pdlistaccess = true;
+ this.pdinprogress = data.filter(past=>past.pd_status !="QC_COMPLETED");
+ this.searchinprogress = this.pdinprogress;
+ this.pdlistdetails = data.filter(past=>past.pd_status =="QC_COMPLETED");
+ this.searchpast = this.pdlistdetails;
+ //FOR SPLITTING THE VALUE OF pd_sno
+ this.pdinprogress.length >0 ?
+ this.pdinprogress.forEach(value=>{
+ let original=value.pd_sno
+ if(original != null){
+ value.pd_sno_split={lender_name:original.replace(/[^a-z]/gi, ''),serial_no:original.match(/(\d+)/)[0]}
+ }
+ else{
+ value.pd_sno_split={lender_name:'',serial_no:''}
+ }
+ }) : this.pdinprogress
+
+ this.pdlistdetails.length >0 ?
+ this.pdlistdetails.forEach(value=>{
+ let original=value.pd_sno
+ if(original != null){
+ value.pd_sno_split={lender_name:original.replace(/[^a-z]/gi, ''),serial_no:original.match(/(\d+)/)[0]}
+ }
+ else{
+ value.pd_sno_split={lender_name:'',serial_no:''}
+ }
+ }) : this.pdlistdetails
+
+ console.log("ingp",this.pdinprogress);
+ this.random_bg_color();
+ this.random_ng_past();
+ }
+
+ })
+ }
pdlistsearch(searchbar) {
this.pdlistdetails = this.searchpast;
this.pdinprogress = this.searchinprogress;
diff --git a/src/providers/pdtrigger/pdtrigger.ts b/src/providers/pdtrigger/pdtrigger.ts
index b818698..1f0dc7a 100755
--- a/src/providers/pdtrigger/pdtrigger.ts
+++ b/src/providers/pdtrigger/pdtrigger.ts
@@ -25,7 +25,15 @@ export class PdtriggerProvider {
/**get dropdonw list */
-
+ getAllMasterDatas(TableName: string): Observable {
+ return this.http.post(this.apiurl + 'getListOfMaster', { "master_name": TableName })
+ .pipe(
+ // catchError(this.handleError('role', []))
+ )
+ }
+ advancedFilter(params): Observable{
+ return this.http.post(this.apiurl+'filterPDList',{"records":params})
+ }
getproductandsubpro()
{
return this.http.get(this.apiurl+'getListOfProducts');
@@ -154,6 +162,9 @@ getLenderContactPersons(datas){
handleError(arg0: string, arg1: undefined[]): any {
console.log("error",arg1)
}
-
+ getCommonSettingsConfig()
+ {
+ return this.http.post(this.apiurl+'getCommonConfig','');
+ }
}