- {{qcStatus}} +
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 @@ -

QC Completed Review

- - -
-
-
- - Remarks - - -
-
- +
+

QC Complete

+ + +
+

+ Because you've marked the document as QC Complete, you can't edit this document. +

- -
- - - - - +
+
+
+ +
+
+ + Remarks + + +
+
+
+ + + + + + +
- +
+

QC Remarks

+ +
+
+
+ + Remarks + + +
+
+
+ + + + + +
\ 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, @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; - + this.showStatus = this.data.data_status; // this.mycontent = `

My html content

`; } @@ -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..48043d646 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 @@ - +
@@ -35,7 +35,7 @@ -
+
@@ -64,13 +64,11 @@

{{master.addressline1}}

Remarks : {{master.remarks}}

- - - -
-
+ +
+
- +
@@ -91,7 +89,7 @@     -  {{applicant.landline}} +  +91{{applicant.landline}}
Main Applicant {{applicant.relation_name}} @@ -101,10 +99,10 @@

No Applicant

 -
-
+
+
- +
@@ -121,13 +119,8 @@

No Additional Requirements

 - - - - -
- -
+
+
@@ -148,8 +141,8 @@

No Document

 -
-
+
+
@@ -175,7 +168,26 @@
+
+ +
+
QC Remarks
+
+

+ {{ pdMasterData[0].qc_remarks}}

+

+ {{ pdMasterData[0]?.qc_feedback}}

+
+

+ +

+
+ + +
+
+
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;