+ env - {{ environment }} | host - {{ host }}
Vue 3 - localhost environment
Vue 3 - DEV environment
-
+
Vue 3 - TEST environment
+
Vue 3 - Environment not recognized
@@ -23,10 +25,13 @@ export default {
dev: "educ-grad-admin",
test: "test.grad.gov.bc.ca",
},
+ host: location.host,
};
},
methods: {
getEnv() {
+ console.log(location);
+ console.log(location.host.includes(this.environments.dev));
//simple solution to display banner to UI that indicates what environment the user is in;
//currently determined via browser URL since this is a simple visual aid for devs and testers
if (
@@ -41,7 +46,7 @@ export default {
}
},
},
- created() {
+ mounted() {
this.getEnv();
},
};
diff --git a/frontend/src/components/SessionExpired.vue b/frontend/src/components/SessionExpired.vue
index 351d276b..b930d436 100644
--- a/frontend/src/components/SessionExpired.vue
+++ b/frontend/src/components/SessionExpired.vue
@@ -20,7 +20,7 @@
color="#003366"
@click="clearStorage"
>Log In
again to continue.
+ >
again to continue.
diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
index bbb19549..951cad81 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
@@ -707,12 +707,34 @@
{{ String(studentGradStatus.recalculateGradStatus) }}
+
+ Recalculate Grad Status: |
+
+
+ |
+
Recalculate Projected Grad: |
{{ String(studentGradStatus.recalculateProjectedGrad) }}
|
+
+ Recalculate Projected Grad: |
+
+
+ |
+
|
@@ -759,6 +781,7 @@ export default {
}),
...mapState(useAccessStore, {
allowUpdateGradStatus: "allowUpdateGradStatus",
+ allowUpdateRecalcFlags: "allowUpdateRecalcFlags",
}),
studentGradeChange() {
return this.editedGradStatus.studentGrade;
@@ -862,6 +885,10 @@ export default {
{ text: "Y", value: "Y" },
{ text: "N", value: "N" },
],
+ recalcFlags: [
+ { text: "Y", value: "Y" },
+ { text: "null", value: null },
+ ],
programsWithExpiry: [
"1986-EN",
"1996-EN",
@@ -1312,6 +1339,16 @@ export default {
"consumerEducationRequirementMet",
this.studentGradStatus.consumerEducationRequirementMet
);
+ this.$set(
+ this.editedGradStatus,
+ "recalculateGradStatus",
+ this.studentGradStatus.recalculateGradStatus
+ );
+ this.$set(
+ this.editedGradStatus,
+ "recalculateProjectedGrad",
+ this.studentGradStatus.recalculateProjectedGrad
+ );
this.validateFields();
},
diff --git a/frontend/src/store/modules/access.js b/frontend/src/store/modules/access.js
index 07edda0d..f4b48ada 100644
--- a/frontend/src/store/modules/access.js
+++ b/frontend/src/store/modules/access.js
@@ -1,8 +1,8 @@
-import { defineStore } from 'pinia';
+import { defineStore } from "pinia";
import ApiService from "@/common/apiService";
import { Routes, Roles } from "@/utils/constants";
-export const useAccessStore = defineStore('access',{
+export const useAccessStore = defineStore("access", {
namespaced: true,
state: () => ({
userAccess: "",
@@ -58,17 +58,20 @@ export const useAccessStore = defineStore('access',{
allowToggleRoutines: (state) => {
return state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR);
},
+ allowUpdateRecalcFlags: (state) => {
+ return state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR);
+ },
},
actions: {
- setUserAccess(userAccess){
+ setUserAccess(userAccess) {
if (userAccess) {
this.userAccess = userAccess;
} else {
this.userAccess = null;
}
},
- setUserRoles(role){
+ setUserRoles(role) {
if (role) {
this.roles = role;
} else {
@@ -76,20 +79,19 @@ export const useAccessStore = defineStore('access',{
}
},
//sets the token required for refreshing expired json web tokens
- logoutState(){
+ logoutState() {
localStorage.removeItem("jwtToken");
this.userAccess = null;
this.isAuthenticated = false;
},
async setAccess() {
-
if (localStorage.getItem("jwtToken")) {
await ApiService.apiAxios
.get(Routes.USER)
.then((response) => {
- this.setUserAccess(response.data.userAccess)
- this.setUserRoles(response.data.userRoles)
+ this.setUserAccess(response.data.userAccess);
+ this.setUserRoles(response.data.userRoles);
})
.catch((e) => {
throw e;