From f8b70a9ba10c7222dafd0ced54ab1031828ec4a3 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Tue, 30 Oct 2018 19:27:41 +0530
Subject: [PATCH] pd changes

---
 .../list-pd/schedule-pd/schedule-pd.component.ts   |  2 +-
 .../scheduled-pd/scheduled-pd.component.html       |  7 +++++--
 .../list-pd/view-pd/view-pd.component.html         | 14 +++++++++-----
 .../qc-list/qc-view/qc-view.component.html         |  9 ++++++---
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts
index 3b66706a0..8bc7c87b7 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts
@@ -72,7 +72,7 @@ export class SchedulePdComponent implements OnInit {
   // update pd schedule
    
   upatePDSchedule(date:any){
-    let  myFormattedDate = this.pipe.transform(date, 'yyyy-MM-dd h:mm a');
+    let  myFormattedDate = this.pipe.transform(date, 'yyyy-MM-dd HH:mm');
 
       let updateData =  {
         "fk_pd_id":this.data.pd_id,
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..7c7ba2623 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
@@ -23,8 +23,11 @@
               <ng-container matColumnDef="Status">
                   <mat-cell  class="cell center" *matCellDef="let details;"> 
                       <span> {{details.pd_status}}</span><br>
-                      <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
-                        </span> 
+                      <!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
+                        </span>  -->
+                        <span class="fontsize">{{details.scheduled_on}}
+                            </span>
+                        
                   </mat-cell>
              </ng-container>
               <ng-container matColumnDef="Action">
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 c59bea6ae..e0b39ddce 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
@@ -2,16 +2,21 @@
        <mat-card-content>
         <div class="mb-2" > 
           <div fxLayout="row"  fxLayoutAlign="start center" class="filter-header">
-              <div  *ngFor="let master of pdMasterData" class="ml-xs mr-xs" fxFlex="75">
+              <div  *ngFor="let master of pdMasterData" class="ml-xs mr-xs" fxFlex="30">
                 <h4>{{master.lender_full_name}} <span *ngIf="master.lender_applicant_id"> - </span>  {{master.lender_applicant_id}}</h4>
                 {{master.pd_date_of_initiation}}
               </div>
-               <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1"   fxFlex="25" style="text-align:right;" >
+               <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1"   fxFlex="70" style="text-align:right;" >
+                 
                 <button  *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
                       <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
                       <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && currentPDStatus!=pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
-                  <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>        
-                  <br><span style="color:red;text-align:left">{{master.pd_allocated_to}}</span>
+                  <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>  
+                  <br>      
+                  <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left">{{master.pd_allocated_to}}</span> &nbsp;&nbsp;
+                  <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status}} &nbsp;On&nbsp;{{master.scheduled_on}}</span>
+                  <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status}} &nbsp;On&nbsp; {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}</span>
+
                 </div>
         
                </div>  
@@ -39,7 +44,6 @@
                     <p *ngIf="master.product_name">{{master.product_name}}<span *ngIf="master.subproduct_name"> / </span> {{master.subproduct_name}}</p>
                     <p *ngIf="master.pd_type_name"><span>{{master.pd_type_name}}</span>  <span *ngIf="master.loan_amount" class="hover-icon"> / <i class="fa-1x fa fa-rupee">&nbsp;</i>{{master.loan_amount}}</span></p>
                     <p><span>{{master.addressline1}}<span *ngIf="master.addressline2"> , </span>{{master.addressline2}} <span *ngIf="master.addressline3"> , </span>{{master.addressline3}}</span></p>            
-                    <p><span>{{master.pd_status}} <span *ngIf="master.updatedon"> - </span>{{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}</span></p>
                   </mat-card-content>
                 </mat-card>
                         
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 2b79bc7d6..3db971e98 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
@@ -2,16 +2,19 @@
     <mat-card-content>
      <div class="mb-2" > 
        <div fxLayout="row"  fxLayoutAlign="start center" class="filter-header">
-           <div  *ngFor="let master of pdMasterData" class="ml-xs mr-xs" fxFlex="75">
+           <div  *ngFor="let master of pdMasterData" class="ml-xs mr-xs" fxFlex="30">
              <h4>{{master.lender_full_name}} -  {{master.lender_applicant_id}}</h4>
              {{master.pd_date_of_initiation}}
            </div>
-            <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1"   fxFlex="25" style="text-align:right;" >
+            <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1"   fxFlex="70" style="text-align:right;" >
              <button  *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
                    <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
                    <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && currentPDStatus!=pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
                <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>        
-               <br><span style="color:red;text-align:left">{{master.pd_allocated_to}}</span>
+               <br>      
+                  <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left">{{master.pd_allocated_to}}</span> &nbsp;&nbsp;
+                  <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status}} &nbsp;On&nbsp;{{master.scheduled_on}}</span>
+                  <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status}} &nbsp;On&nbsp; {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}</span>
              </div>
      
             </div>