diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index a2b1532cf..c01b31261 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -116,7 +116,7 @@ export class StartPdComponent implements OnInit, OnDestroy { let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true); this.answeredQuestions = getAnsweredFormsCount.length; this.pdFullDetails = data.records; - if(type==1 && data.records.pdmaster_details.pd_status=='SCHEDULED') { + if(type==1 && (data.records.pdmaster_details.pd_status=='SCHEDULED' || data.records.pdmaster_details.pd_status=='ALLOCATED')) { this.pdStatusDialogue(this.pdStatusCheck.INPROGRESS) } } @@ -144,6 +144,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(dataresult.update_status==true){ this.loadTemplates(this.startPD,2); } + else { + this.router.navigate(['../../viewpd', this.startPD], {relativeTo: this.route}); + + } + }); } 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 4de326f2e..c4d1d4cd6 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 @@ -326,7 +326,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { // start pd getPDStart(pdID: any, status: string) { this.destroyType = 3; - if (status == this.pdStatusCheck.SCHEDULED) { + if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED) { const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, { data: { pdid: this.viewID, pd_status: this.pdStatusCheck.INPROGRESS }, disableClose: true,