@@ -10,7 +10,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
index 0153e37cc..869792c14 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
@@ -1,4 +1,64 @@
+
+
+
+ filter_list Filter
+
+
+
+
+
+
+
+ {{type.type_name}}
+
+
+
+
+ {{status.pd_status_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{pro.name}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+ {{ent.full_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
index 360ca9a6f..b2de54cbf 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
@@ -1,6 +1,8 @@
-import { Component,ViewChild, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, ViewChild, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
import { PdTrigerService } from './../../../pd-service/pd-triger.service';
import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { DatePipe } from '@angular/common';
@Component({
selector: 'app-qc-completed-pd',
@@ -11,21 +13,31 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m
})
export class QcCompletedPdComponent implements OnInit, OnChanges {
+ xpandStatus: boolean = false;
+ PRODUCTS: any;
+ ENTITY: any;
+ CITY: any;
+ PDType: any;
+ pdStatus: any;
recordStatus: boolean;
- errorMessage:any[]=[];
- tabStatus:string="QC_COMPLETED";
+ errorMessage: any[] = [];
+ tabStatus: string = "QC_COMPLETED";
+ pipe = new DatePipe('en-US');
+
public dataLengthTab5: number;
public dataSourceTab5 = new MatTableDataSource();
- displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action'];
+ tempStore = new MatTableDataSource();
+ searchForm: FormGroup;
+ displayedColumns = ['PDType', 'Name', 'Lenderid', 'Address', 'Status', 'Action'];
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
-
+
@Input() bindFilterValue: string;
@Output() loadPdView = new EventEmitter();
// data source variable details
- qcCompletedPdListData:any[] = [];
+ qcCompletedPdListData: any[] = [];
// pagination variable details
length = 50;
@@ -33,12 +45,26 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
pageSize = 10;
pageEvent: PageEvent;
- constructor(private _pd: PdTrigerService) {
- }
+ constructor(private _pd: PdTrigerService, public _fb: FormBuilder) {
+
+ this.searchForm = this._fb.group(
+ {
+ pd_type: [null],
+ pd_status: [null],
+ pd_from_date: [null],
+ pd_to_date: [null],
+ pd_city: [null],
+ pd_products: [null],
+ pd_lender: [null],
+ pd_name: [null],
+ pd_applicant_id: [null],
+ });
+ }
ngOnInit() {
- this.recordStatus=false;
- // this.loadPDDetails();
+ this.recordStatus = false;
+ // this.loadPDDetails();
+ this.getcommonDropDown();
}
ngAfterViewInit() {
this.dataSourceTab5.paginator = this.paginator;
@@ -51,39 +77,105 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
filteredText = filteredText ? filteredText.trim() : filteredText;
filteredText = filteredText ? filteredText.toLowerCase() : filteredText;
this.dataSourceTab5.filter = filteredText;
-}
+ }
-// load inprogress pd list
+ // load inprogress pd list
loadPDDetails() {
this._pd.getTabStatusPdDetails(this.tabStatus)
- .subscribe(
+ .subscribe(
data => {
if (data.status == 200) {
this.qcCompletedPdListData = data.records;
this.dataLengthTab5 = data.records.length;
this.dataSourceTab5.data = this.qcCompletedPdListData;
-
+ this.tempStore.data = this.qcCompletedPdListData;
}
- else{
- this.qcCompletedPdListData=[];
- this.dataLengthTab5= null;
- this.recordStatus=true;
+ else {
+ this.qcCompletedPdListData = [];
+ this.dataLengthTab5 = null;
+ this.recordStatus = true;
}
- }, error => this.errorMessage = error);
+ }, error => this.errorMessage = error);
}
pageChange(e) {
console.log(e);
}
- viewPD(pdid:string){
+ viewPD(pdid: string) {
this.loadPdView.next(pdid);
}
- titleCaseWord(word:string) {
+ titleCaseWord(word: string) {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
+ /**
+ * Common Search
+ * sriram
+ */
+
+ getcommonDropDown() {
+ this._pd.getAllMasterDatas('PDSTATUS').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.pdStatus = res.records.filter(status => status.isactive == 1 && status.pd_status_name == this.tabStatus);
+ // this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
+ }
+ });
+
+ this._pd.getAllMasterDatas('PDTYPE').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.PDType = res.records.filter(type => type.isactive == 1);
+ }
+ });
+ this._pd.getAllMasterDatas('CITY').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.CITY = res.records.filter(city => city.isactive == 1);
+ }
+ });
+ this._pd.getAllMasterDatas('ENTITY').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.ENTITY = res.records.filter(ent => ent.isactive == 1);
+ }
+ });
+ this._pd.getAllMasterDatas('PRODUCTS').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.PRODUCTS = res.records.filter(pro => pro.isactive == 1);
+ }
+ });
+ }
+ checkDate(e) {
+ console.log(e);
+ }
+ searchItem() {
+
+ if (this.searchForm.value.pd_type != null) {
+
+ } else {
+ this.searchForm.value.pd_type = [];
+ }
+
+ if (this.searchForm.value.pd_status != null) {
+
+ } else {
+ this.searchForm.value.pd_status = [];
+ }
+
+ this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date, 'yyyy-MM-dd');
+ this.searchForm.value.pd_to_date = this.pipe.transform(this.searchForm.value.pd_to_date, 'yyyy-MM-dd');
+
+ this._pd.overAllSearchFormDetails(this.searchForm.value).subscribe(res => {
+ this.xpandStatus = false;
+ if (res['dataStatus'] == true) {
+ this.dataSourceTab5 = res['records'];
+ } else {
+ console.log('else');
+ // this.notifier.notify('warning', 'No Records Found');
+ this.dataSourceTab5 = this.tempStore;
+ }
+ })
+ }
+
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
index 186a64ad6..776b9a9c0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
@@ -1,4 +1,64 @@
+
+
+
+ filter_list Filter
+
+
+
+
+
+
+
+ {{type.type_name}}
+
+
+
+
+ {{status.pd_status_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{pro.name}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+ {{ent.full_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
index d6c030214..299a747e5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
@@ -1,6 +1,8 @@
import { Component,ViewChild, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
import { PdTrigerService } from './../../../pd-service/pd-triger.service';
import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { DatePipe } from '@angular/common';
@Component({
selector: 'app-scheduled-pd',
@@ -9,11 +11,20 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m
encapsulation: ViewEncapsulation.None
})
export class ScheduledPdComponent implements OnInit, OnChanges {
+ xpandStatus: boolean = false;
+ PRODUCTS: any;
+ ENTITY: any;
+ CITY: any;
+ PDType: any;
+ pdStatus: any;
recordStatus: boolean;
errorMessage:any[]=[];
tabStatus:string="SCHEDULED";
+ pipe = new DatePipe('en-US');
+ searchForm:FormGroup;
public dataLengthTab3: number;
public dataSourceTab3 = new MatTableDataSource();
+ tempStore = new MatTableDataSource();
displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action'];
@ViewChild(MatPaginator) paginator: MatPaginator;
@@ -31,12 +42,26 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
pageSize = 10;
pageEvent: PageEvent;
- constructor(private _pd: PdTrigerService) {
+ constructor(private _pd: PdTrigerService,public _fb:FormBuilder) {
+
+ this.searchForm = this._fb.group(
+ {
+ pd_type:[null],
+ pd_status:[null],
+ pd_from_date:[null],
+ pd_to_date:[null],
+ pd_city:[null],
+ pd_products:[null],
+ pd_lender:[null],
+ pd_name:[null],
+ pd_applicant_id:[null],
+ });
}
ngOnInit() {
this.recordStatus=false;
// this.loadPDDetails();
+ this.getcommonDropDown();
}
ngAfterViewInit() {
this.dataSourceTab3.paginator = this.paginator;
@@ -61,6 +86,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
this.scheduledPdListData = data.records;
this.dataLengthTab3 = data.records.length;
this.dataSourceTab3.data = this.scheduledPdListData;
+ this.tempStore.data = this.scheduledPdListData
}
else{
@@ -81,7 +107,89 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
+/**
+ * Common Search
+ * sriram
+ */
+ getcommonDropDown()
+ {
+ this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.pdStatus = res.records.filter(status=>status.isactive==1 && status.pd_status_name==this.tabStatus);
+ // this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
+ }
+ });
+
+ this._pd.getAllMasterDatas('PDTYPE').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.PDType = res.records.filter(type=>type.isactive==1);
+ }
+ });
+ this._pd.getAllMasterDatas('CITY').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.CITY = res.records.filter(city=>city.isactive==1);
+ }
+ });
+ this._pd.getAllMasterDatas('ENTITY').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.ENTITY = res.records.filter(ent=>ent.isactive==1);
+ }
+ });
+ this._pd.getAllMasterDatas('PRODUCTS').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.PRODUCTS = res.records.filter(pro=>pro.isactive==1);
+ }
+ });
+ }
+ checkDate(e)
+ {
+ console.log(e);
+ }
+ searchItem()
+ {
+
+ if(this.searchForm.value.pd_type !=null)
+ {
+
+ }else
+ {
+ this.searchForm.value.pd_type = [];
+ }
+
+ if(this.searchForm.value.pd_status !=null)
+ {
+
+ }else
+ {
+ this.searchForm.value.pd_status = [];
+ }
+
+ this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');
+ this.searchForm.value.pd_to_date = this.pipe.transform(this.searchForm.value.pd_to_date,'yyyy-MM-dd');
+
+ this._pd.overAllSearchFormDetails(this.searchForm.value).subscribe(res=>
+ {
+ this.xpandStatus = false;
+ if(res['dataStatus']==true)
+ {
+ this.dataSourceTab3 = res['records'];
+ }else{
+ // this.notifier.notify('warning', 'No Records Found');
+ this.dataSourceTab3 = this.tempStore;
+ }
+ })
+ }
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
index 9800a1c2e..206bbfe1e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
@@ -280,6 +280,7 @@
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 5db1ff5fb..7da90f6ca 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -192,6 +192,7 @@
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 0d921b9be..53be6499e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -388,6 +388,7 @@
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index b37cb7159..82e871951 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -1,313 +1,203 @@
-