diff --git a/sources/packages/web/src/components/students/applicationTracker/ApplicationProgressBar.vue b/sources/packages/web/src/components/common/applicationTracker/ApplicationProgressBar.vue
similarity index 74%
rename from sources/packages/web/src/components/students/applicationTracker/ApplicationProgressBar.vue
rename to sources/packages/web/src/components/common/applicationTracker/ApplicationProgressBar.vue
index 486ebd66c3..f11ab89e0f 100644
--- a/sources/packages/web/src/components/students/applicationTracker/ApplicationProgressBar.vue
+++ b/sources/packages/web/src/components/common/applicationTracker/ApplicationProgressBar.vue
@@ -1,6 +1,11 @@
-
+
@@ -56,17 +81,17 @@ import {
ApplicationOfferingChangeRequestStatus,
AssessmentTriggerType,
} from "@/types";
-import { PropType, ref, defineComponent, computed, onMounted } from "vue";
+import { ref, defineComponent, computed, onMounted } from "vue";
import { ApplicationProgressDetailsAPIOutDTO } from "@/services/http/dto/Application.dto";
import { ApplicationService } from "@/services/ApplicationService";
import StepperProgressBar from "@/components/common/StepperProgressBar.vue";
-import Draft from "@/components/students/applicationTracker/Draft.vue";
-import Submitted from "@/components/students/applicationTracker/Submitted.vue";
-import InProgress from "@/components/students/applicationTracker/InProgress.vue";
-import Cancelled from "@/components/students/applicationTracker/Cancelled.vue";
-import Assessment from "@/components/students/applicationTracker/Assessment.vue";
-import Enrolment from "@/components/students/applicationTracker/Enrolment.vue";
-import Completed from "@/components/students/applicationTracker/Completed.vue";
+import Draft from "@/components/common/applicationTracker/Draft.vue";
+import Submitted from "@/components/common/applicationTracker/Submitted.vue";
+import InProgress from "@/components/common/applicationTracker/InProgress.vue";
+import Cancelled from "@/components/common/applicationTracker/Cancelled.vue";
+import Assessment from "@/components/common/applicationTracker/Assessment.vue";
+import Enrolment from "@/components/common/applicationTracker/Enrolment.vue";
+import Completed from "@/components/common/applicationTracker/Completed.vue";
interface StatusIconDetails {
statusType: "success" | "warning" | "error";
@@ -108,9 +133,10 @@ export default defineComponent({
type: Number,
required: true,
},
- applicationStatus: {
- type: String as PropType,
- required: true,
+ areApplicationActionsAllowed: {
+ type: Boolean,
+ required: false,
+ default: false,
},
},
setup(props) {
@@ -178,18 +204,21 @@ export default defineComponent({
const trackerApplicationStatus = computed(() =>
applicationTrackerLabels.findIndex(
- (status) => status === props.applicationStatus,
+ (status) =>
+ status === applicationProgressDetails.value.applicationStatus,
),
);
const disabled = computed(
- () => props.applicationStatus === ApplicationStatus.Draft,
+ () =>
+ applicationProgressDetails.value.applicationStatus ===
+ ApplicationStatus.Draft,
);
const thumbSize = computed(() =>
// thumbSize is 0 for all the status except draft and submitted.
[ApplicationStatus.Draft, ApplicationStatus.Submitted].includes(
- props.applicationStatus,
+ applicationProgressDetails.value.applicationStatus,
)
? INITIAL_THUMB_SIZE
: DEFAULT_THUMB_SIZE,
diff --git a/sources/packages/web/src/components/students/applicationTracker/Assessment.vue b/sources/packages/web/src/components/common/applicationTracker/Assessment.vue
similarity index 81%
rename from sources/packages/web/src/components/students/applicationTracker/Assessment.vue
rename to sources/packages/web/src/components/common/applicationTracker/Assessment.vue
index 976a90c48c..4ef3c2e75f 100644
--- a/sources/packages/web/src/components/students/applicationTracker/Assessment.vue
+++ b/sources/packages/web/src/components/common/applicationTracker/Assessment.vue
@@ -17,8 +17,8 @@
diff --git a/sources/packages/web/src/components/students/applicationTracker/Enrolment.vue b/sources/packages/web/src/components/common/applicationTracker/Enrolment.vue
similarity index 86%
rename from sources/packages/web/src/components/students/applicationTracker/Enrolment.vue
rename to sources/packages/web/src/components/common/applicationTracker/Enrolment.vue
index 4087d84ebe..34b9fe9787 100644
--- a/sources/packages/web/src/components/students/applicationTracker/Enrolment.vue
+++ b/sources/packages/web/src/components/common/applicationTracker/Enrolment.vue
@@ -22,9 +22,9 @@ import { COEStatus, AssessmentTriggerType } from "@/types";
import { onMounted, ref, defineComponent } from "vue";
import { ApplicationService } from "@/services/ApplicationService";
import { EnrolmentApplicationDetailsAPIOutDTO } from "@/services/http/dto/Application.dto";
-import DisbursementBanner from "@/components/students/applicationTracker/DisbursementBanner.vue";
-import MultipleDisbursementBanner from "@/components/students/applicationTracker/MultipleDisbursementBanner.vue";
-import RelatedApplicationChanged from "@/components/students/applicationTracker/RelatedApplicationChanged.vue";
+import DisbursementBanner from "@/components/common/applicationTracker/DisbursementBanner.vue";
+import MultipleDisbursementBanner from "@/components/common/applicationTracker/MultipleDisbursementBanner.vue";
+import RelatedApplicationChanged from "@/components/common/applicationTracker/RelatedApplicationChanged.vue";
export default defineComponent({
components: {
diff --git a/sources/packages/web/src/components/students/applicationTracker/InProgress.vue b/sources/packages/web/src/components/common/applicationTracker/InProgress.vue
similarity index 98%
rename from sources/packages/web/src/components/students/applicationTracker/InProgress.vue
rename to sources/packages/web/src/components/common/applicationTracker/InProgress.vue
index 7d992323f2..0ae9699bcd 100644
--- a/sources/packages/web/src/components/students/applicationTracker/InProgress.vue
+++ b/sources/packages/web/src/components/common/applicationTracker/InProgress.vue
@@ -240,7 +240,7 @@
/>
diff --git a/sources/packages/web/src/views/student/StudentApplicationDetails.vue b/sources/packages/web/src/views/student/StudentApplicationDetails.vue
index 97ddb74e00..62c98b0d0b 100644
--- a/sources/packages/web/src/views/student/StudentApplicationDetails.vue
+++ b/sources/packages/web/src/views/student/StudentApplicationDetails.vue
@@ -51,8 +51,8 @@
@@ -86,7 +86,7 @@ import {
} from "@/composables";
import { ApplicationStatus, MenuType } from "@/types";
import { ApplicationDataAPIOutDTO } from "@/services/http/dto";
-import ApplicationProgressBar from "@/components/students/applicationTracker/ApplicationProgressBar.vue";
+import ApplicationProgressBar from "@/components/common/applicationTracker/ApplicationProgressBar.vue";
import ConfirmEditApplication from "@/components/students/modals/ConfirmEditApplication.vue";
import DetailHeader from "@/components/generic/DetailHeader.vue";
import StudentAssessmentDetails from "@/components/students/StudentAssessmentDetails.vue";