From e2212df4d761a48f9eef63199d2d809da2689136 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 1 Nov 2018 14:59:45 +0530
Subject: [PATCH 1/2] 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 <bitbucket@venbainfotech.com>
Date: Thu, 1 Nov 2018 15:00:45 +0530
Subject: [PATCH 2/2] 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 @@
          
         </mat-tab>
         <mat-tab>
-          <ng-template mat-tab-label><mat-icon>done_all</mat-icon>&nbsp;QC_Completed </ng-template>
+          <ng-template mat-tab-label><mat-icon>done_all</mat-icon>&nbsp;QC Completed </ng-template>
           <app-qc-completed-pd [bindFilterValue]="filterValue" (loadPdView)="viewPDDetails($event)"></app-qc-completed-pd>