From 52071781bef471c8641669d67f8ecd4dda9842dc Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Tue, 30 Oct 2018 18:29:26 +0530 Subject: [PATCH 1/5] PD allocation UI --- .../pd-allocation.component.html | 4 +-- .../smart-pd-allocation.component.html | 29 ++++++++++++++----- .../smart-pd-allocation.component.ts | 4 +-- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html index a88b4ed9b..b9fdd3ed1 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html @@ -17,7 +17,7 @@ - No Image
+ No Image
{{officer.first_name}}
{{officer.mobile_no}} @@ -30,7 +30,7 @@ -

PD officer not available..

+

No PD officer available.

 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html index fd592dd3a..8177ae026 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html @@ -31,7 +31,7 @@ - No Image
+ No Image
{{officer.first_name}}
{{officer.mobile_no}} @@ -39,12 +39,10 @@ - - - + -

PD officer not available..

+

No executive available.

 @@ -63,7 +61,22 @@ - +
+
+
+ + + + No Image
+ {{excutive.first_name}} +
+ {{excutive.mobile_no}} + + +
+
+
+ -

Excutive officer not available..

+

No central officer available.

 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 42e465e4b..aaa50062e 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 @@ -11,8 +11,8 @@ import { PdTrigerService } from '../../../pd-service/pd-triger.service'; }) export class SmartPdAllocationComponent implements OnInit { - public pageTitle: string = "Allocate To PD Officer"; - public pageTitle2: string = "Allocate To Excutive Officer"; + public pageTitle: string = "Allocate To Executive"; + public pageTitle2: string = "Allocate To Central Officer"; public _pdAllocationForm: FormGroup; public pdOfficerList: any = []; public pdExcutiveList: any = []; From 529bb52e73486ca1aa0c32ff1ff2af553d576ca7 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 30 Oct 2018 18:43:48 +0530 Subject: [PATCH 2/5] Tooltip Added PD LISTING screens : ps --- .../manage-pd/list-pd/all-pd/all-pd.component.html | 7 ++++--- .../manage-pd/list-pd/all-pd/all-pd.component.ts | 5 +++++ .../list-pd/completed-pd/completed-pd.component.html | 7 ++++--- .../list-pd/completed-pd/completed-pd.component.ts | 5 +++++ .../list-pd/inprogress-pd/inprogress-pd.component.html | 6 +++--- .../list-pd/inprogress-pd/inprogress-pd.component.ts | 4 ++++ .../qc-completed-pd/qc-completed-pd.component.html | 8 ++++---- .../list-pd/qc-completed-pd/qc-completed-pd.component.ts | 4 ++++ .../list-pd/scheduled-pd/scheduled-pd.component.html | 6 +++--- .../list-pd/scheduled-pd/scheduled-pd.component.ts | 5 +++++ ng6-seed/src/app/shared/menu-items/menu-items.ts | 2 +- 11 files changed, 42 insertions(+), 17 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 8d1e89490..bee3ad1c6 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 @@ -16,20 +16,21 @@ - {{details.pd_date_of_initiation}}
+ {{details.pd_date_of_initiation}}
{{details.city_name}}-{{details.pincode}} {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + 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 5734107ca..119655690 100644 --- 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 @@ -82,4 +82,9 @@ export class AllPdComponent implements OnInit, OnChanges { } + titleCaseWord(word:string) { + if (!word) return word; + return word[0].toUpperCase() + word.substr(1).toLowerCase(); + } + } 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 36caac99b..4fe4b3d2f 100644 --- 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 @@ -16,20 +16,21 @@ - {{details.pd_date_of_initiation}}
+ {{details.pd_date_of_initiation}}
{{details.city_name}}-{{details.pincode}} {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + 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 baca0e5f1..c798070d3 100644 --- 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 @@ -80,6 +80,11 @@ export class CompletedPdComponent implements OnInit, OnChanges { } + titleCaseWord(word:string) { + if (!word) return word; + return word[0].toUpperCase() + word.substr(1).toLowerCase(); + } + } 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 051fc9970..2d8717a78 100644 --- 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 @@ -16,20 +16,20 @@ - {{details.pd_date_of_initiation}}
+ {{details.pd_date_of_initiation}}
{{details.city_name}}-{{details.pincode}} {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + 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 fe7d6a0ea..af3a5df20 100644 --- 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 @@ -77,5 +77,9 @@ export class InprogressPdComponent implements OnInit, OnChanges { this.loadPdView.next(pdid); } + titleCaseWord(word:string) { + if (!word) return word; + return word[0].toUpperCase() + word.substr(1).toLowerCase(); + } } 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 4c559e935..8b1d38166 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 @@ -16,20 +16,20 @@ - {{details.pd_date_of_initiation}}
+ {{details.pd_date_of_initiation}}
{{details.city_name}}-{{details.pincode}} - {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{details.pd_status}}
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + 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 f3cacd962..cec61a7ba 100644 --- 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 @@ -79,6 +79,10 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { this.loadPdView.next(pdid); } + titleCaseWord(word:string) { + if (!word) return word; + return word[0].toUpperCase() + word.substr(1).toLowerCase(); + } } 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 0c06383c7..495982bdd 100644 --- 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 @@ -16,20 +16,20 @@ - {{details.pd_date_of_initiation}}
+ {{details.pd_date_of_initiation}}
{{details.city_name}}-{{details.pincode}} {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + 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 52cfc20bd..3e6ba6097 100644 --- 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 @@ -77,6 +77,11 @@ export class ScheduledPdComponent implements OnInit, OnChanges { this.loadPdView.next(pdid); } + titleCaseWord(word:string) { + if (!word) return word; + return word[0].toUpperCase() + word.substr(1).toLowerCase(); + } + } diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index 1fecab764..68d1ebb84 100644 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -85,7 +85,7 @@ const MENUITEMS : Menu[] = [ state:'quality_check_discussion', name:'Quality Check', type:'link', - icon:'forum', + icon:'done_all', } ]; From c4f927cc6ae384e2ee6dca6bd15fc658129a8aed Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Tue, 30 Oct 2018 18:56:14 +0530 Subject: [PATCH 3/5] PD allocation UI --- .../list-pd/pd-allocation/pd-allocation.component.html | 5 +++-- .../smart-pd-allocation.component.html | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html index b9fdd3ed1..09b7d660a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html @@ -18,9 +18,10 @@ No Image
- {{officer.first_name}} + {{officer.first_name}}
- {{officer.mobile_no}} + {{officer.mobile_no}}
+ PD in hand - {{officer.count}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html index 8177ae026..7e88d465b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html @@ -32,9 +32,10 @@ No Image
- {{officer.first_name}} + {{officer.first_name}}
- {{officer.mobile_no}} + {{officer.mobile_no}} + PD in hand - {{officer.count}} @@ -68,9 +69,10 @@ No Image
- {{excutive.first_name}} + {{excutive.first_name}}
- {{excutive.mobile_no}} + {{excutive.mobile_no}}
+ PD in hand - {{excutive.count}} From 3a63f2ba4de5929211b8f0178795d87ae074bf28 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 30 Oct 2018 19:08:45 +0530 Subject: [PATCH 4/5] Unwanted Alert removed in Pd team : ps --- .../app/settings/pd-team/pd-team-add/pd-team-add.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts index 6dd8f6ff4..b4e93019b 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts @@ -221,7 +221,7 @@ onChangeEntityId($event){ if(this._pdTeamForm.value['fk_city'] != null){ this.f.fk_city.setValue(null); - alert(this._pdTeamForm.value['fk_city']); + //alert(this._pdTeamForm.value['fk_city']); } if($event.isUserInput != false){ From d0eab1030bbd496efa69a275ecc67f72ff2121d6 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 30 Oct 2018 19:12:17 +0530 Subject: [PATCH 5/5] Unwanted Alert Removed in PD Team: ps --- .../settings/pd-team/pd-team-edit/pd-team-edit.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts index f6c2cc7d5..ed79490e0 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts @@ -411,11 +411,11 @@ export class PdTeamEditComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ Swal("Data Edited Successfully"); - this.notifier.notify('success', 'Record Edited Successfully.!'); + // this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ Swal("SomeThing Wents Wrong Try Again !"); - this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); + // this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } });