From f4f8caccfb20cd5b4380562d50444d1b12e5efb7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 17:43:04 +0530 Subject: [PATCH 1/2] pd remarks changes --- .../manage-pd/list-pd/add-pd/add-pd.component.html | 3 +++ .../manage-pd/list-pd/add-pd/add-pd.component.ts | 2 ++ .../edit-pd-applicant.component.ts | 1 + .../edit-pd-master/edit-pd-master.component.html | 14 ++++++++++++++ .../edit-pd-master/edit-pd-master.component.ts | 1 + .../smart-pd-allocation.component.ts | 2 +- 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 2685bc62a..1ce374670 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -125,6 +125,9 @@ + + + + + + @@ -134,3 +137,14 @@ + + + + + + + + + + + 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 d0017b2c0..cbce48097 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 @@ -133,6 +133,7 @@ export class EditPdMasterComponent implements OnInit { fk_city: [this.data.records.fk_city], fk_state: [this.data.records.fk_state],   pincode : [this.data.records.pincode], + remarks: [this.data.records.remarks], }); if(this.data.records.fk_lender_id && this.data.records.fk_product_id && this.data.records.fk_subproduct_id && this.data.records.fk_pd_type && this.data.records.fk_customer_segment && this.data.records.loan_amount && this.data.records.addressline1 && this.data.records.fk_city && this.data.records.fk_state && this.data.records.pincode){ this.enablePDButton=true; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts index aaa50062e..2f5f0a433 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts @@ -98,7 +98,7 @@ export class SmartPdAllocationComponent implements OnInit { let updateData = { "pd_id":this.data.pd_id, "fk_pd_allocated_to":pdOfficer.fk_user_id, - "excutive_id":excutiveOfficer.fk_user_id, + "executive_id":excutiveOfficer.fk_user_id, } this._pd.updatePdOfficer(updateData).subscribe( result => { From 4c3e27f01e55efd57535db372ebdfc5994c0a4e6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 17:44:03 +0530 Subject: [PATCH 2/2] merge : kms --- .../list-pd/all-pd/all-pd.component.html | 27 +++----- .../map-pd-view/map-pd-view.component.html | 61 +++++++++++-------- .../map-pd-view/map-pd-view.component.ts | 4 ++ .../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 +- 8 files changed, 57 insertions(+), 52 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/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 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 +