From 573814d34bb806ecc29fcc6cef1be9004ca61497 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 4 Mar 2020 18:36:11 +0530
Subject: [PATCH] Fairoj : pd list pagination issue and note label changed

---
 .../manage-pd/list-pd/all-pd/all-pd.component.html         | 2 +-
 .../manage-pd/list-pd/all-pd/all-pd.component.ts           | 2 ++
 .../list-pd/completed-pd/completed-pd.component.html       | 2 +-
 .../list-pd/completed-pd/completed-pd.component.scss       | 7 +++++++
 .../list-pd/completed-pd/completed-pd.component.ts         | 5 +++--
 .../list-pd/inprogress-pd/inprogress-pd.component.html     | 2 +-
 .../list-pd/inprogress-pd/inprogress-pd.component.scss     | 7 +++++++
 .../list-pd/inprogress-pd/inprogress-pd.component.ts       | 4 +++-
 .../list-pd/qc-completed-pd/qc-completed-pd.component.html | 2 +-
 .../list-pd/qc-completed-pd/qc-completed-pd.component.scss | 7 +++++++
 .../list-pd/qc-completed-pd/qc-completed-pd.component.ts   | 6 ++++--
 .../list-pd/scheduled-pd/scheduled-pd.component.html       | 4 ++--
 .../list-pd/scheduled-pd/scheduled-pd.component.scss       | 7 +++++++
 .../list-pd/scheduled-pd/scheduled-pd.component.ts         | 5 ++++-
 .../src/app/sales-pd/sales-pd-list/sales-pd.component.html | 2 +-
 ng6-seed/src/environments/environment.ts                   | 4 ++--
 16 files changed, 53 insertions(+), 15 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 43e1cf60b..29574a02d 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
@@ -78,7 +78,7 @@
         </mat-list>
 
     </mat-expansion-panel>
-    <p class="note" *ngIf="dataSourceTab1.data.length > 0">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
+    <p class="note" *ngIf="dataSourceTab1.data.length > 0">Showing data for last 10 days. To see older records, please use advanced filter</p>
     <mat-table [dataSource]="dataSourceTab1" matSort *ngIf="PdListData.length > 0">
 
         <ng-container matColumnDef="PDType">
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 715e0ddb6..f35bf5f59 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
@@ -202,8 +202,10 @@ export class AllPdComponent implements OnInit, OnChanges {
             this.dataSourceTab1.data = res['records'];   
             // console.log('records',res['records']);
             this.dataSourceTab1.paginator = this.paginator;
+            this.PdListData = res['records'];
             this.recordStatus=false;
         }else{
+          this.PdListData=[];
            this.notifier.notify('warning', 'No Records Found !');
            this.dataSourceTab1.paginator['length'] = 0;
            this.dataSourceTab1.paginator['pageIndex'] = 0;
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 fd6ee6e54..97afe9999 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
@@ -73,7 +73,7 @@
                   </mat-list>
                
               </mat-expansion-panel>
-              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
+              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
 
         <mat-table [dataSource]="dataSourceTab4" matSort *ngIf="completedPdListData.length > 0" >
     
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss
index dc8d754f3..9f302d5f3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss
@@ -17,3 +17,10 @@
 .toolbar-space {
     flex: 0.01 0 auto;
 }
+p.note {
+    // float: right;
+    text-align: right;
+    font-size: 12px;
+    color: grey;
+    font-weight: bold;
+}
\ No newline at end of file
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 2f9d3b525..957c04a06 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
@@ -214,12 +214,13 @@ export class CompletedPdComponent implements OnInit, OnChanges {
         
         if(res['dataStatus']==true)
         {
-            this.dataSourceTab4 = res['records'];
+            this.dataSourceTab4.data = res['records'];
             this.dataSourceTab4.paginator = this.paginator;
             this.recordStatus=false;
+            this.completedPdListData =  res['records'];
         }else{
           this.notifier.notify('warning', 'No Records Found !');
-          
+          this.completedPdListData = []
           this.dataSourceTab4.paginator['length'] = 0;
           this.dataSourceTab4.paginator['pageIndex'] = 0;
           this.dataSourceTab4.data = [];    
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 c8d1a21ab..29e5441e8 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
@@ -72,7 +72,7 @@
                   </mat-list>
                
               </mat-expansion-panel>
-              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
+              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
         <mat-table [dataSource]="dataSourceTab2" matSort *ngIf="progressPdListData.length > 0" >
             <ng-container matColumnDef="PDType">
                 <mat-cell fxFlex.xs="20" fxFlex.sm="15" fxFlex.md="13" fxFlex.lg="16" fxFlex.xl="13" class="cell" *matCellDef="let details;" style="justify-content:flex-end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss
index b500faaa5..9f302d5f3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss
@@ -16,4 +16,11 @@
 }
 .toolbar-space {
     flex: 0.01 0 auto;
+}
+p.note {
+    // float: right;
+    text-align: right;
+    font-size: 12px;
+    color: grey;
+    font-weight: bold;
 }
\ No newline at end of file
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 44b6cbb25..62f732489 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
@@ -205,10 +205,12 @@ export class InprogressPdComponent implements OnInit, OnChanges {
         this.xpandStatus = false;
         if(res['dataStatus']==true)
         {
-            this.dataSourceTab2 = res['records'];
+          this.progressPdListData = res['records'];
+            this.dataSourceTab2.data = res['records'];
             this.dataSourceTab2.paginator = this.paginator;
             this.recordStatus=false;
         }else{
+          this.progressPdListData = []
           this.notifier.notify('warning', 'No Records Found !');
           this.dataSourceTab2.paginator['length'] = 0;
            this.dataSourceTab2.paginator['pageIndex'] = 0;
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 ae6db3c34..0b06ecfc0 100755
--- 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
@@ -74,7 +74,7 @@
                   </mat-list>
                
               </mat-expansion-panel>
-              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
+              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
   <mat-table [dataSource]="dataSourceTab5" matSort *ngIf="qcCompletedPdListData.length > 0" >
         <ng-container matColumnDef="PDType">
             <mat-cell fxFlex.xs="20" fxFlex.sm="15" fxFlex.md="13" fxFlex.lg="16" fxFlex.xl="13" class="cell" *matCellDef="let details;" style="justify-content:flex-end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss
index b500faaa5..9f302d5f3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss
@@ -16,4 +16,11 @@
 }
 .toolbar-space {
     flex: 0.01 0 auto;
+}
+p.note {
+    // float: right;
+    text-align: right;
+    font-size: 12px;
+    color: grey;
+    font-weight: bold;
 }
\ No newline at end of file
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 ed11546c1..3dd230374 100755
--- 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
@@ -192,15 +192,17 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
     this._pd.overAllSearchFormDetails(this.searchForm.value).subscribe(res => {
       this.xpandStatus = false;
       if (res['dataStatus'] == true) {
-        this.dataSourceTab5 = res['records'];
+        this.dataSourceTab5.data = res['records'];
         this.dataSourceTab5.paginator = this.paginator;
         this.recordStatus = false
+        this.qcCompletedPdListData = res['records'];
       }else{
           this.notifier.notify('warning', 'No Records Found !');
           this.dataSourceTab5.paginator['length'] = 0;
           this.dataSourceTab5.paginator['pageIndex'] = 0;
           this.dataSourceTab5.data = [];     
-          this.recordStatus = true      
+          this.recordStatus = true    
+          this.qcCompletedPdListData = []  
        }
      },error => {
        this.errorMessage.push(error);
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 811be580f..5b941df0c 100755
--- 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
@@ -72,7 +72,7 @@
                   </mat-list>
                
               </mat-expansion-panel>
-              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
+              <p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
         <mat-table [dataSource]="dataSourceTab3" matSort *ngIf="scheduledPdListData.length > 0" >
                 <ng-container matColumnDef="PDType">
                     <mat-cell fxFlex.xs="20" fxFlex.sm="15" fxFlex.md="13" fxFlex.lg="16" fxFlex.xl="13" class="cell" *matCellDef="let details;" style="justify-content:flex-end">
@@ -125,7 +125,7 @@
          
     </mat-card-content>
     <div [hidden]="recordStatus">
-      <mat-paginator *ngIf="!recordStatus" #paginator class="mat-elevation-z1" [length]="scheduledPdListData.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
+      <mat-paginator  #paginator class="mat-elevation-z1" [length]="scheduledPdListData.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
       [pageSizeOptions]="[5, 10, 25,50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
     </mat-paginator>      
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss
index b500faaa5..9f302d5f3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss
@@ -16,4 +16,11 @@
 }
 .toolbar-space {
     flex: 0.01 0 auto;
+}
+p.note {
+    // float: right;
+    text-align: right;
+    font-size: 12px;
+    color: grey;
+    font-weight: bold;
 }
\ No newline at end of file
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 872c0545d..b52e413ba 100755
--- 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
@@ -205,10 +205,13 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
         this.xpandStatus = false;
         if(res['dataStatus']==true)
         {
-            this.dataSourceTab3 = res['records'];
+            this.dataSourceTab3.data = res['records'];
             this.dataSourceTab3.paginator = this.paginator;
+            console.log("paginator",this.paginator);
             this.recordStatus = false   
+            this.scheduledPdListData = res['records'];
         }else{
+            this.scheduledPdListData =[];
           this.notifier.notify('warning', 'No Records Found !');
           this.dataSourceTab3.paginator['length'] = 0;
           this.dataSourceTab3.paginator['pageIndex'] = 0;
diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
index c592ee3bf..cdfeb5e81 100644
--- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
+++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
@@ -20,7 +20,7 @@
       <!-- <ng-template mat-tab-label>Sales PD</ng-template>  -->
      
     <mat-card-content [hidden]="salesPdData.length == 0" >
-            <p class="note" *ngIf="salesPdData.length > 0">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
+            <p class="note" *ngIf="salesPdData.length > 0">Showing data for last 10 days. To see older records, please use advanced filter</p>
           <mat-table [dataSource]="dataSourceTab4" matSort *ngIf="salesPdData.length > 0" >
   
               <ng-container matColumnDef="SalesPdId">
diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts
index b1c1be5bd..15a0b0f9f 100755
--- a/ng6-seed/src/environments/environment.ts
+++ b/ng6-seed/src/environments/environment.ts
@@ -12,8 +12,8 @@ export const environment = {
 
   // apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/',
   // apiEndpoint: 'https://demo.pdgenie.com/sparqapi/api/',
-  // apiEndpoint:'https://apitest.pdgenie.com/sparqapi/api/',
-  apiEndpoint:'http://localhost/sineEdge/sparqapi/api/',
+  apiEndpoint:'https://apitest.pdgenie.com/sparqapi/api/',
+  // apiEndpoint:'http://localhost/sineEdge/sparqapi/api/',
 
   authorization: 'sparqvenba2018',