From 9f575c06198c274acaf4e354c136940e954498ca Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 2 Apr 2022 18:07:14 +0530 Subject: [PATCH] vendor-pd rcm allocate restriction : ps --- .../manage-pd/list-pd/view-pd/view-pd.component.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 df71b57..56c4d6f 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 @@ -377,18 +377,23 @@ export class ViewPdComponent implements OnInit, OnDestroy { // console.log("status = ",status); // console.log("pdDetails",pdDetails,pdDetails.fk_pd_id,this.pdMasterData); + // console.log("i am @379 - pdDetails",pdDetails,pdDetails.fk_pd_id,this.pdMasterData); let pd_allocated_to = this.pdMasterData[0].pd_allocated_to; + let vendor_status = this.pdMasterData[0].vendor_status; localStorage.setItem('pdid',pdDetails.fk_pd_id) this.destroyType = 3; let doSelfAllocated = 0;/** this for flag **/ - if(this.userId != pd_allocated_to && (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.ALLOCATED_TO_FIA) && (this.userRoleID == 27 || this.userRoleID == 28)){ + /* if(this.userId != pd_allocated_to && (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.ALLOCATED_TO_FIA) && (this.userRoleID == 27 || this.userRoleID == 28)){ */ + if(this.userId != pd_allocated_to && (status == this.pdStatusCheck.ALLOCATED) && (this.userRoleID == 27 || this.userRoleID == 28)){ console.log(this.userId,pd_allocated_to); /* console.log("if for flag",status); doSelfAllocated = 1;*/ - this.selfallocate(pdDetails.fk_pd_id); + if(status != this.pdStatusCheck.ALLOCATED_TO_FIA && this.userRoleID != 27){ + this.selfallocate(pdDetails.fk_pd_id);} // new Promise( resolve => setTimeout(resolve, 300) ); } - if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED || status == this.pdStatusCheck.TRIGGERED||status == this.pdStatusCheck.ALLOCATED_TO_FIA) { + /* if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED || status == this.pdStatusCheck.TRIGGERED||status == this.pdStatusCheck.ALLOCATED_TO_FIA) {*/ + if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED || status == this.pdStatusCheck.TRIGGERED|| (status == this.pdStatusCheck.ALLOCATED_TO_FIA && vendor_status == this.pdStatusCheck.ALLOCATED && this.userRoleID == 28)) { const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, { data: { pdid: pdDetails.assigned_pd, pd_status: this.pdStatusCheck.INPROGRESS,random_string:this.pdMasterData[0].random_string }, disableClose: true,