From 70979ce716f50a1e81e46d06e92bf89653952127 Mon Sep 17 00:00:00 2001
From: sriram-at-840620226347 <bitbucket@venbainfotech.com>
Date: Sat, 27 Jun 2020 13:07:00 +0530
Subject: [PATCH] vendor status update

---
 .../manage-pd/list-pd/all-pd/all-pd.component.html | 10 ++++++----
 .../completed-pd/completed-pd.component.html       |  7 ++++---
 .../inprogress-pd/inprogress-pd.component.html     |  7 ++++---
 .../qc-completed-pd/qc-completed-pd.component.html |  7 ++++---
 .../scheduled-pd/scheduled-pd.component.html       |  7 ++++---
 .../list-pd/view-pd/view-pd.component.html         | 14 ++++++++++----
 6 files changed, 32 insertions(+), 20 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 a8ab988db..1a1c08240 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
@@ -121,18 +121,20 @@
         </ng-container>
         <ng-container matColumnDef="Status">
             <mat-cell class="cell center" *matCellDef="let details;">
-                <span *ngIf="details.pd_status!='QC_COMPLETED'"> {{details.pd_status}}</span>
-                <span *ngIf="details.pd_status=='QC_COMPLETED'"> QC COMPLETED</span>
+                <span *ngIf="details.pd_status!='QC_COMPLETED'" matTooltip="PD Status" matTooltipPosition="above"> {{details.pd_status}}</span>
+                <span *ngIf="details.pd_status=='QC_COMPLETED'" matTooltip="PD Status" matTooltipPosition="above"> 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><br>
+                <span *ngIf="details.fk_pd_type == '2'" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</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>
-        </ng-container>
+        </ng-container> 
         <ng-container matColumnDef="Action">
             <mat-cell class="cell center" *matCellDef="let details;">
                     <a style="float: left" [style.visibility]="details.pd_status=='INITIATED' && details.encrypted_url!=null && details.encrypted_url!='' ? 'visible' : 'hidden'" [attr.href]="details.encrypted_url" target="_blank">
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 25f4c31b2..984816466 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
@@ -111,11 +111,12 @@
               </ng-container>
               <ng-container matColumnDef="Status">
                   <mat-cell  class="cell center" *matCellDef="let details;"> 
-                      <span> {{details.pd_status}}</span><br>
+                      <span matTooltip="PD Status" matTooltipPosition="above"> {{details.pd_status}}</span><br>
                       <span class="fontsize" [matTooltip]="details.pd_status | titlecase" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
-                    </span> 
+                    </span> <br>
+                    <span *ngIf="details.fk_pd_type == '2'" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
                   </mat-cell>
-             </ng-container>
+             </ng-container> 
               <ng-container matColumnDef="Action">
                    <mat-cell class="cell center" *matCellDef="let details;">
                       <!-- <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id)"  -->
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 886760bc7..b7b839ac9 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
@@ -108,11 +108,12 @@
               </ng-container>
               <ng-container matColumnDef="Status">
                   <mat-cell  class="cell center" *matCellDef="let details;"> 
-                      <span> {{details.pd_status}}</span><br>
+                      <span matTooltip="PD Status" matTooltipPosition="above"> {{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>  
+                    </span>  <br>
+                    <span *ngIf="details.fk_pd_type == '2'" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
                   </mat-cell>
-             </ng-container>
+             </ng-container> 
               <ng-container matColumnDef="Action">
                    <mat-cell class="cell center" *matCellDef="let details;">
                         <!-- <button *ngIf="details.fk_pd_type == '3'"
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 9b76581d7..b109eb637 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
@@ -110,11 +110,12 @@
         </ng-container>
         <ng-container matColumnDef="Status">
             <mat-cell  class="cell center" *matCellDef="let details;"> 
-                <span > QC COMPLETED</span><br>
+                <span matTooltip="PD Status" matTooltipPosition="above"> QC COMPLETED</span><br>
                 <span class="fontsize" matTooltip="QC Completed" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
-                </span> 
+                </span> <br>
+                <span *ngIf="details.fk_pd_type == '2'" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
             </mat-cell>
-       </ng-container>
+       </ng-container> 
         <ng-container matColumnDef="Action">
              <mat-cell class="cell center" *matCellDef="let details;">
                 <!-- <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button> -->
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 35c5c88e1..1698efbc3 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
@@ -108,14 +108,15 @@
               </ng-container>
               <ng-container matColumnDef="Status">
                   <mat-cell  class="cell center" *matCellDef="let details;"> 
-                      <span> {{details.pd_status}}</span><br>
+                      <span matTooltip="PD Status" matTooltipPosition="above"> {{details.pd_status}}</span><br>
                       <!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
                         </span>  -->
                         <span class="fontsize">{{details.scheduled_on}}
-                            </span>
+                            </span><br>
+                            <span *ngIf="details.fk_pd_type == '2'" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
                         
                   </mat-cell>
-             </ng-container>
+             </ng-container> 
               <ng-container matColumnDef="Action">
                    <mat-cell class="cell center" *matCellDef="let details;">
                         <!-- <button *ngIf="details.fk_pd_type == '3'"
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 2aeefe05a..306e7754d 100755
--- 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
@@ -156,9 +156,13 @@
                       <mat-icon>videocam</mat-icon>&nbsp;
                       <strong>Call</strong>
                     </button>
-                  <button mat-raised-button class="mr-1 mb-1"  color="primary" style="cursor: not-allowed !important;">
+                    <button *ngIf="master.fk_pd_type == '2'" mat-raised-button class="mr-1 mb-1" color="primary" matTooltip="Vendor Status" matTooltipPosition="above" style="cursor: not-allowed !important;background-color: #f44336ba !important;">
+                      <strong> {{master.vendor_status}}</strong>
+                    </button>
+                  <button mat-raised-button class="mr-1 mb-1"  color="primary" matTooltip="PD Status" matTooltipPosition="above" style="cursor: not-allowed !important;">
                 <strong> {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}</strong>
               </button>
+                  
                         <span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)" matTooltipPosition="above" matTooltip="Edit PD Master"><mat-icon>edit</mat-icon></button>
                                                                           <button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master)"><mat-icon>flash_on</mat-icon></button>
                         </span>                             
@@ -184,7 +188,8 @@
                                 <div fxLayout="row nowrap">
                                   <div fxFlex="100">
                                 <div fxFlex="40" align="left" style="color: #e00201">
-                                        {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}} 
+                                        <span matTooltip="PD Status" matTooltipPosition="above">{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}</span> <br>
+                                        <span *ngIf="master.fk_pd_type == '2'" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{master.vendor_status}} )</span>
                                 </div>
                                 <div fxFlex="60" align="right">
                                   <span><button *ngIf="roleAccessDetails.trigger && addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span>
@@ -226,7 +231,8 @@
                            <div *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length>0">
                               <div fxLayout="row nowrap">
                                   <div fxFlex="40" align="left" style="color: #e00201">
-                                          {{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}} 
+                                          <span matTooltip="PD Status" matTooltipPosition="above">{{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}}</span> <br>
+                                          <span *ngIf="master.fk_pd_type == '2'" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{master.vendor_status}} )</span>
                                   </div>
                                   <div fxFlex="60" align="right">
                                       <span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.COMPLETED && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.ADD_ON_PENDING && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
@@ -237,7 +243,7 @@
                               <div fxLayout="row nowrap">
                                   <div fxFlex="40" align="left" style="color: #e00201">
                                       <div *ngIf="addresses.addtional_pd_data[0].pd_allocated_to && addresses.addtional_pd_data[0].fk_pd_type==1">
-                                        {{addresses.addtional_pd_data[0].pd_allocated_to | titlecase}}                                      
+                                        {{addresses.addtional_pd_data[0].pd_allocated_to | titlecase}}                                   
                                   </div>
                                   <div *ngIf="addresses.addtional_pd_data[0].executive_name && addresses.addtional_pd_data[0].centralofficer && addresses.addtional_pd_data[0].fk_pd_type==2">
                                       {{addresses.addtional_pd_data[0].executive_name | titlecase}}