From ea560e7d85e96d31bc7512b763236f72b423e52d Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 7 Jan 2019 12:03:29 +0530
Subject: [PATCH 1/2] UI changes

---
 .../list-pd/view-pd/view-pd.component.html    | 106 +++++++++---------
 1 file changed, 52 insertions(+), 54 deletions(-)

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 ff83913e9..8acb7c867 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
@@ -3,11 +3,11 @@
    <mat-card-content>
       <mat-card class="p-2 mb-2" style="height: 370px !important;">
          <div fxLayout="row" fxLayoutWrap="wrap" class="mb-3">
-            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="25" fxFlex.xl="25" class="profile-center" style="text-align:center;">
+            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="60" fxFlex.lg="30" fxFlex.xl="30" class="profile-center" style="text-align:center;">
                <!--<div class="mb-1">
                   <img src="assets/images/userpic.jpg" width="100" height="100" alt="" class="radius-circle">
                </div>-->
-               <mat-card style="padding: 15px;box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important;">
+               <mat-card style="padding: 15px;height: 290px;width: 280px;box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important;">
                 <div  *ngFor="let master of pdMasterData" class="ml-xs mr-xs">
                 <h4 class="ma-0">{{master.lender_short_name}}</h4>
                 <small>{{master.branch_name}}</small>
@@ -15,15 +15,18 @@
                 <small> {{master.lender_applicant_id}}</small> <br>
                 <small>{{master.pd_date_of_initiation}}</small><br>
                 <br>
-                <button mat-raised-button  color="primary">
+                <button #no_btn mat-raised-button  color="primary">
                 <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="text-align:left">QC Completed</span>
-                </button><br>
-                <small *ngIf="master.pd_status==pdStatusCheck.SCHEDULED">{{master.scheduled_on}}</small>
+                </button>&nbsp;&nbsp;
+                 <button *ngIf="master.pd_type_name && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="editPdMaster(master)"><mat-icon>save</mat-icon></button>
+                 <br>
                 <small *ngIf="master.pd_allocated_to && master.fk_pd_type==1" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.pd_allocated_to | titlecase}}</small>
                 <small *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}}</small> 
-                <small *ngIf="master.centralofficer && master.fk_pd_type==3" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.centralofficer | titlecase}}</small>   
+                <small *ngIf="master.centralofficer && master.fk_pd_type==3" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.centralofficer | titlecase}}<br></small>  
+                
+                <small *ngIf="master.pd_status==pdStatusCheck.SCHEDULED">{{master.scheduled_on}}</small> 
                
                 </div>
               </div> 
@@ -34,14 +37,12 @@
                <a href="javascript:;" class="block mt-xs mb-xs">www.example.com</a>
                <button mat-raised-button color="primary">Edit Profile</button>-->
             </div>
-            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="75" fxFlex.xl="75" class="content-data">
+            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="70" fxFlex.xl="70" class="content-data">
                <figure>
                   <mat-card-content style="padding:0px !important;">                      
                      <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs">
                      <div fxLayout="row">  
-                        <div fxFlex="100" style="text-align: right;">
-                                                        <button *ngIf="master.pd_type_name && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="editPdMaster(master)"><mat-icon>save</mat-icon></button>
-
+                        <div fxFlex="100" 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 && enableStartPD" 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>
@@ -68,12 +69,22 @@
                         </div>
                          <div fxLayout="row">
                           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
-                           <span *ngIf="master.loan_amount"><i class="fa-1x fa fa-rupee" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>&nbsp; {{master.loan_amount}}</span>
+                            <div fxFlex="10">
+                              <span><i class="fa-1x fa fa-rupee" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                            </div>
+                            <div fxFlex="90">
+                           <span *ngIf="master.loan_amount"> {{master.loan_amount}}</span>
+                            </div>
                           </div>
                         </div>
                          <div fxLayout="row">
                           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
-                          <span *ngIf="master.pd_type_name"><i class="fa-1x fa fa-check-circle" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>&nbsp; {{master.pd_type_name}}</span>
+                            <div fxFlex="10">
+                              <span><i class="fa-1x fa fa-check-circle" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                            </div>
+                            <div fxFlex="90">
+                              <span *ngIf="master.pd_type_name"> {{master.pd_type_name}}</span>
+                            </div>
                           </div>
                         </div>
                           <div fxLayout="row">
@@ -82,7 +93,7 @@
                                    <span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
                                  </div> 
                                  <div fxFlex="90">                        
-                              <span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}}, {{master.city_name}},<br>{{master.state_name}}-{{master.pincode}} </span>
+                              <span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}},<br> {{master.city_name}},<br>{{master.state_name}}-{{master.pincode}} </span>
                                  </div>
                             </div>
                           </div>    
@@ -132,8 +143,7 @@
          <h4>PD Details</h4>
          <mat-tab-group class="mt-2">
             <mat-tab>
-               <ng-template mat-tab-label>Applicants</ng-template>
-                  <mat-card>
+               <ng-template mat-tab-label>Applicants</ng-template> 
               <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                 <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdApplicant(pdApplicantData)"><mat-icon>edit</mat-icon></button>
               </div>
@@ -166,12 +176,10 @@
                 <mat-card-content>
                   <p>No Applicant</p>
                 </mat-card-content>
-              </ng-template>
-            </mat-card>
+              </ng-template> 
             </mat-tab>
             <mat-tab>
-               <ng-template mat-tab-label>Additional Requirements</ng-template>
-                 <mat-card>
+               <ng-template mat-tab-label>Additional Requirements</ng-template> 
                 <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                 <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button>
               </div>             
@@ -189,8 +197,7 @@
                 <mat-card-content>
                   <p>No Additional Requirements</p>
                 </mat-card-content>
-              </ng-template>
-            </mat-card>
+              </ng-template> 
             </mat-tab>
             <mat-tab>
                <ng-template mat-tab-label>Documents</ng-template>
@@ -203,51 +210,25 @@
                 </mat-list-item>
               </mat-list>
                </div>
-            <ng-template #nodocument>
-              <mat-card>
+            <ng-template #nodocument> 
                 <mat-card-content>
                   <p>No Document</p>
-                </mat-card-content>
-              </mat-card>
+                </mat-card-content> 
             </ng-template>               
-            </mat-tab>
-            <mat-tab>
-               <ng-template mat-tab-label>PD History</ng-template>
-               <div *ngIf="masterPdLogsData.length>0; else nohistory">
-                <mat-list class="m-gap p-gap" *ngFor="let master of masterPdLogsData">
-                <mat-list-item>
-                  <span style="font-size:15px;"><span style="color:#908f8f">{{master.time}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                  <span style="color:#908f8f"> <i> {{master.user}} </i>  </span><br> <span>{{master.log}}</span> </span>
-
-                </mat-list-item>
-
-              </mat-list>
-                   </div>
-            <ng-template #nohistory>
-              <mat-card>
-                <mat-card-content>
-                  <p>No History</p>
-                </mat-card-content>
-              </mat-card>
-            </ng-template>
             </mat-tab>
              <mat-tab>
-               <ng-template mat-tab-label>QC Notes</ng-template>
-                 <mat-card>
+               <ng-template mat-tab-label>QC Notes</ng-template> 
               <div style="color:red !important;">
                 <h6>QC Notes</h6>
               </div>
               <p>
-                {{ pdMasterData[0]?.qc_remarks}}</p>
-
-            </mat-card>
+                {{ pdMasterData[0]?.qc_remarks}}</p> 
      
             </mat-tab>
              <mat-tab>
                <ng-template mat-tab-label>QC Remarks</ng-template>
                     <div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED'" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
-            fxFlex.lg="100" fxFlex.xl="100">
-            <mat-card>
+            fxFlex.lg="100" fxFlex.xl="100"> 
               <div style="color:red !important;">
                 <h6>QC Remarks</h6>
               </div>
@@ -264,10 +245,27 @@
               <br>
               <div style="display: inline-block;">
                 {{ pdMasterData[0]?.qc_feedback}}
-              </div>
-            </mat-card>
+              </div> 
           </div> 
             </mat-tab>
+              <mat-tab>
+               <ng-template mat-tab-label>PD History</ng-template>
+               <div *ngIf="masterPdLogsData.length>0; else nohistory">
+                <mat-list class="m-gap p-gap" *ngFor="let master of masterPdLogsData">
+                <mat-list-item>
+                  <span style="font-size:15px;"><span style="color:#908f8f">{{master.time}}&nbsp;</span>
+                  <span style="color:#908f8f"> <i> {{master.user}} </i>  </span><br> <span>{{master.log}}</span> </span>
+
+                </mat-list-item>
+
+              </mat-list>
+                   </div>
+            <ng-template #nohistory> 
+                <mat-card-content>
+                  <p>No History</p>
+                </mat-card-content> 
+            </ng-template>
+            </mat-tab>
          </mat-tab-group>
       </mat-card>
    </mat-card-content>

From ec314c86d33f1be56c4397b9f3adca53680de4af Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 7 Jan 2019 12:07:09 +0530
Subject: [PATCH 2/2] UI changes

---
 .../manage-pd/list-pd/view-pd/view-pd.component.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8acb7c867..444ea4dba 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
@@ -15,7 +15,7 @@
                 <small> {{master.lender_applicant_id}}</small> <br>
                 <small>{{master.pd_date_of_initiation}}</small><br>
                 <br>
-                <button #no_btn mat-raised-button  color="primary">
+                <button mat-raised-button  color="primary">
                 <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="text-align:left">QC Completed</span>