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 76b13c847..fd3aa26fb 100755
--- 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
@@ -11,7 +11,7 @@
-
+
person{{master.pd_allocated_to | titlecase}}
@@ -80,6 +80,30 @@
No Applicant
+
+
+
+
+
+
+
+ Additional Requirements
+
+
+ 0; else noRequirement">
+
+
+ {{requirement.add_requirement}}
+
+
+
+ No Additional Requirements
+
+
+
+
+
+
0; else nodocument">
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
index 5aebabbe6..0dcaefe8e 100755
--- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
@@ -11,7 +11,8 @@ import { TelePdAllocationComponent } from './../../../personal-discussion/manage
import { SchedulePdComponent } from './../../../personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component';
import { EditPdApplicantComponent } from './../../../personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component';
import { EditPdMasterComponent } from './../../../personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component';
-
+import { PdRequirementComponent } from './../../../personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component';
+import {DatePipe } from '@angular/common';
@Component({
selector: 'app-qc-view',
templateUrl: './qc-view.component.html',
@@ -19,6 +20,7 @@ import { EditPdMasterComponent } from './../../../personal-discussion/manage-pd/
encapsulation: ViewEncapsulation.None
})
export class QcViewComponent implements OnInit, OnDestroy {
+ pipe = new DatePipe('en-US');
public selectedMoment = new Date();
private notifier:NotifierService;
errorMessage: any;
@@ -31,7 +33,8 @@ export class QcViewComponent implements OnInit, OnDestroy {
viewParams:any;
destroyType:number=1;
currentPDStatus:string;
-
+ pdAdditionalReqData: any=[];
+ enableStartPD: boolean;
// create values for status check
pdStatusCheck :any={
"DRAFT" :'DRAFT',
@@ -46,6 +49,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
constructor(notifier:NotifierService,private dialog: MatDialog,private _fb: FormBuilder,
private _qc: QcService,private route: ActivatedRoute,private router: Router, private QcListComponent: QcListComponent) {
this.notifier=notifier
+ this.enableStartPD=false;
}
ngOnInit() {
@@ -64,8 +68,25 @@ export class QcViewComponent implements OnInit, OnDestroy {
this.pdApplicantData= data.records.applicants_details;
this.pdDocumentsData=data.records.pd_documnets;
this.masterPdLogsData=data.records.pd_logs.master;
+ this.pdAdditionalReqData = data.records.pd_additional_requirements;
//this.applicantPDLogsData= data.records.pd_logs.master;
this.currentPDStatus = data.records.pd_master_details[0].pd_status;
+ // enable pd start time
+ if(data.records.pd_master_details[0].scheduled_on_for_validation){
+ let courrentDateTime: string = this.pipe.transform(new Date(), 'yyyy-MM-dd HH:mm');
+ let scheduledDateTime: string=data.records.pd_master_details[0].scheduled_on_for_validation;
+ let diffInMs: number = Date.parse(courrentDateTime) - Date.parse(scheduledDateTime);
+ let diffInHours: number = Math.floor(diffInMs / 1000 / 60 / 60);
+ if(diffInHours>=-4){
+ this.enableStartPD=true;
+ }
+ else {
+ this.enableStartPD=false;
+ }
+ }
+ else {
+ this.enableStartPD=false;
+ }
}
}, error => this.errorMessage = error);
@@ -84,6 +105,8 @@ export class QcViewComponent implements OnInit, OnDestroy {
}
const dialogPDMaster = this.dialog.open(EditPdMasterComponent, {
data: record,
+ position: { right: '0'},
+ width: '80%',
disableClose: true
});
dialogPDMaster.afterClosed()
@@ -99,6 +122,8 @@ export class QcViewComponent implements OnInit, OnDestroy {
}
const dialogApplicant = this.dialog.open(EditPdApplicantComponent, {
data: setPdDetails,
+ position: { right: '0'},
+ width: '60%',
disableClose: true
});
dialogApplicant.afterClosed()
@@ -107,6 +132,24 @@ export class QcViewComponent implements OnInit, OnDestroy {
this.viewPdDetails(this.viewID)
});
}
+ // edit pd addtional requirements
+ editAdditionalRequirement(requirementData:any){
+ let setPdDetails = {
+ "pdID":this.viewID,
+ "records":requirementData
+ }
+ const dialogRequirement = this.dialog.open(PdRequirementComponent, {
+ data: setPdDetails,
+ position: { right: '0'},
+ width: '60%',
+ disableClose: true
+ });
+ dialogRequirement.afterClosed()
+ .subscribe(dataresult => {
+ // this.notifier.notify('success', 'Successfully allocated.!');
+ this.viewPdDetails(this.viewID)
+ });
+ }
// pd allocation to
pdAllocationTo(pdData:any) {
if(pdData.fk_pd_type == 1){