From 4eac9889542406a1662dee689d2a8a571181ca3f Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 1 Nov 2018 11:45:18 +0530 Subject: [PATCH 1/5] Notifier UI --- .../list-pd/edit-pd-applicant/edit-pd-applicant.component.ts | 2 +- .../list-pd/edit-pd-master/edit-pd-master.component.ts | 2 +- .../manage-pd/list-pd/list-pd.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index c40b7d2cf..5e8e55e37 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -127,7 +127,7 @@ export class EditPdApplicantComponent implements OnInit { this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'Applicants updated..'); + this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close(); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 38a4ed5d8..d0017b2c0 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -179,7 +179,7 @@ export class EditPdMasterComponent implements OnInit { Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); this._pd.editPdMasterDetails(my_array, updateStatus).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'PD Master Updated.'); + this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close(); } else { 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 405e0fb14..c3d34c300 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 @@ -34,7 +34,7 @@ - done_all QC_Completed + done_all QC Completed From e2212df4d761a48f9eef63199d2d809da2689136 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 14:59:45 +0530 Subject: [PATCH 2/5] date time picker issues changes --- ng6-seed/package.json | 2 +- .../src/app/personal-discussion/manage-pd/manage-pd.module.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 388efbf41..e375efb12 100644 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -45,7 +45,7 @@ "karma-jasmine": "^1.1.1", "leaflet": "^1.0.2", "moment": "^2.15.0", - "ng-pick-datetime": "^5.2.6", + "ng-pick-datetime": "^6.0.16", "ng2-charts": "1.6.0", "ng2-dragula": "1.3.1", "ng2-file-upload": "1.2.1", 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 1ecb91ae6..a43a376a3 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 @@ -19,6 +19,8 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import 'hammerjs'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime'; + import { AgmCoreModule } from '@agm/core'; import { ManagePdRoutingModule } from './manage-pd.routing'; import { ListPdComponent } from './list-pd/list-pd.component'; @@ -30,7 +32,6 @@ import { PdAllocationComponent } from '../manage-pd/list-pd/pd-allocation/pd-all import { SmartPdAllocationComponent } from './list-pd/smart-pd-allocation/smart-pd-allocation.component'; import { PdTrigerService } from '../pd-service/pd-triger.service'; import { GetGeometricLocationService } from '../location-service/get-geometric-location.service'; -import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime'; 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'; From 6eb3de5a6285458be2faf91561d7d4bcd9815b21 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 15:00:45 +0530 Subject: [PATCH 3/5] merge : kms --- .../list-pd/edit-pd-applicant/edit-pd-applicant.component.ts | 2 +- .../list-pd/edit-pd-master/edit-pd-master.component.ts | 2 +- .../manage-pd/list-pd/list-pd.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index c40b7d2cf..5e8e55e37 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -127,7 +127,7 @@ export class EditPdApplicantComponent implements OnInit { this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'Applicants updated..'); + this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close(); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 38a4ed5d8..d0017b2c0 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -179,7 +179,7 @@ export class EditPdMasterComponent implements OnInit { Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); this._pd.editPdMasterDetails(my_array, updateStatus).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'PD Master Updated.'); + this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close(); } else { 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 405e0fb14..c3d34c300 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 @@ -34,7 +34,7 @@ - done_all QC_Completed + done_all QC Completed From 647fb7f25dea9242364e01bc628f3c6a05cd2e4d Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 1 Nov 2018 15:43:12 +0530 Subject: [PATCH 4/5] Map Pd Card --- .../map-pd-view/map-pd-view.component.html | 61 +++++++++++-------- .../map-pd-view/map-pd-view.component.ts | 4 ++ 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index 30d6932eb..6db4829c2 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -10,43 +10,51 @@
- +
+
- PD Details + PD Details
- +
+
+ + - -
-
- {{details.applicat_details[0].applicant_name}}
- {{details.lender_full_name}}({{details.lender_applicant_id}})
-
-
- - -
-
- - - -  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
- {{details.customer_segment_abbr}} {{details.loan_amount}}
- {{details.pd_date_of_initiation}}
- {{details.pd_status}} - {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - - - + +
+
+ {{details.applicat_details[0].applicant_name}} ({{details.customer_segment_abbr}})
+ {{details.lender_full_name}} ({{details.lender_applicant_id}})
+
+
+ + +
+
+ + + +  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
+ + {{details.pd_date_of_initiation}} - + {{details.pd_status}} + + + +
+ +
+

No Record Found ...

@@ -70,6 +78,9 @@
+
+ II Full   II Smart +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts index 42fd05aae..226c149a2 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts @@ -46,7 +46,11 @@ pdList:any[] = []; "COMPLETED" :'COMPLETED', "QC_COMPLETED" :'QC_COMPLETED', }; + public getColor(type: number): string{ + return type == 1 ? "#009688" : "#673ab7" ; + } + constructor(notifier:NotifierService,private route: ActivatedRoute, private router: Router,private _pd: PdTrigerService,private dialog: MatDialog,private _geolocation: GetGeometricLocationService, private ListPdComponent : ListPdComponent) { this.notifier=notifier From 892728d4b99d93a13ef4685d288eedba942bb14f Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 1 Nov 2018 16:16:47 +0530 Subject: [PATCH 5/5] QC Completed UI --- .../list-pd/all-pd/all-pd.component.html | 27 ++++++------------- .../qc-completed-pd.component.html | 4 +-- .../list-pd/start-pd/start-pd.component.html | 2 +- .../list-pd/view-pd/view-pd.component.html | 4 +-- .../qc-list/qc-start/qc-start.component.html | 2 +- .../qc-list/qc-view/qc-view.component.html | 5 ++-- 6 files changed, 17 insertions(+), 27 deletions(-) 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 07380fb50..36f9c405b 100644 --- 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 @@ -3,23 +3,9 @@ - - - - - - - - - - + @@ -43,9 +29,12 @@ - {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + {{details.pd_status}} + QC COMPLETED
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{details.scheduled_on}} 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 79ccd28ad..db5b97a42 100644 --- 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 @@ -29,8 +29,8 @@ - {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + QC COMPLETED
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 17ac0ee26..86135e42d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -2,7 +2,7 @@ - + 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 5c135271d..0d66e14f8 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 @@ -19,8 +19,8 @@ person{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} - + {{master.pd_status | titlecase}} + QC Completed diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html index b9e6c908d..7ea892711 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html @@ -2,7 +2,7 @@ - + diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 14f062c2e..90c7bd59b 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -14,8 +14,9 @@
{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} - + {{master.pd_status | titlecase}} + QC Completed +