From eb333ca20e9d23c420167783dc426e1863565bff Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 26 Dec 2018 14:37:48 +0530
Subject: [PATCH 1/2] test doc sn.1 changes only : ps

---
 .../list-pd/add-pd/add-pd.component.html      | 16 +++++---
 .../list-pd/add-pd/add-pd.component.ts        | 21 ++++++++++-
 .../edit-pd-applicant.component.html          |  6 ++-
 .../edit-pd-master.component.html             |  6 ++-
 .../edit-pd-master.component.ts               | 13 +++++++
 .../list-pd/view-pd/view-pd.component.html    | 37 ++++++++-----------
 6 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index 46efa23f7..4188d4851 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -81,13 +81,14 @@
                         <!-- <mat-error *ngIf="pdMain.fk_subproduct_id.hasError('required')">Sub Product Required.</mat-error> -->
     
                 </mat-form-field>   
+                <!-- {{customerSegmentList | json}} -->
                 <mat-form-field style="width: 32%">
                     <mat-select  placeholder="Customer Segment" formControlName="fk_customer_segment">
                             <mat-option>
                                     Select
                                      </mat-option>    
                         <mat-option *ngFor="let CSL of customerSegmentList" [value]="CSL.customer_segment_id" >
-                    {{CSL.customer_segment}}
+                    {{CSL.abbr}}
                             </mat-option>
                     </mat-select>
                     <!-- <mat-error *ngIf="pdMain.fk_customer_segment.hasError('required')">Customer Segment Required.</mat-error> -->
@@ -106,8 +107,9 @@
                     <!-- <mat-error *ngIf="pdMain.fk_pd_type.hasError('required')">PD Type Required.</mat-error> -->
     
             </mat-form-field>
-            <mat-form-field style="width: 24%">
-                            <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)">
+            <mat-form-field style="width: 32%">
+                            <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
+                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
     
@@ -184,8 +186,9 @@
                                             <mat-error *ngIf="pdMain.mobile_no.hasError('maxlength') || pdMain.mobile_no.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
                                     </mat-form-field>
                                    
-                                   <mat-form-field style="width: 10%">
+                                   <mat-form-field style="width: 15%">
                                         <input matInput placeholder="STD Code" formControlName="stdcode" type="text" (keypress)="keyPress($event)">
+                                        <span matPrefix>+91</span>
                                         <mat-error *ngIf="pdMain.stdcode.hasError('maxlength') || pdMain.stdcode.hasError('minlength')">Enter Valid STD Code Number. </mat-error>  
                                     </mat-form-field> &nbsp; - &nbsp;
                                     <mat-form-field style="width: 20%">
@@ -264,14 +267,15 @@
                   <div fxFlex="30" align="end">
                         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button"
                         (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button>
-                    <button  mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="saveDraftPD(_PDtriggerForm.value,draftStatus)" matTooltip="PD Draft" matTooltipPosition="above" type="button"><mat-icon>description</mat-icon></button> 
-                  <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Process" matTooltipPosition="above" (click)="triggerPD(_PDtriggerForm.value,PDTriggerStatus)"><mat-icon>save</mat-icon></button>
+                    <button  mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="saveDraftPD(_PDtriggerForm.value,draftStatus)" matTooltip="Save as Draft" matTooltipPosition="above" type="button"><mat-icon>description</mat-icon></button> 
+                    <button  mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger PD" matTooltipPosition="above" (click)="triggerPD(_PDtriggerForm.value,PDTriggerStatus)"><mat-icon>save</mat-icon></button>
                       </div>
                 
           </mat-card-actions>
            </form>
         </mat-card-content>
     </mat-card>
+<notifier-container></notifier-container>
             
          
           
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index 8db401982..6c23033f2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -33,6 +33,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
   billingList: any;
   relationShipList: any;
   errorMessage: any;
+  loanAmtInWords : any;
    // Dynamic co applicant
    createWithLongContent = false;
    dynamicCoApplicant = [];
@@ -272,6 +273,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
 
     // save pd in draft
     saveDraftPD(formValue: any, status:string){
+      alert('Inside The Draft PD');
       this.submitPdDetails(formValue, status);
     }
     //trigger  pd 
@@ -360,8 +362,11 @@ export class AddPdComponent implements OnInit, OnDestroy {
 
     // common function for both draft and process pd
     submitPdDetails(formValue: any, status:string) {
+      alert('Inside Function Submit Function');
       if(this._PDtriggerForm.invalid) {
-        this.validateAllFormFields(this._PDtriggerForm)
+        this.validateAllFormFields(this._PDtriggerForm);
+        alert('validationError');
+        console.log(this._PDtriggerForm);
         return;
       }
       else {
@@ -433,7 +438,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
        if(formValue.addtional_requirements.length > 0){
         pd_form.append("addtional_requirements",JSON.stringify(formValue.addtional_requirements))
 
-       }
+       } 
        this._pd.addPdDetails(pd_form).subscribe(result => {
          if (result.status == 200) {
            this.notifier.notify('success', 'PD Saved.');
@@ -490,4 +495,16 @@ validateAllFormFields(formGroup: any) {
   });
 } 
 
+/** To Convert Amount into Words  */
+inWords(e,flag:number){
+  switch(flag){
+  case 1 :
+      this.loanAmtInWords = this._pd.convertNumberToWords(e.target.value);    
+      break;
+  default:
+      break;
+}
+}
+
+
 }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
index beea70bd3..cdee436c6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
@@ -31,8 +31,9 @@
                             <input matInput placeholder="Mobile Number" formControlName="mobile_no" type="text" (keypress)="keyPress($event)" required>
                             <mat-error *ngIf="pdMainApplicant.mobile_no.hasError('maxlength') || pdMainApplicant.mobile_no.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
                 </mat-form-field>
-                <mat-form-field style="width: 10%">
+                <mat-form-field style="width: 15%">
                     <input matInput placeholder="STD Code" formControlName="stdcode" type="text" (keypress)="keyPress($event)">
+                    <span matPrefix>+91</span>
                     <mat-error *ngIf="pdMainApplicant.stdcode.hasError('maxlength') || pdMainApplicant.stdcode.hasError('minlength')">Enter Valid STD Code. </mat-error>  
           </mat-form-field> &nbsp;-&nbsp;
                 <mat-form-field style="width: 25%">
@@ -64,8 +65,9 @@
                         <input matInput placeholder="LandLine Number" formControlName="coapplicant_landline" type="text" (keypress)="keyPress($event)">
                         <mat-error *ngIf=" coDetails['controls'].coapplicant_landline.hasError('maxlength') || coDetails['controls'].coapplicant_landline.hasError('minlength')">Enter Valid Phone Number. </mat-error>  
                       </mat-form-field> -->
-                      <mat-form-field style="width: 10%">
+                      <mat-form-field style="width: 15%">
                         <input matInput placeholder="STD Code" formControlName="coapplicant_stdcode" type="text" (keypress)="keyPress($event)">
+                        <span matPrefix>+91</span>
                         <mat-error *ngIf="coDetails['controls'].coapplicant_stdcode.hasError('maxlength') || coDetails['controls'].coapplicant_stdcode.hasError('minlength')">Enter Valid STD Number. </mat-error>  
                     </mat-form-field> &nbsp;-&nbsp;
                     <mat-form-field style="width: 25%">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
index 04d9cd3a5..b0d4e742e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
@@ -71,7 +71,7 @@
                                                     <mat-select  placeholder="Customer Segment" formControlName="fk_customer_segment">
                                                                 <mat-option>Select</mat-option>    
                                                         <mat-option *ngFor="let CSL of customerSegmentList" [value]="CSL.customer_segment_id" >
-                                                    {{CSL.customer_segment}}
+                                                    <!-- {{CSL.customer_segment}} -->{{CSL.abbr}}
                                                             </mat-option>
                                                     </mat-select>
                                                     <!-- <mat-error *ngIf="pdMain.fk_customer_segment.hasError('required')">Customer Segment Required.</mat-error> -->
@@ -88,7 +88,9 @@
                                     
                                             </mat-form-field>
                                             <mat-form-field style="width: 24%">
-                                                            <input matInput placeholder="Loan Amount" formControlName="loan_amount">
+                                                            <!-- <input matInput placeholder="Loan Amount" formControlName="loan_amount"> -->
+                                                            <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" required autocomplete="off">
+                                                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                                                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                                                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
                 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
index 38bfe29f5..2c8e9b102 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
@@ -26,6 +26,7 @@ export class EditPdMasterComponent implements OnInit {
   // PDTriggerStatus: string;
   enablePDButton: boolean;
   currentPDStatus: string;
+  loanAmtInWords : any;
   public _EditPDtriggerForm:FormGroup;
   public notifier: NotifierService;
   // create values for status check
@@ -43,6 +44,7 @@ export class EditPdMasterComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data: any) {
       this.notifier=notifier
       this.currentPDStatus = data.records.pd_status;
+      if(this.data.records.loan_amount){ this.loanAmtInWords = this._pd.convertNumberToWords(this.data.records.loan_amount); }
      }
 
   ngOnInit() {
@@ -279,6 +281,17 @@ validateAllFormFields(formGroup: any) {
       }
   });
 } 
+
+/** To Convert Amount into Words  */
+inWords(e,flag:number){
+  switch(flag){
+  case 1 :
+      this.loanAmtInWords = this._pd.convertNumberToWords(e.target.value);    
+      break;
+  default:
+      break;
+}
+}
   
 
 }
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 8c26e9ebf..ba58d97d1 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
@@ -35,7 +35,7 @@
      </mat-card>
       
  <mat-card-content>
-     <div fxLayout="row wrap">
+  <div fxLayout="row wrap">
 
      <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
          <!--pd master  -->
@@ -64,13 +64,11 @@
                <p><span>{{master.addressline1}}</span></p>    
                <p *ngIf="master.remarks"><span style="font-size:13px;"> Remarks : </span> <span style="color:red">{{master.remarks}}</span></p>        
              </mat-card-content>
-           </mat-card>
-                   
-         
-       </div>
-       <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+       </mat-card>
+     </div>
+     <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
            <!-- applicant card  -->
-         <mat-card  class="minheight">
+           <mat-card  class="minheight">
                <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>
@@ -91,7 +89,7 @@
                       </span> &nbsp;&nbsp;&nbsp;
                       <span *ngIf="applicant.landline != '' && applicant.landline != 'null-null' && applicant.landline != null " class="mb-2 text-center hover-icon">
                         <i class="fa-1x fa fa-phone"></i>
-                             &nbsp;{{applicant.landline}} 
+                        &nbsp;<span matPrefix>+91</span>{{applicant.landline}} 
                       </span>
                       <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant </span> 
                   <ng-template #codetails><span>{{applicant.relation_name}}</span></ng-template>
@@ -101,10 +99,10 @@
              </mat-card-content>
              <ng-template #noApplicant><mat-card-content><p>No Applicant</p></mat-card-content></ng-template>                
            </mat-card>                          
-         </div>
-         <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="100" fxFlex.xl="100">
+     </div>
+     <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="100" fxFlex.xl="100">
             <!-- applicant card  -->
-          <mat-card  class="minheight">
+            <mat-card  class="minheight">
                 <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>
@@ -121,13 +119,8 @@
               </mat-card-content>
               <ng-template #noRequirement><mat-card-content><p>No Additional Requirements</p></mat-card-content></ng-template>                
             </mat-card>   
-
-            
-            
-            
-          </div>
-         
-           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
+     </div>    
+     <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
                 <!-- pd documents card -->
                 <mat-expansion-panel *ngIf="pdDocumentsData.length>0; else nodocument">
                    <mat-expansion-panel-header>
@@ -148,8 +141,8 @@
                  <mat-card-content><p>No Document</p></mat-card-content>
                 </mat-card>
               </ng-template>
-           </div>
-               <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+     </div>
+     <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
                    <!--pd logs card  -->
                      <mat-expansion-panel *ngIf="masterPdLogsData.length>0; else nohistory">
                          <mat-expansion-panel-header>
@@ -174,8 +167,8 @@
                        </mat-card>
                        </ng-template>       
                    
-                 </div>
-                 </div>
+     </div>
+  </div>
  </mat-card-content>
 </div>
   </mat-card-content>

From 05d9a874606f1b001239aa06baf4db2a2112506d Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Wed, 26 Dec 2018 17:57:29 +0530
Subject: [PATCH 2/2] pd report changes : kdk

---
 .../pd-report/pd-report.component.html        | 19 +++---
 .../list-pd/pd-report/pd-report.component.ts  |  4 +-
 .../qc-review/qc-review.component.html        | 68 +++++++++++++------
 .../qc-review/qc-review.component.ts          | 48 +++++++++----
 .../list-pd/view-pd/view-pd.component.html    | 19 +++++-
 .../list-pd/view-pd/view-pd.component.ts      |  3 +
 6 files changed, 116 insertions(+), 45 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html
index 12865496c..259603465 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html
@@ -6,6 +6,11 @@
 </div>
 <mat-card style="min-height:540px;">
     <mat-card-content>
+        <div align="end">
+            <button mat-raised-button color="blue" (click)="reportReview('REMARKS')" style="padding: 0 28px !important;" [disabled]="qcStatus === 'QC_COMPLETED'">QC Remarks</button> 
+            <button mat-raised-button color="red" (click)="reportReview('COMPLETE')" style="padding: 0 28px !important;" [disabled]="qcStatus === 'QC_COMPLETED'">QC Complete</button>
+            <!--{{ qcStatus }} -->
+        </div>
         <mat-tab-group>
             <mat-tab label="PD Data">
                 <div>
@@ -44,10 +49,8 @@
             </mat-tab>
             <mat-tab label="PD Report">
                 <div *ngIf="reGenerateBtn">
-                
-
-
-<mat-card >
+               
+<mat-card>
     
     <mat-card-content>
             
@@ -61,16 +64,16 @@
               {{ pd.doc_name }}<span *ngIf="pd.is_latest == 1" [style.color]="'green'">( Current Version )</span><br>
               <span style="color:rgba(117, 115, 115, 0.87)!important;font-size:13px !important;">{{pd.createdby}}</span><br>
               <span style="color:rgba(117, 115, 115, 0.87)!important;font-size:13px !important;">{{pd.createdon}}</span>
-              <hr>
+              <hr> 
 
            </button>
-          <mat-card *ngIf="qcStatus === 'QC_COMPLETED'" style="text-align:center;position: absolute;
-    bottom: 10px;"> <button mat-raised-button color="red" *ngIf="reGenerateBtn" (click)="reportReview()" style="padding: 0 58px !important;">QC Review</button> </mat-card>
+          <!--<mat-card *ngIf="qcStatus === 'QC_COMPLETED'" style="text-align:center;position: absolute;
+    bottom: 10px;"> <button mat-raised-button color="red" *ngIf="reGenerateBtn" (click)="reportReview()" style="padding: 0 58px !important;">QC Review</button> </mat-card>-->
             </mat-sidenav>
             
              
             <div class="main-content" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
-                {{qcStatus}}
+                <!--{{qcStatus}}-->
                 <figure style="min-height: 240px;">    
                
                     <div *ngIf="latestPDDetails">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts
index d7ad19799..f9a6d5d2d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts
@@ -179,9 +179,9 @@ export class PdReportComponent implements OnInit {
 
   
 
-     reportReview(): void {
+     reportReview(status): void {
         const dialogRef = this.dialog.open(QcReviewComponent, {
-          data: { startId : this.startPD },
+          data: { startId : this.startPD, data_status: status },
           disableClose: true
         });
         dialogRef.afterClosed()
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.html
index c67d819ea..4c2fe1a30 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.html
@@ -1,23 +1,49 @@
-<h2 mat-dialog-title>QC Completed Review</h2>
-<mat-dialog-content class="mat-typography">
-  <!--<h3>Develop across all platforms</h3>-->
-  <div style="margin: 12px; width: 340px;">
-    <form  role="form" *ngIf="showForm" [formGroup]="ngForm" accept-charset="UTF-8" novalidate>
-      <div>
-        <mat-form-field appearance="outline" style="width: 100%">
-                    <mat-label>Remarks</mat-label>
-                    <textarea matInput placeholder="Remarks" formControlName="qc_remarks"></textarea>
-        </mat-form-field>
-      </div>
-    <div>
-      <app-rating [rating]="ngForm.get('qc_rating').value" (ratingClick)='ratingComponentClick($event)'></app-rating>
+<div *ngIf="showStatus == 'COMPLETE'">
+  <h2 mat-dialog-title>QC Complete</h2>
+  <mat-dialog-content class="mat-typography">
+    <!--<h3>Develop across all platforms</h3>-->
+    <div *ngIf="conformation === false" style="width: 220px;text-align: center; margin: 12px;">
+        <p>
+           Because you've marked the document as QC Complete, you can't edit this document.
+        </p>
     </div>
-    </form>
-  </div>
-</mat-dialog-content>
-<mat-dialog-actions align="end">
-  <button mat-button class="btn btn-primary" (click)="myClick()">Save</button>
-  <button mat-button mat-dialog-close>Cancel</button>
-</mat-dialog-actions>
+    <div *ngIf="conformation" style="margin: 12px; width: 340px;">
+      <form role="form" *ngIf="showForm" [formGroup]="ngForm" accept-charset="UTF-8" novalidate>
+        <div>
+          <app-rating [rating]="ngForm.get('qc_rating').value" (ratingClick)='ratingComponentClick($event)'></app-rating>
+        </div>
+        <div>
+          <mat-form-field appearance="outline" style="width: 100%">
+            <mat-label>Remarks</mat-label>
+            <textarea matInput placeholder="Remarks" formControlName="qc_feedback"></textarea>
+          </mat-form-field>
+        </div>
+      </form>
+    </div>
+  </mat-dialog-content>
+  <mat-dialog-actions align="end">
+    <button mat-button class="btn btn-primary" *ngIf="conformation === false" (click)="conformation = true">Ok</button>
+    <button mat-button class="btn btn-primary" *ngIf="conformation" (click)="myClick()">Save</button>
+    <button mat-button mat-dialog-close>Cancel</button>
+  </mat-dialog-actions>
+</div>
 
-             
+<div *ngIf="showStatus == 'REMARKS'">
+  <h2 mat-dialog-title>QC Remarks</h2>
+  <mat-dialog-content class="mat-typography">
+    <div style="margin: 12px; width: 340px;">
+      <form role="form" *ngIf="showForm" [formGroup]="ngForm" accept-charset="UTF-8" novalidate>
+        <div>
+          <mat-form-field appearance="outline" style="width: 100%">
+            <mat-label>Remarks</mat-label>
+            <textarea matInput placeholder="Remarks" formControlName="qc_remarks"></textarea>
+          </mat-form-field>
+        </div>
+      </form>
+    </div>
+  </mat-dialog-content>
+  <mat-dialog-actions align="end">
+    <button mat-button class="btn btn-primary" (click)="myClick()">Save</button>
+    <button mat-button mat-dialog-close>Cancel</button>
+  </mat-dialog-actions>
+</div>
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.ts
index e87e9c5a0..c054a5d7c 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.ts
@@ -17,10 +17,12 @@ import {
 })
 export class QcReviewComponent implements OnInit {
 
+  conformation: Boolean = false;
   @Input() questionId: number;
   ngForm: FormGroup;
   recordData: any;
   showForm: Boolean;
+  showStatus : any;
 /**
 	 * Notifier service
 	 */
@@ -31,7 +33,7 @@ export class QcReviewComponent implements OnInit {
    private dialogRef: MatDialogRef<QcReviewComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any) {
           this.notifier = notifier;
-         
+           this.showStatus = this.data.data_status;
     // this.mycontent = `<p>My html content</p>`;
   }
 
@@ -40,19 +42,39 @@ export class QcReviewComponent implements OnInit {
   }
 
   getQcCompleteReviewStatus() {
-    this.pdTrigerService.getQCReportFinalReviewDetails(this.data.startId, "QC").subscribe(data => {
-    if(data['dataStatus']){
-        this.recordData = data.records[0];
-           this.ngForm = this._formBuilder.group({
-            qc_remarks: [this.recordData.qc_remarks],
-            qc_rating: [Number(this.recordData.qc_rating)],
-            pd_status: [this.recordData.pd_status],
-          })
-        this.showForm = true;
-      }
-    },err => {
+    let type ; '';
+    if( this.showStatus === 'REMARKS'){
+      type = 'QC_REMARKS';
+        this.pdTrigerService.getQCReportFinalReviewDetails(this.data.startId, type).subscribe(data => {
+        if(data['dataStatus']){
+            this.recordData = data.records[0];
+              this.ngForm = this._formBuilder.group({
+                qc_remarks: [this.recordData.qc_remarks],
+                pd_status: [this.recordData.pd_status]
+              })
+            this.showForm = true;
+          }
+        },err => {
 
-    });
+        });
+    } else if(this.showStatus === 'COMPLETE') {
+      type = 'QC';
+      this.pdTrigerService.getQCReportFinalReviewDetails(this.data.startId, type).subscribe(data => {
+      if(data['dataStatus']){
+          this.recordData = data.records[0];
+            this.ngForm = this._formBuilder.group({
+              qc_feedback: [this.recordData.qc_feedback],
+              qc_rating: [Number(this.recordData.qc_rating)],
+              pd_status: ["QC_COMPLETED"],
+            })
+          this.showForm = true;
+        }
+      },err => {
+
+      });
+    } else {
+    }
+  
   }
 
   onChange($event: any): void {
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 8c26e9ebf..87a3a1ddf 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
@@ -13,7 +13,7 @@
                       <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>
 
-                      <button *ngIf="master.pd_type_name && currentPDStatus===pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="getPDIDReport(viewID)"><mat-icon>ballot</mat-icon></button>
+                      <button *ngIf="master.pd_type_name && currentPDStatus===pdStatusCheck.QC_COMPLETED || pdStatusCheck.COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="getPDIDReport(viewID)"><mat-icon>ballot</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>
@@ -175,6 +175,23 @@
                        </ng-template>       
                    
                  </div>
+                  <div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED'" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+                   <mat-card>
+                      <div style="color:red !important;">
+                        <h6>QC Remarks</h6>
+                      </div>
+                        <p>
+                          {{ pdMasterData[0].qc_remarks}}</p>
+                        <p> 
+                          {{ pdMasterData[0]?.qc_feedback}}</p>
+                        <div>
+                          <p>
+                            <app-rating [rating]="pd_QC_Rating"></app-rating>
+                          </p>
+                        </div>
+                        
+                   </mat-card>
+                  </div>
                  </div>
  </mat-card-content>
 </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
index 64fd67858..a806cfe68 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
@@ -64,11 +64,14 @@ export class ViewPdComponent implements OnInit, OnDestroy {
     
     this.viewPdDetails(this.viewID);
   }
+  pd_QC_Rating: Number;
+
   viewPdDetails(editID:string){
    this._pd.editPdDetails(editID).subscribe(
     data => {
       if (data.status == 200) {
        this.pdMasterData=data.records.pd_master_details;
+      this.pd_QC_Rating = Number(this.pdMasterData[0].qc_rating);
        this.pdApplicantData= data.records.applicants_details;
        this.pdDocumentsData=data.records.pd_documnets;
        this.masterPdLogsData=data.records.pd_logs.master;