diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 794bcd2fb..4d65f26a8 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -51,7 +51,7 @@ export class AddPdComponent implements OnInit, OnDestroy { this.PDTriggerStatus="TRIGGERED"; this.enablePDButton=false; this.cancelStatus = false; - this.ListPdComponent.pdListLoad(false); + this.ListPdComponent.showListView(false); this.getLenderList(); this.getProductsList(); this.getCustomerSegmentList(); @@ -59,7 +59,7 @@ export class AddPdComponent implements OnInit, OnDestroy { this.getPDTypeList(); this.getRelationMaster(); this.loadFormData(); - this.OnChanges(); + this.OnChanges(); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html new file mode 100644 index 000000000..b31db18d2 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -0,0 +1,43 @@ + + + + + + {{details.applicat_details[0].applicant_name}}
+ {{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) + + + + + {{details.lender_full_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.loan_amount}} + + + + + {{details.pd_date_of_initiation}}
+ {{details.city_name}}-{{details.pincode}} + + + + + {{details.pd_status}}
+ {{ (details.scheduled_on) ? (details.scheduled_on | slice:0:10):(details.scheduled_on) }} + + + + + + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss new file mode 100644 index 000000000..9e293a473 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss @@ -0,0 +1,16 @@ +.ic-change:hover { + transform: scale(1.1); + color: green; +} +.cell{ + display:inline !important; +} +.cellhide{ + display: none !important; +} +.center{ + text-align:center; +} +.fontsize{ + font-size:14px; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.spec.ts new file mode 100644 index 000000000..382c71e50 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AllPdComponent } from './all-pd.component'; + +describe('AllPdComponent', () => { + let component: AllPdComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AllPdComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AllPdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts new file mode 100644 index 000000000..5734107ca --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -0,0 +1,85 @@ +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'; + +@Component({ + selector: 'app-all-pd', + templateUrl: './all-pd.component.html', + styleUrls: ['./all-pd.component.scss'], + encapsulation: ViewEncapsulation.None + +}) + +export class AllPdComponent implements OnInit, OnChanges { + recordStatus: boolean; + errorMessage:any[]=[]; + tabStatus:string="ALL"; + public dataLengthTab1: number; + public dataSourceTab1 = new MatTableDataSource(); + displayedColumns = ['Name','Lenderid','Address','Status','Action']; + + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; + + @Input() bindFilterValue: string; + + @Output() loadPdView = new EventEmitter(); + + // data source variable details + PdListData:any[] = []; + + // pagination variable details + length = 50; + pageIndex = 0; + pageSize = 10; + pageEvent: PageEvent; + + constructor(private _pd: PdTrigerService) { + } + + ngOnInit() { + this.recordStatus=false; + // this.loadPDDetails(); + } + ngAfterViewInit() { + this.dataSourceTab1.paginator = this.paginator; + this.dataSourceTab1.sort = this.sort; + } + + // get changes for filter from parent componnet filter + ngOnChanges(changes: SimpleChanges) { + let filteredText = changes.bindFilterValue.currentValue ? changes.bindFilterValue.currentValue.trim() : changes.bindFilterValue.currentValue; + filteredText = filteredText ? filteredText.toLowerCase() : filteredText; + this.dataSourceTab1.filter = filteredText; + +} + +// load inprogress pd list + + loadPDDetails() { + //this._pd.getTabStatusPdDetails(this.tabStatus) + this._pd.getPdDetails() + .subscribe( + data => { + if (data.status == 200) { + this.PdListData = data.records; + this.dataLengthTab1 = data.records.length; + this.dataSourceTab1.data = this.PdListData; + + } + else{ + this.PdListData=[]; + this.dataSourceTab1 = null; + this.recordStatus=true; + } + }, error => this.errorMessage = error); + } + pageChange(e) { + console.log(e); + } + viewPD(pdid:string){ + this.loadPdView.next(pdid); + + } + +} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html new file mode 100644 index 000000000..7fbce3973 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -0,0 +1,43 @@ + + + + + + {{details.applicat_details[0].applicant_name}}
+ {{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) + + + + + {{details.lender_full_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.loan_amount}} + + + + + {{details.pd_date_of_initiation}}
+ {{details.city_name}}-{{details.pincode}} + + + + + {{details.pd_status}}
+ {{ (details.scheduled_on)? (details.scheduled_on | slice:0:10):(details.scheduled_on) }} + + + + + + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.spec.ts new file mode 100644 index 000000000..4b63f476e --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CompletedPdComponent } from './completed-pd.component'; + +describe('CompletedPdComponent', () => { + let component: CompletedPdComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CompletedPdComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CompletedPdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts new file mode 100644 index 000000000..baca0e5f1 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -0,0 +1,85 @@ +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'; + +@Component({ + selector: 'app-completed-pd', + templateUrl: './completed-pd.component.html', + styleUrls: ['./completed-pd.component.scss'], + encapsulation: ViewEncapsulation.None + +}) + +export class CompletedPdComponent implements OnInit, OnChanges { + recordStatus: boolean; + errorMessage:any[]=[]; + tabStatus:string="COMPLETED"; + public dataLengthTab4: number; + public dataSourceTab4 = new MatTableDataSource(); + displayedColumns = ['Name','Lenderid','Address','Status','Action']; + + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; + + @Input() bindFilterValue: string; + @Output() loadPdView = new EventEmitter(); + + // data source variable details + completedPdListData:any[] = []; + + // pagination variable details + length = 50; + pageIndex = 0; + pageSize = 10; + pageEvent: PageEvent; + + constructor(private _pd: PdTrigerService) { + } + + ngOnInit() { + this.recordStatus=false; + // this.loadPDDetails(); + } + ngAfterViewInit() { + this.dataSourceTab4.paginator = this.paginator; + this.dataSourceTab4.sort = this.sort; + } + + // get changes for filter from parent componnet filter + ngOnChanges(changes: SimpleChanges) { + let filteredText = changes.bindFilterValue.currentValue; + filteredText = filteredText ? filteredText.trim() : filteredText; + filteredText = filteredText ? filteredText.toLowerCase() : filteredText; + this.dataSourceTab4.filter = filteredText; +} + +// load inprogress pd list + + loadPDDetails() { + this._pd.getTabStatusPdDetails(this.tabStatus) + .subscribe( + data => { + if (data.status == 200) { + this.completedPdListData = data.records; + this.dataLengthTab4 = data.records.length; + this.dataSourceTab4.data = this.completedPdListData; + + } + else{ + this.completedPdListData=[]; + this.dataLengthTab4= null; + this.recordStatus=true; + } + }, error => this.errorMessage = error); + } + pageChange(e) { + console.log(e); + } + viewPD(pdid:string){ + this.loadPdView.next(pdid); + + } + +} + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html new file mode 100644 index 000000000..2d7b4caef --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -0,0 +1,43 @@ + + + + + + {{details.applicat_details[0].applicant_name}}
+ {{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) + + + + + {{details.lender_full_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.loan_amount}} + + + + + {{details.pd_date_of_initiation}}
+ {{details.city_name}}-{{details.pincode}} + + + + + {{details.pd_status}}
+ {{ (details.scheduled_on)? (details.scheduled_on | slice:0:10):(details.scheduled_on) }} + + + + + + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss new file mode 100644 index 000000000..9e293a473 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss @@ -0,0 +1,16 @@ +.ic-change:hover { + transform: scale(1.1); + color: green; +} +.cell{ + display:inline !important; +} +.cellhide{ + display: none !important; +} +.center{ + text-align:center; +} +.fontsize{ + font-size:14px; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.spec.ts new file mode 100644 index 000000000..e8d3985ba --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InprogressPdComponent } from './inprogress-pd.component'; + +describe('InprogressPdComponent', () => { + let component: InprogressPdComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ InprogressPdComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(InprogressPdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts new file mode 100644 index 000000000..fe7d6a0ea --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -0,0 +1,81 @@ +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'; + +@Component({ + selector: 'app-inprogress-pd', + templateUrl: './inprogress-pd.component.html', + styleUrls: ['./inprogress-pd.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class InprogressPdComponent implements OnInit, OnChanges { + recordStatus: boolean; + errorMessage:any[]=[]; + tabStatus:string="INPROGRESS"; + public dataLengthTab2: number; + public dataSourceTab2 = new MatTableDataSource(); + displayedColumns = ['Name','Lenderid','Address','Status','Action']; + + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; + + @Input() bindFilterValue: string; + @Output() loadPdView = new EventEmitter(); + + // data source variable details + progressPdListData:any[] = []; + + // pagination variable details + length = 50; + pageIndex = 0; + pageSize = 10; + pageEvent: PageEvent; + + constructor(private _pd: PdTrigerService) { + } + + ngOnInit() { + this.recordStatus=false; + // this.loadPDDetails(); + } + ngAfterViewInit() { + this.dataSourceTab2.paginator = this.paginator; + this.dataSourceTab2.sort = this.sort; + } + + // get changes for filter from parent componnet filter + ngOnChanges(changes: SimpleChanges) { + let filteredText = changes.bindFilterValue.currentValue; + filteredText = filteredText ? filteredText.trim() : filteredText; + filteredText = filteredText ? filteredText.toLowerCase() : filteredText; + this.dataSourceTab2.filter = filteredText; +} + +// load inprogress pd list + + loadPDDetails() { + this._pd.getTabStatusPdDetails(this.tabStatus) + .subscribe( + data => { + if (data.status == 200) { + this.progressPdListData = data.records; + this.dataLengthTab2 = data.records.length; + this.dataSourceTab2.data = this.progressPdListData; + + } + else{ + this.progressPdListData=[]; + this.dataLengthTab2 = null; + this.recordStatus=true; + } + }, error => this.errorMessage = error); + } + pageChange(e) { + console.log(e); + } + viewPD(pdid:string){ + this.loadPdView.next(pdid); + + } + +} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index 40dae5248..a10af50f0 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -1,147 +1,46 @@ - -
-
- - - + +
+
+ + + +
+
+ +
- -
- -
-
- - - + + + All - - - - - - {{details.applicat_details[0].applicant_name}}
- {{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) - - - - - {{details.lender_full_name}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
- {{details.loan_amount}} - - - - - {{details.pd_date_of_initiation}}
- {{details.city_name}}-{{details.pincode}} - - - - - Triggered
- 25/10/2018 - - - - - - - - - - - - - - - - - - + - + In Progress - - - + Scheduled - - - + + Completed - - - + + + - - - + + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts index e8587a3cc..af77052a5 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts @@ -1,8 +1,14 @@ -import { Component,ViewChild, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; +import { Component,ViewChild, OnInit, ViewEncapsulation, OnDestroy, OnChanges } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { NotifierService } from 'angular-notifier'; import { PdTrigerService } from '../../pd-service/pd-triger.service'; -import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; +import { MatPaginator, MatSort, MatTableDataSource, PageEvent, MatTabChangeEvent } from '@angular/material'; +import { AllPdComponent } from './all-pd/all-pd.component'; +import { InprogressPdComponent } from './inprogress-pd/inprogress-pd.component'; +import { ScheduledPdComponent } from './scheduled-pd/scheduled-pd.component'; +import { CompletedPdComponent } from './completed-pd/completed-pd.component'; + + @Component({ selector: 'app-list-pd', templateUrl: './list-pd.component.html', @@ -10,28 +16,24 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m encapsulation: ViewEncapsulation.None }) export class ListPdComponent implements OnInit, OnDestroy { - public dataLength: number; - public dataSource = new MatTableDataSource(); - displayedColumns = ['Name','Lenderid','Address','Status','Action']; - - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + public filterValue: string; private notifier: NotifierService; recordStatus: boolean; noRecordFound:boolean; viewPdList:boolean; viewMapPdList:boolean; errorMessage: any; - // pagination variable details - length = 50; - pageIndex = 0; - pageSize = 10; - pageEvent: PageEvent; + public allTab:boolean; + public inprogressTab:boolean = false; + public scheduledTab:boolean = false; + public completedTab:boolean = false; + public getTabIndex:number=0; + + @ViewChild(AllPdComponent) allTabC:AllPdComponent; + @ViewChild(InprogressPdComponent) inprogressTabC: InprogressPdComponent; + @ViewChild(ScheduledPdComponent) scheduledTabC:ScheduledPdComponent; + @ViewChild(CompletedPdComponent) completedTabC: CompletedPdComponent; - // data source variable details - pdListData = null; - - pdList:any[] = []; constructor( notifier: NotifierService, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { this.notifier = notifier; @@ -40,34 +42,14 @@ export class ListPdComponent implements OnInit, OnDestroy { ngOnInit() { this.viewPdList = true; this.recordStatus=false; - this.loadPDDetails(); + this.allTab=true; + } + // after view call all tabs component ngAfterViewInit() { - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; - } -//load pd details - loadPDDetails() { - this._pd.getPdDetails() - .subscribe( - data => { - if (data.status == 200) { - this.pdList = data.records; - this.pdListData = data.records; - this.dataLength = data.records.length; - this.dataSource.data = this.pdListData; - - } - else{ - this.pdList=[]; - this.dataLength = null; - this.recordStatus=true; - } - }, error => this.errorMessage = error); - } - pageChange(e) { - console.log(e); + this.allTabC.loadPDDetails(); } + // view pd list in map view viewMapPdDetails(){ this.viewPdList = !this.viewPdList; @@ -82,22 +64,24 @@ export class ListPdComponent implements OnInit, OnDestroy { } showListView(status: boolean){ this.viewPdList = status; + } pdListLoad(status: boolean){ this.viewPdList = status; - this.loadPDDetails(); + this.getTabIndex==0 ? this.allTabC.loadPDDetails() : this.getTabIndex==1 ? this.inprogressTabC.loadPDDetails() : this.getTabIndex==2 ? this.scheduledTabC.loadPDDetails() : this.completedTabC.loadPDDetails(); + } viewPDDetails(pdid:string){ this.viewPdList = !this.viewPdList; this.router.navigate([ '../pdlist/viewpd',pdid], { relativeTo: this.route }); } - //Global filter - applyFilter(filterValue: string) { - filterValue = filterValue.trim(); // Remove whitespace - filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches - this.dataSource.filter = filterValue; + //get tab changes + onTabClick(event: MatTabChangeEvent) { + this.getTabIndex=event.index; + this.getTabIndex==0 ? this.allTabC.loadPDDetails() : this.getTabIndex==1 ? this.inprogressTabC.loadPDDetails() : this.getTabIndex==2 ? this.scheduledTabC.loadPDDetails() : this.completedTabC.loadPDDetails(); } + ngOnDestroy(): void { this.viewPdList=false; } 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 new file mode 100644 index 000000000..c48316388 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -0,0 +1,44 @@ + + + + + + {{details.applicat_details[0].applicant_name}}
+ {{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) + + + + + {{details.lender_full_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.loan_amount}} + + + + + {{details.pd_date_of_initiation}}
+ {{details.city_name}}-{{details.pincode}} + + + + + {{details.pd_status}}
+ {{ (details.scheduled_on)? (details.scheduled_on | slice:0:10):(details.scheduled_on) }} + + + + + + + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss new file mode 100644 index 000000000..9e293a473 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss @@ -0,0 +1,16 @@ +.ic-change:hover { + transform: scale(1.1); + color: green; +} +.cell{ + display:inline !important; +} +.cellhide{ + display: none !important; +} +.center{ + text-align:center; +} +.fontsize{ + font-size:14px; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.spec.ts new file mode 100644 index 000000000..26d85673e --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ScheduledPdComponent } from './scheduled-pd.component'; + +describe('ScheduledPdComponent', () => { + let component: ScheduledPdComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ScheduledPdComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ScheduledPdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 000000000..52cfc20bd --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -0,0 +1,82 @@ +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'; + +@Component({ + selector: 'app-scheduled-pd', + templateUrl: './scheduled-pd.component.html', + styleUrls: ['./scheduled-pd.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class ScheduledPdComponent implements OnInit, OnChanges { + recordStatus: boolean; + errorMessage:any[]=[]; + tabStatus:string="SCHEDULED"; + public dataLengthTab3: number; + public dataSourceTab3 = new MatTableDataSource(); + displayedColumns = ['Name','Lenderid','Address','Status','Action']; + + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; + + @Input() bindFilterValue: string; + @Output() loadPdView = new EventEmitter(); + + // data source variable details + scheduledPdListData:any[] = []; + + // pagination variable details + length = 50; + pageIndex = 0; + pageSize = 10; + pageEvent: PageEvent; + + constructor(private _pd: PdTrigerService) { + } + + ngOnInit() { + this.recordStatus=false; + // this.loadPDDetails(); + } + ngAfterViewInit() { + this.dataSourceTab3.paginator = this.paginator; + this.dataSourceTab3.sort = this.sort; + } + + // get changes for filter from parent componnet filter + ngOnChanges(changes: SimpleChanges) { + let filteredText = changes.bindFilterValue.currentValue; + filteredText = filteredText ? filteredText.trim() : filteredText; + filteredText = filteredText ? filteredText.toLowerCase() : filteredText; + this.dataSourceTab3.filter = filteredText; +} + +// load inprogress pd list + + loadPDDetails() { + this._pd.getTabStatusPdDetails(this.tabStatus) + .subscribe( + data => { + if (data.status == 200) { + this.scheduledPdListData = data.records; + this.dataLengthTab3 = data.records.length; + this.dataSourceTab3.data = this.scheduledPdListData; + + } + else{ + this.scheduledPdListData=[]; + this.dataLengthTab3 = null; + this.recordStatus=true; + } + }, error => this.errorMessage = error); + } + pageChange(e) { + console.log(e); + } + viewPD(pdid:string){ + this.loadPdView.next(pdid); + + } + +} + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 59cbae1cf..5f314f0fa 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -130,10 +130,7 @@

No History

 - - - - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 5b0a2fa7b..b2b4bad22 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -28,6 +28,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { applicantPDLogsData: any=[]; viewID:string; viewParams:any; + destroyType:number=1; // @Input() childData: string; // @Output() loadParent = new EventEmitter(); public _EditPDtriggerForm:FormGroup; @@ -37,7 +38,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { } ngOnInit() { - this.ListPdComponent.pdListLoad(false); + this.ListPdComponent.showListView(false); this.route.params.subscribe(params => { this.viewID = params['pdid']; }); @@ -58,8 +59,9 @@ export class ViewPdComponent implements OnInit, OnDestroy { } loadPdListCompoent() { + this.destroyType=2; this.router.navigate([ '../../' ], { relativeTo: this.route }); - this.ListPdComponent.showListView(true); + this.ListPdComponent.pdListLoad(true); } editPdMaster(masterData:any){ @@ -137,6 +139,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { // start pd getPDStart(pdID:any){ + this.destroyType=3; this.router.navigate([ '../../../pdlist/startpd',pdID], { relativeTo: this.route }); } @@ -154,6 +157,10 @@ export class ViewPdComponent implements OnInit, OnDestroy { // this.viewPdDetails(this.childData); // } ngOnDestroy(): void { - this.ListPdComponent.showListView(true); } + if(this.destroyType==1){ + this.ListPdComponent.pdListLoad(true); + } + +} } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index 47bfcf151..0c443f258 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -35,6 +35,10 @@ import { SchedulePdComponent } from './list-pd/schedule-pd/schedule-pd.component import { EditPdApplicantComponent } from './list-pd/edit-pd-applicant/edit-pd-applicant.component'; import { EditPdMasterComponent } from './list-pd/edit-pd-master/edit-pd-master.component'; import { StartPdComponent } from './list-pd/start-pd/start-pd.component'; +import { InprogressPdComponent } from './list-pd/inprogress-pd/inprogress-pd.component'; +import { AllPdComponent } from './list-pd/all-pd/all-pd.component'; +import { ScheduledPdComponent } from './list-pd/scheduled-pd/scheduled-pd.component'; +import { CompletedPdComponent } from './list-pd/completed-pd/completed-pd.component'; /** * Custom angular notifier options */ @@ -104,7 +108,7 @@ const pdCustomNotifierOptions: NotifierOptions = { AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule, OwlNativeDateTimeModule, ], - declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent], + declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent], providers: [PdTrigerService, GetGeometricLocationService], entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent] }) diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index e33060b80..405f46144 100644 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -94,6 +94,16 @@ export class PdTrigerService { ) } + // get status based pd list + getTabStatusPdDetails(status:string): Observable { + const tabStatus = status ? + { params: new HttpParams().set('status', status) } : {}; + return this._http.get(this.apiUrl+"listLessPDDetails/get",tabStatus) + .pipe( + catchError(this.handleError('operation', [])) + ) +} + // get edit row pd details editPdDetails(editId:string):Observable{ let httpParams = new HttpParams().set('pdid', editId); @@ -177,8 +187,8 @@ export class PdTrigerService { // save pd answers savePDQuestions(saveData: any): Observable { - saveData[0].createdby = this._aws.getlocale(); - saveData[0].fk_createdon = currentdate; + saveData.createdby = this._aws.getlocale(); + saveData.fk_createdon = currentdate; // saveData[0].fk_updatedby = this._aws.getlocale(); // saveData[0].updatedon = currentdate;