From 21e08d90a82ca955d5c2fce46c7ec33a68f7c5ce Mon Sep 17 00:00:00 2001
From: Shashank Shekhar <sh16011993@gmail.com>
Date: Fri, 8 Sep 2023 10:51:33 -0700
Subject: [PATCH] #1978 - Request Offering Change - Student Portal (Patch fix)

The following two scenarios are fixed:
1) Approve application offering change request through the application offering change request dialog.
2)  Text under the Application Details and Request Details headings is only displayed when "In progress with student." They are omitted after the student approves or declines.
---
 .../ApproveApplicationOfferingChangeRequestModal.vue | 12 ++++--------
 .../tabs/RequestedApplicationOfferingDetails.vue     | 12 ++++++------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/sources/packages/web/src/components/students/modals/ApproveApplicationOfferingChangeRequestModal.vue b/sources/packages/web/src/components/students/modals/ApproveApplicationOfferingChangeRequestModal.vue
index 1f2fa1a42e..f6a0f9ca24 100644
--- a/sources/packages/web/src/components/students/modals/ApproveApplicationOfferingChangeRequestModal.vue
+++ b/sources/packages/web/src/components/students/modals/ApproveApplicationOfferingChangeRequestModal.vue
@@ -31,7 +31,7 @@
             ></title-value
           ></content-group-info
         ><v-checkbox
-          v-model="formModel.studentConsent"
+          v-model="approveApplicationOfferingChangeRequestModal.studentConsent"
           label="I agree to the terms and conditions of the StudentAid BC Declaration
           form"
           hide-details="auto"
@@ -50,7 +50,7 @@
 </template>
 <script lang="ts">
 import ModalDialogBase from "@/components/generic/ModalDialogBase.vue";
-import { ref, defineComponent, reactive } from "vue";
+import { ref, defineComponent } from "vue";
 import { useModalDialog } from "@/composables";
 import { StudentApplicationOfferingChangeRequestAPIInDTO } from "@/services/http/dto";
 import { ApplicationOfferingChangeRequestStatus, VForm } from "@/types";
@@ -69,12 +69,9 @@ export default defineComponent({
       {} as StudentApplicationOfferingChangeRequestAPIInDTO,
     );
     const approveApplicationOfferingChangeRequest = ref({} as VForm);
-    const formModel = reactive(
-      {} as StudentApplicationOfferingChangeRequestAPIInDTO,
-    );
     const cancel = () => {
       approveApplicationOfferingChangeRequest.value.reset();
-      formModel.studentConsent = false;
+      approveApplicationOfferingChangeRequestModal.value.studentConsent = false;
       approveApplicationOfferingChangeRequest.value.resetValidation();
       resolvePromise(false);
     };
@@ -86,7 +83,7 @@ export default defineComponent({
       }
       approveApplicationOfferingChangeRequestModal.value.applicationOfferingChangeRequestStatus =
         ApplicationOfferingChangeRequestStatus.InProgressWithSABC;
-      const payload = { ...formModel };
+      const payload = { ...approveApplicationOfferingChangeRequestModal.value };
       resolvePromise(payload);
       approveApplicationOfferingChangeRequest.value.reset();
     };
@@ -95,7 +92,6 @@ export default defineComponent({
       showModal,
       cancel,
       allowChange,
-      formModel,
       approveApplicationOfferingChangeRequest,
       approveApplicationOfferingChangeRequestModal,
     };
diff --git a/sources/packages/web/src/views/student/application-offering-change-request/tabs/RequestedApplicationOfferingDetails.vue b/sources/packages/web/src/views/student/application-offering-change-request/tabs/RequestedApplicationOfferingDetails.vue
index 80264477bf..cdf6d2d653 100644
--- a/sources/packages/web/src/views/student/application-offering-change-request/tabs/RequestedApplicationOfferingDetails.vue
+++ b/sources/packages/web/src/views/student/application-offering-change-request/tabs/RequestedApplicationOfferingDetails.vue
@@ -15,7 +15,7 @@
       </template>
       <hr class="horizontal-divider" />
       <h2 class="category-header-large primary-color">Application Details</h2>
-      <p v-if="changeRequestNotApproved">
+      <p v-if="changeRequestInProgressWithStudent">
         Below displays the requested changes from your institution. You can
         compare your
         <span class="font-bold">active application details</span> by switching
@@ -24,7 +24,7 @@
       <offering-view :offeringId="changeRequest.requestedOfferingId" />
       <hr class="horizontal-divider" />
       <h2 class="category-header-large primary-color">Request details</h2>
-      <p v-if="changeRequestNotApproved">
+      <p v-if="changeRequestInProgressWithStudent">
         Contact your institution for more information if there are no
         differences in the requested change above. There may be proposed changes
         that aren't displayed such as study costs.
@@ -80,17 +80,17 @@ export default defineComponent({
           Location: changeRequest.value.locationName,
         } as Record<string, string>),
     );
-    const changeRequestNotApproved = computed(() => {
+    const changeRequestInProgressWithStudent = computed(() => {
       return (
-        changeRequest.value.status !==
-        ApplicationOfferingChangeRequestStatus.Approved
+        changeRequest.value.status ===
+        ApplicationOfferingChangeRequestStatus.InProgressWithStudent
       );
     });
     return {
       changeRequest,
       studentFullName,
       headerDetailsData,
-      changeRequestNotApproved,
+      changeRequestInProgressWithStudent,
       ApplicationOfferingChangeRequestStatus,
     };
   },