From 892728d4b99d93a13ef4685d288eedba942bb14f Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Thu, 1 Nov 2018 16:16:47 +0530
Subject: [PATCH] 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 @@
              
             <ng-container matColumnDef="PDType">
                     <mat-cell fxFlex="10" class="cell" style="padding-top:2.5% !important;" *matCellDef="let details;"> 
-                    
-                   
-                      <!-- <button *ngIf="details.fk_pd_type == '1'"  mat-icon-button class="hover-icon pd_circle"  matTooltip="Full PD" 
-                      matTooltipPosition="above"><strong>F</strong></button> -->
-                      <!-- <button *ngIf="details.fk_pd_type != null" [matTooltip]="details.fk_pd_type == '1' ? 'Full PD' : details.fk_pd_type == '2' ? 'Smart PD' : details.fk_pd_type == '3' ? 'Tele PD' : '' "  mat-button mat-icon-button class="mr-1 mb-1 hover-icon pd_circle" type="button" 
-                      matTooltipPosition="above"><strong>{{(details.pd_type_name | slice:0:1)}}</strong></button> -->
-                      <button *ngIf="details.fk_pd_type != null" [matTooltip]="details.pd_type_name"  mat-button mat-icon-button class="mr-1 mb-1 hover-icon pd_circle" type="button" 
+                     <button *ngIf="details.fk_pd_type != null" [matTooltip]="details.pd_type_name"  mat-button mat-icon-button class="mr-1 mb-1 hover-icon pd_circle" type="button" 
                       matTooltipPosition="above"><strong>{{(details.pd_type_name | slice:0:1)}}</strong></button>
-                      <!-- <button *ngIf="details.fk_pd_type == '3'" mat-button mat-icon-button class="mr-1 mb-1 hover-icon pd_circle" type="button"  matTooltip="Tele PD" 
-                      matTooltipPosition="above"><strong>T</strong></button> -->
-
-                      <!-- <strong *ngIf="details.fk_pd_type == '2'" class="pd_circle" >S</strong>
-                      <strong *ngIf="details.fk_pd_type == '3'" class="pd_circle" >T</strong> -->
-                      <!-- <mat-icon color="primary" [matTooltip]="details.fk_pd_type == '1' ? 'Full PD' : details.fk_pd_type == '2' ? 'Smart PD' : 'Tele PD' " 
-                            matTooltipPosition="above" class="mr-1 mb-1">control_camera</mat-icon>
-                             -->
-                    
+                   
                 </mat-cell>
             </ng-container>
             <ng-container matColumnDef="Name">
@@ -43,9 +29,12 @@
               </ng-container>
               <ng-container matColumnDef="Status">
                   <mat-cell  class="cell center" *matCellDef="let details;"> 
-                    <span> {{details.pd_status}}</span><br>
-                    <span class="fontsize" *ngIf="details.pd_status!='SCHEDULED'"  [matTooltip]="details.pd_status | titlecase"  matTooltipPosition="above" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
-                    </span> 
+                    <span *ngIf="details.pd_status!='QC_COMPLETED'"> {{details.pd_status}}</span>
+                    <span *ngIf="details.pd_status=='QC_COMPLETED'"> QC COMPLETED</span><br>
+                    <span class="fontsize" *ngIf="details.pd_status!='SCHEDULED' &&  details.pd_status!='QC_COMPLETED'"  [matTooltip]="details.pd_status | titlecase"  matTooltipPosition="above" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
+                    </span>
+                    <span class="fontsize" *ngIf="details.pd_status=='QC_COMPLETED'"  matTooltip="QC Completed"  matTooltipPosition="above" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
+                    </span>  
                     <span class="fontsize" *ngIf="details.pd_status=='SCHEDULED'"  [matTooltip]="details.pd_status | titlecase"  matTooltipPosition="above" >{{details.scheduled_on}}
                         </span>
                   </mat-cell>
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 @@
         </ng-container>
         <ng-container matColumnDef="Status">
             <mat-cell  class="cell center" *matCellDef="let details;"> 
-                <span > {{details.pd_status}}</span><br>
-                <span class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
+                <span > QC COMPLETED</span><br>
+                <span class="fontsize" matTooltip="QC Completed" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
                 </span> 
             </mat-cell>
        </ng-container>
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 @@
     <mat-card-content>
         <mat-sidenav-container class="app-inner background-none shadow-none mail-db">
             <mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs">
-                  <button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.INPROGRESS || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.INPROGRESS ? 'COMPLETE':currentPDStatus }}</span></button>
+                  <button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.INPROGRESS || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.INPROGRESS ? 'COMPLETE':(currentPDStatus==pdStatusCheck.QC_COMPLETED ? 'QC COMPLETED' : currentPDStatus ) }}</span></button>
  
                   <!-- {{ (currentPDStatus==pdStatusCheck.INPROGRESS)? 'COMPLETE':(currentPDStatus) }} -->
                           <mat-expansion-panel *ngFor="let category of categoryList;let catIndex = index; ">
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 @@
                   <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left"><mat-icon color="primary" class="hover-icon" matTooltip="PD Officer" 
                     matTooltipPosition="above">person</mat-icon>{{master.pd_allocated_to | titlecase}}</span> &nbsp;&nbsp;
                   <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}} &nbsp;On&nbsp;{{master.scheduled_on}}</span>
-                  <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}}</span>
-
+                  <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">{{master.pd_status | titlecase}}</span>
+                  <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">QC Completed</span>
                 </div>
         
                </div>  
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 @@
         <mat-card-content>
             <mat-sidenav-container class="app-inner background-none shadow-none mail-db">
                 <mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs">
-                      <button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.COMPLETED || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.QC_COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.COMPLETED ? 'QC OK':currentPDStatus }}</span></button>
+                      <button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.COMPLETED || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.QC_COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.COMPLETED ? 'QC OK':(currentPDStatus==pdStatusCheck.QC_COMPLETED ? 'QC COMPLETED' : currentPDStatus )}}</span></button>
     
                               <mat-expansion-panel *ngFor="let category of categoryList;let catIndex = index; ">
                                   <mat-expansion-panel-header>
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 @@
                <br>      
                   <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left">{{master.pd_allocated_to | titlecase}}</span> &nbsp;&nbsp;
                   <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}} &nbsp;On&nbsp;{{master.scheduled_on}}</span>
-                  <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}}</span>
-             </div>
+                  <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">{{master.pd_status | titlecase}}</span>
+                  <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">QC Completed</span>
+               </div>
      
             </div>  
    <mat-card-content>