diff --git a/ng6-seed/Sparq-Lender Test(13-05-2021)Web.zip b/ng6-seed/Sparq-Lender Test(13-05-2021)Web.zip new file mode 100644 index 0000000..6a702c4 Binary files /dev/null and b/ng6-seed/Sparq-Lender Test(13-05-2021)Web.zip differ 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 index f1c2a95..32b2c4a 100755 --- 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 @@ -32,6 +32,12 @@ + + + PD Trigger Date + PD Completed Date + + {{pro.name}} 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 index 40a62da..7d2d708 100755 --- 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 @@ -1,7 +1,7 @@ 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 { FormGroup, FormBuilder } from '@angular/forms'; +import { FormGroup, FormBuilder ,FormsModule} from '@angular/forms'; import { DatePipe } from '@angular/common'; import { NotifierService } from 'angular-notifier'; import { AwsService } from 'app/AwsService/aws.service'; @@ -30,6 +30,7 @@ export class AllPdComponent implements OnInit, OnChanges { recordStatus: boolean; errorMessage:any[]=[]; tabStatus:string="ALL"; + public modeselect = '1'; public dataLengthTab1: number; public dataSourceTab1 = new MatTableDataSource(); displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @@ -43,7 +44,7 @@ export class AllPdComponent implements OnInit, OnChanges { // data source variable details PdListData:any[] = []; - + // pagination variable details length = 0; pageIndex = 0; @@ -58,6 +59,7 @@ export class AllPdComponent implements OnInit, OnChanges { startIndex: number; endIndex: any; filtered_raw_data: any[]; + constructor(private _pd: PdTrigerService,private _fb:FormBuilder,notifier: NotifierService,private userService:UserService, private _aws:AwsService,private loaderService:LoaderService) { this.LenderRoleID = localStorage.getItem('LenderRoleID'); @@ -69,6 +71,7 @@ export class AllPdComponent implements OnInit, OnChanges { pd_status:[null], pd_from_date:[null], pd_to_date:[null], + date_type:[null], pd_city:[null], pd_products:[null], pd_lender:[null], @@ -95,6 +98,7 @@ export class AllPdComponent implements OnInit, OnChanges { } ngOnInit() { + this.userService.getroles().subscribe(res=>{ let len_id=res['records'][0].fk_entity_id this.searchForm.controls['pd_lender'].setValue(len_id) @@ -287,7 +291,8 @@ console.log(this.displayedColumns) searchItem() { - + + if(this.searchForm.value.pd_type !=null) { 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 index 4793434..4c3f68e 100755 --- 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 @@ -34,6 +34,12 @@ + + + PD Trigger Date + PD Completed Date + + {{pro.name}} 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 index 5c6293a..39cbac4 100755 --- 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 @@ -10,7 +10,7 @@ import { LoaderService } from 'app/shared/loaderService/loader.service'; import { ReplaySubject } from 'rxjs'; @Component({ - selector: 'app-completed-pd', + selector: 'app-completed-pd', templateUrl: './completed-pd.component.html', styleUrls: ['./completed-pd.component.scss'], encapsulation: ViewEncapsulation.None @@ -29,6 +29,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { private notifier: NotifierService; recordStatus: boolean; errorMessage:any[]=[]; + public modeselect = '1'; tabStatus:string="COMPLETED"; public dataLengthTab4: number; public dataSourceTab4 = new MatTableDataSource(); @@ -68,6 +69,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { pd_status:['COMPLETED'], pd_from_date:[null], pd_to_date:[null], + date_type:[null], pd_city:[null], pd_products:[null], pd_lender:[null], 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 index 7c564e7..642d144 100755 --- 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 @@ -9,7 +9,7 @@ Advance Filter - +
@@ -33,6 +33,12 @@ + + + PD Trigger Date + PD Completed Date + + {{pro.name}} 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 index 2c67ae6..eb55f42 100755 --- 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 @@ -13,7 +13,7 @@ import { ReplaySubject } from 'rxjs'; selector: 'app-inprogress-pd', templateUrl: './inprogress-pd.component.html', styleUrls: ['./inprogress-pd.component.scss'], - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None }) export class InprogressPdComponent implements OnInit, OnChanges { xpandStatus: boolean = false; @@ -25,6 +25,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { recordStatus: boolean; errorMessage:any[]=[]; tabStatus:string="INPROGRESS"; + public modeselect = '1'; pipe = new DatePipe('en-US'); todaydate:Date = new Date(); private notifier: NotifierService; @@ -66,6 +67,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { pd_status:['INPROGRESS'], pd_from_date:[null], pd_to_date:[null], + date_type:[null], pd_city:[null], pd_products:[null], pd_lender:[null], @@ -243,7 +245,7 @@ public LenderRoleID : string = localStorage.getItem('LenderRoleID'); } searchItem() { - +console.log(this.searchForm.value); if(this.searchForm.value.pd_type !=null) {