diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html
index b6de3b267f..5223d3b23e 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html
@@ -334,8 +334,8 @@
Audit and Chair Review
-
-
+
+
diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html
index 29fb97720d..c09b42fbd4 100644
--- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html
+++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html
@@ -18,7 +18,7 @@
color="accent"
mat-flat-button
[mat-dialog-close]="isDirty"
- [routerLink]="['application', application.fileNumber]"
+ [routerLink]="[routerLink]"
>
View Detail
diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts
index 4b9dc74724..382ff334ad 100644
--- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts
+++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts
@@ -5,6 +5,7 @@ import {
ApplicationSubmissionToSubmissionStatusDto,
DEFAULT_NO_STATUS,
} from '../../../../services/application/application-submission-status/application-submission-status.dto';
+import { SUBMISSION_STATUS } from '../../../../services/application/application.dto';
import { ApplicationSubmissionStatusService } from '../../../../services/application/application-submission-status/application-submission-status.service';
import { ApplicationDto } from '../../../../services/application/application.dto';
import { ApplicationService } from '../../../../services/application/application.service';
@@ -30,6 +31,8 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O
application: ApplicationDto = this.data;
status?: ApplicationSubmissionStatusPill;
+ routerLink = `application/`;
+
constructor(
@Inject(MAT_DIALOG_DATA) public data: ApplicationDto,
private applicationService: ApplicationService,
@@ -61,7 +64,7 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O
async populateApplicationSubmissionStatus(fileNumber: string) {
let submissionStatus: ApplicationSubmissionToSubmissionStatusDto | null = null;
-
+ this.routerLink = this.routerLink + fileNumber;
try {
submissionStatus = await this.applicationSubmissionStatusService.fetchCurrentStatusByFileNumber(
fileNumber,
@@ -72,6 +75,9 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O
}
if (submissionStatus) {
+ if (submissionStatus.statusTypeCode === SUBMISSION_STATUS.ALC_DECISION) {
+ this.routerLink = this.routerLink + '/decision'
+ }
this.status = {
backgroundColor: submissionStatus.status.alcsBackgroundColor,
textColor: submissionStatus.status.alcsColor,
diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html
index 23aab8ffdc..7a679916e3 100644
--- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html
+++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html
@@ -22,7 +22,7 @@
color="accent"
mat-flat-button
[mat-dialog-close]="isDirty"
- [routerLink]="['notice-of-intent', noticeOfIntent.fileNumber]"
+ [routerLink]="[routerLink]"
>
View Detail
diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts
index aeebef486f..1d164524ed 100644
--- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts
+++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts
@@ -2,9 +2,9 @@ import { Component, Inject, OnInit } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Router } from '@angular/router';
import {
- ApplicationSubmissionToSubmissionStatusDto,
DEFAULT_NO_STATUS,
} from '../../../../services/application/application-submission-status/application-submission-status.dto';
+import { NOI_SUBMISSION_STATUS } from '../../../../services/notice-of-intent/notice-of-intent.dto';
import { AuthenticationService } from '../../../../services/authentication/authentication.service';
import { BoardService, BoardWithFavourite } from '../../../../services/board/board.service';
import { CardService } from '../../../../services/card/card.service';
@@ -35,6 +35,8 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement
noticeOfIntent: NoticeOfIntentDto = this.data;
RETROACTIVE_TYPE = RETROACTIVE_TYPE_LABEL;
+ routerLink = `notice-of-intent/`;
+
constructor(
@Inject(MAT_DIALOG_DATA) public data: NoticeOfIntentDto,
private dialogRef: MatDialogRef,
@@ -76,7 +78,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement
private async populateSubmissionStatus(fileNumber: string) {
let submissionStatus: NoticeOfIntentSubmissionToSubmissionStatusDto | null = null;
-
+ this.routerLink = this.routerLink + fileNumber;
try {
submissionStatus = await this.noticeOfIntentSubmissionStatusService.fetchCurrentStatusByFileNumber(
fileNumber,
@@ -85,8 +87,10 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement
} catch (e) {
console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`);
}
-
if (submissionStatus) {
+ if (submissionStatus.statusTypeCode === NOI_SUBMISSION_STATUS.ALC_DECISION) {
+ this.routerLink = this.routerLink + '/decision'
+ }
this.status = {
backgroundColor: submissionStatus.status.alcsBackgroundColor,
textColor: submissionStatus.status.alcsColor,
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html
index a422479476..07d4990bbc 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html
@@ -237,8 +237,8 @@ Audit
-
-
+
+