Add support for funding application flags and improve date handling

Introduces saveFundingApplicationFlags action and updates SelectedAppHeader to handle funding application routes. Adjusts ApprenticeshipTrainingForm to use classes_start_date and classes_end_date fields, and recalculates weeks when these change. Updates router and store to support sidebar visibility for funding applications and adds logging for sidebar state changes.

Author: datajohnson

src/web/src/components/SelectedAppHeader.vue

@@ -48,9 +48,13 @@ export default {
     },
   },
   methods: {
-    ...mapActions(["saveApplicationFlags"]),
+    ...mapActions(["saveApplicationFlags", "saveFundingApplicationFlags"]),
     saveFlags() {
-      this.saveApplicationFlags(this.flags);
+
+      if (this.$route.path.includes("funding-application"))
+        this.saveFundingApplicationFlags(this.flags);
+      else
+        this.saveApplicationFlags(this.flags);
     },
   },
 };

src/web/src/components/application/assessments/views/WUP-Apprenticeship.vue

@@ -210,15 +210,11 @@ export default {
     this.applicationId = this.$route.params.id;
     this.fundingRequestId = this.$route.params.fundingRequestId;
     this.assessmentId = this.$route.params.assessmentId;
-    store.dispatch("setAppSidebar", true);
 
     let storeApp = store.getters.selectedApplication;
     if (this.applicationId != storeApp.HISTORY_DETAIL_ID) {
       await store.dispatch("loadFundingApplication", this.applicationId);
     }
-    store.dispatch("setAppSidebar", true);
-
-
     this.loadStatus()
     this.loadReasons()
 

src/web/src/components/application/wup-funding-requests/apprenticeship-training-support/ApprenticeshipTrainingForm.vue

@@ -144,11 +144,11 @@
             class="mt-0 mb-5" hide-details @change="saveItem" />
           <v-row class="mb-1">
             <v-col cols="12" md="3">
-              <v-text-field :value="formatDate(fundingRequest.json_data.from_date)" label="From" dense outlined
+              <v-text-field :value="formatDate(fundingRequest.json_data.classes_start_date)" label="From" dense outlined
                 background-color="#ddd" append-icon="mdi-lock" hide-details readonly />
             </v-col>
             <v-col cols="12" md="3">
-              <v-text-field :value="formatDate(fundingRequest.json_data.to_date)" label="To" dense outlined
+              <v-text-field :value="formatDate(fundingRequest.json_data.classes_end_date)" label="To" dense outlined
                 background-color="#ddd" append-icon="mdi-lock" hide-details readonly />
             </v-col>
             <v-col cols="12" md="3">
@@ -316,15 +316,6 @@ export default {
     fundingRequest() {
       const myRequest = this.application?.funding_requests?.find((fr) => fr.request_type_id === 51);
 
-      if (myRequest && myRequest.json_data != null) {
-        myRequest.json_data.from_date = this.application.classes_start_date;
-        myRequest.json_data.to_date = this.application.classes_end_date;
-        myRequest.json_data.weeks = weeksBetween(
-          this.application.classes_start_date,
-          this.application.classes_end_date
-        );
-      }
-
       this.hasFundingRequest = !!myRequest;
       return myRequest;
     },
@@ -334,12 +325,14 @@ export default {
     },
   },
   watch: {
-    /*  "fundingRequest.json_data": {
+    "fundingRequest.json_data": {
       deep: true,
       handler(newVal) {
-        console.log("Funding request JSON data changed:", newVal);
+        if (newVal && newVal.classes_start_date && newVal.classes_end_date) {
+          newVal.weeks = weeksBetween(newVal.classes_start_date, newVal.classes_end_date);
+        }
       },
-    }, */
+    },
   },
   async mounted() {
     await this.loadInstitutions();

src/web/src/router/index.js

@@ -421,6 +421,7 @@ router.beforeEach(async (to, from, next) => {
   store.dispatch(
     "setAppSidebar",
     to.path.startsWith("/application") ||
+    to.path.startsWith("/funding-application") ||
       to.path.startsWith("/student") ||
       to.path.startsWith("/communications-log")
   );

src/web/src/store/index.js

@@ -289,6 +289,7 @@ export default new Vuex.Store({
   },
   actions: {
     setAppSidebar(state, value) {
+      console.log("Setting sidebar to", value);
       state.commit("SET_SIDEBAR", value);
     },
     setAppSideBarAdmin(state, value) {
@@ -715,6 +716,24 @@ export default new Vuex.Store({
           //emitter.$emit("showError", err.data.messages[0].text);
         });
     },
+    saveFundingApplicationFlags({ state, dispatch }, vals) {
+      let val = vals.join(",").trim();
+
+      axios
+        .put(`${FUNDING_APPLICATION_URL}/${state.selectedApplicationId}`, {
+          flags: val,
+        })
+        .then((resp) => {
+          dispatch("loadFundingApplication", state.selectedApplicationId);
+          //let message = resp.data.messages[0];
+          //if (message.variant == "success") emitter.$emit("showSuccess", message.text);
+          //else emitter.$emit("showError", message.text);
+        })
+        .catch((err) => {
+          console.log("ERROR HAPPENED", err);
+          //emitter.$emit("showError", err.data.messages[0].text);
+        });
+    },
     loadFlagOptions({ commit }) {
       axios.get(`${APPLICATION_URL}/flags`).then((resp) => {
         commit("SET_FLAGOPTIONS", resp.data.data);