From aeacd3cf5dd78f2e8f21b82fdc6cb45e363dea80 Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Fri, 20 Dec 2024 13:50:43 -0800
Subject: [PATCH 1/9] wip fix ccfri closure dates

---
 .../ccfriApplication/group/AddNewFees.vue     | 150 ++++++------------
 frontend/src/utils/constants.js               |   5 +
 2 files changed, 56 insertions(+), 99 deletions(-)

diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index 9b502090..052f9cce 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -1,7 +1,7 @@
 <template>
   <v-form ref="isValidForm" v-model="isValidForm">
     <v-container class="px-10">
-      <div align="center">
+      <div class="text-center">
         <div class="text-h5">
           Child Care Operating Funding Program - {{ formattedProgramYear }} Program Confirmation Form
         </div>
@@ -119,7 +119,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="April"
+                        label="Apr"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeApr')"
@@ -145,7 +145,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="June"
+                        label="Jun"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeJun')"
@@ -158,7 +158,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="July"
+                        label="Jul"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeJul')"
@@ -171,7 +171,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="August"
+                        label="Aug"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeAug')"
@@ -184,7 +184,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="September"
+                        label="Sep"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeSep')"
@@ -200,7 +200,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="October"
+                        label="Oct"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeOct')"
@@ -213,7 +213,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="November"
+                        label="Nov"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeNov')"
@@ -226,7 +226,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="December"
+                        label="Dec"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeDec')"
@@ -265,7 +265,7 @@
                         :disabled="isReadOnly"
                         variant="outlined"
                         :rules="feeRules"
-                        label="March"
+                        label="Mar"
                         prefix="$"
                         @wheel="$event.target.blur()"
                         @update:model-value="convertBlankNumberToNull(item, 'approvedFeeMar')"
@@ -313,13 +313,13 @@
             </div>
             <v-radio-group v-model="CCFRIFacilityModel.hasClosureFees" required :disabled="isReadOnly" :rules="rules">
               <br />
-              <v-radio label="Yes" :value="100000000" />
-              <v-radio label="No" :value="100000001" />
+              <v-radio label="Yes" :value="CCFRI_HAS_CLOSURE_FEE_TYPES.YES" />
+              <v-radio label="No" :value="CCFRI_HAS_CLOSURE_FEE_TYPES.NO" />
             </v-radio-group>
 
             <v-row v-if="closureFees == 'Yes' || CCFRIFacilityModel.hasClosureFees == 100000000">
               <v-row v-for="(obj, index) in CCFRIFacilityModel.dates" :key="index" color="#003366">
-                <v-col color="#003366" class="col-md-1 col-12 mx-0">
+                <v-col color="#003366" cols="auto">
                   <v-icon
                     :disabled="isReadOnly"
                     size="large"
@@ -331,73 +331,33 @@
                   </v-icon>
                 </v-col>
 
-                <v-col class="col-md-3 col-12">
-                  <v-menu
-                    v-model="obj.calendarMenu1"
-                    :close-on-content-click="false"
-                    :nudge-right="40"
-                    transition="scale-transition"
-                    offset-y
-                    min-width="auto"
-                  >
-                    <template #activator="{ props }">
-                      <v-text-field
-                        v-model="obj.formattedStartDate"
-                        :disabled="isReadOnly"
-                        variant="outlined"
-                        :rules="rules"
-                        label="Select Start Date (YYYY-MM-DD)"
-                        readonly
-                        v-bind="props"
-                        @click="updateChosenDates()"
-                      />
-                    </template>
-                    <v-date-picker
-                      v-model="obj.formattedStartDate"
-                      :min="fiscalStartAndEndDates.startDate"
-                      :max="fiscalStartAndEndDates.endDate"
-                      :allowed-dates="allowedDates"
-                      clearable
-                      @input="obj.calendarMenu1 = false"
-                    />
-                  </v-menu>
+                <v-col cols="12" md="3">
+                  <AppDateInput
+                    v-model="obj.formattedStartDate"
+                    :min="fiscalStartAndEndDates.startDate"
+                    :max="fiscalStartAndEndDates.endDate"
+                    :rules="rules.required"
+                    :disabled="isReadOnly"
+                    :hide-details="isReadOnly"
+                    label="Date"
+                    clearable
+                  />
                 </v-col>
 
-                <v-col class="col-md-3 col-12">
-                  <v-menu
-                    v-model="obj.calendarMenu2"
-                    :close-on-content-click="false"
-                    :nudge-right="40"
-                    transition="scale-transition"
-                    offset-y
-                    min-width="auto"
-                  >
-                    <template #activator="{ props }">
-                      <v-text-field
-                        v-model="obj.formattedEndDate"
-                        :disabled="isReadOnly"
-                        variant="outlined"
-                        required
-                        label="Select End Date (YYYY-MM-DD)"
-                        readonly
-                        :rules="rules"
-                        v-bind="props"
-                        @click="updateChosenDates()"
-                      />
-                    </template>
-                    <v-date-picker
-                      v-model="obj.formattedEndDate"
-                      clearable
-                      :min="obj.formattedStartDate"
-                      :max="fiscalStartAndEndDates.endDate"
-                      :allowed-dates="allowedDates"
-                      @input="obj.calendarMenu2 = false"
-                      @click:date="isDateLegal(obj)"
-                    />
-                  </v-menu>
+                <v-col cols="12" md="3">
+                  <AppDateInput
+                    v-model="obj.formattedEndDate"
+                    :min="obj.formattedStartDate"
+                    :max="fiscalStartAndEndDates.endDate"
+                    :rules="rules.required"
+                    :disabled="isReadOnly"
+                    :hide-details="isReadOnly"
+                    clearable
+                    @input="isDateLegal(obj)"
+                  />
                 </v-col>
 
-                <v-col class="col-md-3 col-12">
+                <v-col cols="12" md="2">
                   <v-text-field
                     v-model="obj.closureReason"
                     :disabled="isReadOnly"
@@ -409,14 +369,11 @@
                   />
                 </v-col>
 
-                <v-col class="col-md-2 col-12 mt-n10">
-                  <v-radio-group
-                    v-model="obj.feesPaidWhileClosed"
-                    :disabled="isReadOnly"
-                    inline
-                    label="Did parents pay for this closure?"
-                    :rules="dateRules"
+                <v-col cols="12" md="3">
+                  <span style="color: grey; font-style: normal; font-family: BCSans; font-size: 14px"
+                    >Did parents pay for this closure?</span
                   >
+                  <v-radio-group v-model="obj.feesPaidWhileClosed" :disabled="isReadOnly" inline :rules="dateRules">
                     <v-radio label="Yes" :value="1" />
                     <v-radio label="No" :value="0" />
                   </v-radio-group>
@@ -565,6 +522,7 @@ import { useReportChangesStore } from '@/store/reportChanges.js';
 
 import NavButton from '@/components/util/NavButton.vue';
 import FacilityHeader from '@/components/guiComponents/FacilityHeader.vue';
+import AppDateInput from '@/components/guiComponents/AppDateInput.vue';
 
 import {
   PATHS,
@@ -575,6 +533,7 @@ import {
   CHANGE_TYPES,
   PROGRAM_YEAR_LANGUAGE_TYPES,
   ApiRoutes,
+  CCFRI_HAS_CLOSURE_FEE_TYPES,
 } from '@/utils/constants.js';
 import alertMixin from '@/mixins/alertMixin.js';
 import globalMixin from '@/mixins/globalMixin.js';
@@ -597,7 +556,7 @@ function dateFunction(date1, date2) {
 }
 
 export default {
-  components: { NavButton, FacilityHeader },
+  components: { NavButton, FacilityHeader, AppDateInput },
   mixins: [alertMixin, globalMixin],
   beforeRouteLeave(_to, _from, next) {
     this.save(false);
@@ -609,8 +568,6 @@ export default {
       closureFees: 'No',
       prevFeesCorrect: undefined,
       dateObj: {
-        datePicker1: undefined,
-        datePicker2: undefined,
         closureReason: '',
         feesPaidWhileClosed: undefined,
       },
@@ -671,11 +628,6 @@ export default {
       return PROGRAM_YEAR_LANGUAGE_TYPES;
     },
     currentFacility() {
-      // if (this.getNavByCCFRIId(this.$route.params.urlGuid)){
-      //   return this.getNavByCCFRIId(this.$route.params.urlGuid);
-      // }
-      // //if viewing historical CR - getNavByCCFRID will not work because fac won't be in userProfile. Load from navBarList instead
-      // else
       return this.navBarList.find((el) => el.ccfriApplicationId == this.$route.params.urlGuid);
     },
     fundingUrl() {
@@ -709,25 +661,22 @@ export default {
           await this.loadCCFRIFacility(this.$route.params.urlGuid);
           await this.decorateWithCareTypes(this.currentFacility.facilityId);
           this.loadCCFisCCRIMedian(); //this can be async. no need to wait.
-
           this.prevFeesCorrect = this.CCFRIFacilityModel.existingFeesCorrect == 100000000 ? 'Yes' : 'No';
-          if (this.getClosureDateLength > 0) {
-            //this.closureFees = 'Yes';
-          }
           this.pastCcfriGuid = cloneDeep(this.$route.params.urlGuid);
           this.updateChosenDates();
           this.loading = false;
         } catch (error) {
           console.log(error);
           this.setFailureAlert('An error occured while getting.');
-          //this solves for the edge case bug where fees that need to be deleted cannot be deleted because the GUID has not been loaded from dynamics
-          // window.location.reload(); //TODO-RLO: removed this, review with Jen
         }
       },
       immediate: true,
       deep: true,
     },
   },
+  created() {
+    this.CCFRI_HAS_CLOSURE_FEE_TYPES = CCFRI_HAS_CLOSURE_FEE_TYPES;
+  },
   methods: {
     ...mapActions(useCcfriAppStore, [
       'saveCcfri',
@@ -761,6 +710,7 @@ export default {
       });
     },
     isDateLegal(obj) {
+      console.log(obj);
       let dates = dateFunction(obj.formattedStartDate, obj.formattedEndDate);
       obj.isIllegal = false;
 
@@ -847,8 +797,10 @@ export default {
       this.$refs.isValidForm?.validate();
     },
     isFormComplete() {
-      //100000000 == YES
-      if (this.CCFRIFacilityModel.hasClosureFees == 100000000 && this.CCFRIFacilityModel.dates.length === 0) {
+      if (
+        this.CCFRIFacilityModel.hasClosureFees === CCFRI_HAS_CLOSURE_FEE_TYPES.YES &&
+        this.CCFRIFacilityModel.dates.length === 0
+      ) {
         return false;
       }
       return this.isValidForm; //false makes button clickable, true disables button
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index a0ee77bb..ae198953 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -169,6 +169,11 @@ export const NAV_BAR_GROUPS = {
   MTFI: 'MTFI',
 };
 
+export const CCFRI_HAS_CLOSURE_FEE_TYPES = {
+  YES: 100000000,
+  NO: 100000001,
+};
+
 export const ORGANIZATION_PROVIDER_TYPES_IDS = {
   GROUP: 100000000,
   FAMILY: 100000001,

From c18921bec445e901940c45992e8fb65eb589e93a Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:20:14 -0800
Subject: [PATCH 2/9] fix closure dates to work with vue 3. Also fixed the
 closure date layout on the summary dec page

---
 .../ccfriApplication/group/AddNewFees.vue     |  4 +-
 .../components/summary/group/CCFRISummary.vue | 96 +++++++++----------
 2 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index 052f9cce..562c2f6d 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -357,7 +357,7 @@
                   />
                 </v-col>
 
-                <v-col cols="12" md="2">
+                <v-col cols="12" md="3">
                   <v-text-field
                     v-model="obj.closureReason"
                     :disabled="isReadOnly"
@@ -369,7 +369,7 @@
                   />
                 </v-col>
 
-                <v-col cols="12" md="3">
+                <v-col cols="12" md="2" class="mt-n1">
                   <span style="color: grey; font-style: normal; font-family: BCSans; font-size: 14px"
                     >Did parents pay for this closure?</span
                   >
diff --git a/frontend/src/components/summary/group/CCFRISummary.vue b/frontend/src/components/summary/group/CCFRISummary.vue
index 62ca875f..554572c1 100644
--- a/frontend/src/components/summary/group/CCFRISummary.vue
+++ b/frontend/src/components/summary/group/CCFRISummary.vue
@@ -287,55 +287,49 @@
                   />
                 </v-col>
               </v-row>
-              <v-row v-if="ccfri.hasClosureFees == 100000000">
-                <v-col class="col-md-3 col-12">
-                  <span class="summary-label">Closure Start Date</span>
-                </v-col>
-                <v-col class="col-md-3 col-12">
-                  <span class="summary-label">End Date</span>
-                </v-col>
-                <v-col class="col-md-3 col-12">
-                  <span class="summary-label">Reason</span>
-                </v-col>
-                <v-col class="col-md-3 col-12">
-                  <span class="summary-label">Did parents pay for this closure?</span>
-                </v-col>
-                <v-row v-for="(obj, index) in ccfri.dates" :key="index">
+              <template v-if="ccfri.hasClosureFees == CCFRI_HAS_CLOSURE_FEE_TYPES.YES">
+                <v-row>
+                  <v-col class="col-md-3 col-12">
+                    <span class="summary-label">Closure Start Date</span>
+                  </v-col>
+                  <v-col class="col-md-3 col-12">
+                    <span class="summary-label">End Date</span>
+                  </v-col>
                   <v-col class="col-md-3 col-12">
-                    <v-menu v-model="obj.calendarMenu1" :nudge-right="40" min-width="auto">
-                      <template #activator="{ props }">
-                        <v-text-field
-                          v-model="obj.formattedStartDate"
-                          placeholder="Required"
-                          density="compact"
-                          flat
-                          variant="solo"
-                          hide-details
-                          :rules="rules.required"
-                          readonly
-                          v-bind="props"
-                        />
-                      </template>
-                    </v-menu>
+                    <span class="summary-label">Reason</span>
+                  </v-col>
+                  <v-col class="col-md-3 col-12">
+                    <span class="summary-label">Did parents pay for this closure?</span>
+                  </v-col>
+                </v-row>
+                <v-row v-for="(obj, index) in ccfri.dates" :key="index">
+                  <v-col class="col-md-3 col-12 px-0">
+                    <v-text-field
+                      v-model="obj.formattedStartDate"
+                      placeholder="Required"
+                      density="compact"
+                      flat
+                      variant="solo"
+                      hide-details
+                      :rules="rules.required"
+                      readonly
+                      v-bind="props"
+                    />
                   </v-col>
 
                   <v-col class="col-md-3 col-12">
-                    <v-menu v-model="obj.calendarMenu2" :nudge-right="40" min-width="auto">
-                      <template #activator="{ props }">
-                        <v-text-field
-                          v-model="obj.formattedEndDate"
-                          placeholder="Required"
-                          density="compact"
-                          flat
-                          variant="solo"
-                          hide-details
-                          required
-                          readonly
-                          :rules="rules.required"
-                          v-bind="props"
-                        />
-                      </template>
-                    </v-menu>
+                    <v-text-field
+                      v-model="obj.formattedEndDate"
+                      placeholder="Required"
+                      density="compact"
+                      flat
+                      variant="solo"
+                      hide-details
+                      required
+                      readonly
+                      :rules="rules.required"
+                      v-bind="props"
+                    />
                   </v-col>
 
                   <v-col class="col-md-3 col-12">
@@ -365,7 +359,7 @@
                   </v-col>
                 </v-row>
                 <!-- end v for-->
-              </v-row>
+              </template>
               <!-- end v if -->
             </v-col>
           </v-row>
@@ -391,7 +385,6 @@
                 >Is there any other information about this facility you would like us to know?</span
               >
               <v-textarea
-                label="--"
                 class="col-12 summary-value-small"
                 :model-value="ccfri.ccfriApplicationNotes"
                 density="compact"
@@ -426,7 +419,7 @@
 <script>
 import _ from 'lodash';
 import { isChangeRequest } from '@/utils/common.js';
-import { PATHS, pcfUrlGuid, pcfUrl, changeUrl, changeUrlGuid } from '@/utils/constants.js';
+import { PATHS, pcfUrlGuid, pcfUrl, changeUrl, changeUrlGuid, CCFRI_HAS_CLOSURE_FEE_TYPES } from '@/utils/constants.js';
 import rules from '@/utils/rules.js';
 import { mapActions, mapState } from 'pinia';
 import globalMixin from '@/mixins/globalMixin.js';
@@ -564,6 +557,9 @@ export default {
       },
     },
   },
+  created() {
+    this.CCFRI_HAS_CLOSURE_FEE_TYPES = CCFRI_HAS_CLOSURE_FEE_TYPES;
+  },
   methods: {
     ...mapActions(useSummaryDeclarationStore, ['setIsLoadingComplete']),
     getRoutingPath() {
@@ -580,9 +576,9 @@ export default {
       }
     },
     getClosureFees(value) {
-      if (value === 100000000) {
+      if (value === CCFRI_HAS_CLOSURE_FEE_TYPES.YES) {
         return 'Yes';
-      } else if (value === 100000001) {
+      } else if (value === CCFRI_HAS_CLOSURE_FEE_TYPES.NO) {
         return 'No';
       }
     },

From 6a28b889b819986b82527de7fb61f3ffcd25899d Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Mon, 23 Dec 2024 10:34:57 -0800
Subject: [PATCH 3/9] wip

---
 .../src/components/SummaryDeclaration.vue     | 11 +++
 .../ccfriApplication/group/AddNewFees.vue     | 72 ++++++++-----------
 .../components/summary/group/CCFRISummary.vue | 36 +++++++---
 frontend/src/components/util/NavBar.vue       |  2 +
 frontend/src/utils/constants.js               |  5 ++
 5 files changed, 72 insertions(+), 54 deletions(-)

diff --git a/frontend/src/components/SummaryDeclaration.vue b/frontend/src/components/SummaryDeclaration.vue
index bc1d4319..e191a562 100644
--- a/frontend/src/components/SummaryDeclaration.vue
+++ b/frontend/src/components/SummaryDeclaration.vue
@@ -440,6 +440,8 @@
           </v-row>
         </v-card>
       </v-row>
+      {{ !isPageComplete() }}
+      {{ isReadOnly }}
       <NavButton
         v-if="!printableVersion"
         :is-submit-displayed="true"
@@ -649,6 +651,7 @@ export default {
       return this.summaryModel?.facilities?.length > 0;
     },
     isSummaryComplete() {
+      console.log('len? ', this.invalidSummaryForms.length);
       return this.invalidSummaryForms.length < 1;
     },
     allFacilitiesApproved() {
@@ -747,6 +750,10 @@ export default {
     ...mapActions(useOrganizationStore, ['setIsOrganizationComplete']),
     ...mapActions(useReportChangesStore, ['getChangeRequestList', 'setCRIsLicenseComplete', 'setCRIsEceweComplete']),
     isPageComplete() {
+      console.log('is it complete here? ', this.isSummaryComplete);
+      console.log(this.model.agreeConsentCertify && this.model.orgContactName && this.isSummaryComplete);
+      console.log(this.canSubmit);
+
       if (
         (this.model.agreeConsentCertify && this.model.orgContactName && this.isSummaryComplete) ||
         (this.canSubmit && this.model.orgContactName && this.model.agreeConsentCertify)
@@ -885,9 +892,13 @@ export default {
       this.$router.push(this.previousPath);
     },
     async isFormComplete(formObj, isComplete) {
+      console.log(formObj);
+      console.log(isComplete);
       if (!isComplete) {
         this.invalidSummaryForms.push(formObj);
       }
+
+      console.log(this.invalidSummaryForms);
       this.updateNavBarStatus(formObj, isComplete);
     },
     expandAllPanels() {
diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index 562c2f6d..9a74d49d 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -47,7 +47,7 @@
               <p class="text-h5 text--primary">Are the previous year's fees correct for this facility?</p>
               <br />
 
-              <v-radio-group v-model="prevFeesCorrect" required :disabled="true" :rules="rules">
+              <v-radio-group v-model="prevFeesCorrect" required :disabled="true" :rules="rules.required">
                 <v-radio label="Yes" value="Yes" />
                 <v-radio label="No" value="No" />
               </v-radio-group>
@@ -75,14 +75,10 @@
               </div>
               <div class="px-md-12 px-7">
                 <br />
-                <!-- <p class="text-h6 text--primary">
-                    Are your parent fees
 
-                  </p> -->
-                <!-- qqq: {{childCareTypes[index].approvedFeeApr}} -->
                 <v-radio-group
                   v-model="item.feeFrequency"
-                  :rules="rules"
+                  :rules="rules.required"
                   label="Parent fee frequency"
                   :disabled="isReadOnly"
                 >
@@ -111,8 +107,6 @@
                   </v-row>
                   <v-row>
                     <v-col class="col-6 col-md-2">
-                      <!-- childCareTypes[index].approvedFeeApr
-                      I think I can replace all the model with childCareTypes data... I'd like to test and make sure it doesn't break if fees do not exist yet.-->
                       <v-text-field
                         v-model.number="item.approvedFeeApr"
                         type="number"
@@ -311,15 +305,20 @@
                 statutory holidays)? Only indicate the date of closures where parent fees are charged.
               </p>
             </div>
-            <v-radio-group v-model="CCFRIFacilityModel.hasClosureFees" required :disabled="isReadOnly" :rules="rules">
+            <v-radio-group
+              v-model="CCFRIFacilityModel.hasClosureFees"
+              required
+              :disabled="isReadOnly"
+              :rules="rules.required"
+            >
               <br />
               <v-radio label="Yes" :value="CCFRI_HAS_CLOSURE_FEE_TYPES.YES" />
               <v-radio label="No" :value="CCFRI_HAS_CLOSURE_FEE_TYPES.NO" />
             </v-radio-group>
 
-            <v-row v-if="closureFees == 'Yes' || CCFRIFacilityModel.hasClosureFees == 100000000">
+            <v-row v-if="closureFees == 'Yes' || CCFRIFacilityModel.hasClosureFees === CCFRI_FEE_CORRECT_TYPES.YES">
               <v-row v-for="(obj, index) in CCFRIFacilityModel.dates" :key="index" color="#003366">
-                <v-col color="#003366" cols="auto">
+                <v-col color="#003366" cols="auto" xl="1">
                   <v-icon
                     :disabled="isReadOnly"
                     size="large"
@@ -364,8 +363,7 @@
                     label="Closure Reason"
                     variant="outlined"
                     clearable
-                    :rules="rules"
-                    color="red"
+                    :rules="rules.required"
                   />
                 </v-col>
 
@@ -373,7 +371,12 @@
                   <span style="color: grey; font-style: normal; font-family: BCSans; font-size: 14px"
                     >Did parents pay for this closure?</span
                   >
-                  <v-radio-group v-model="obj.feesPaidWhileClosed" :disabled="isReadOnly" inline :rules="dateRules">
+                  <v-radio-group
+                    v-model="obj.feesPaidWhileClosed"
+                    :disabled="isReadOnly"
+                    inline
+                    :rules="rules.required"
+                  >
                     <v-radio label="Yes" :value="1" />
                     <v-radio label="No" :value="0" />
                   </v-radio-group>
@@ -407,9 +410,6 @@
                     </v-card-text>
                   </v-card>
                 </v-row>
-                <!-- <v-card color="red" > It appears that the closure start and end dates you've selected for this facility overlap with dates you've previously selected. Please review your existing Facility closure dates to ensure consistency and avoid any potential overlap of Facility closure dates. </v-card>
-                </v-row> -->
-
                 <v-divider />
               </v-row>
               <!-- end v for-->
@@ -523,6 +523,7 @@ import { useReportChangesStore } from '@/store/reportChanges.js';
 import NavButton from '@/components/util/NavButton.vue';
 import FacilityHeader from '@/components/guiComponents/FacilityHeader.vue';
 import AppDateInput from '@/components/guiComponents/AppDateInput.vue';
+import rules from '@/utils/rules.js';
 
 import {
   PATHS,
@@ -534,6 +535,7 @@ import {
   PROGRAM_YEAR_LANGUAGE_TYPES,
   ApiRoutes,
   CCFRI_HAS_CLOSURE_FEE_TYPES,
+  CCFRI_FEE_CORRECT_TYPES,
 } from '@/utils/constants.js';
 import alertMixin from '@/mixins/alertMixin.js';
 import globalMixin from '@/mixins/globalMixin.js';
@@ -543,9 +545,9 @@ function dateFunction(date1, date2) {
   const startDate = new Date(date1);
   const endDate = new Date(date2);
 
-  let dates = [];
+  const dates = [];
 
-  let currentDate = new Date(startDate.getTime());
+  const currentDate = new Date(startDate.getTime());
 
   while (currentDate <= endDate) {
     dates.push(currentDate.toISOString().substring(0, 10));
@@ -564,6 +566,7 @@ export default {
   },
   data() {
     return {
+      rules,
       pastCcfriGuid: undefined,
       closureFees: 'No',
       prevFeesCorrect: undefined,
@@ -587,10 +590,6 @@ export default {
         (v) => v <= 9999 || 'Max fee is $9999.00',
         (v) => v >= 0 || 'Input a positve number',
       ],
-
-      rules: [(v) => !!v || 'Required.'],
-      calenderRules: [(v) => !!v || 'Required.'],
-      dateRules: [(v) => typeof v === 'number' || 'Required.'],
     };
   },
   computed: {
@@ -661,7 +660,8 @@ export default {
           await this.loadCCFRIFacility(this.$route.params.urlGuid);
           await this.decorateWithCareTypes(this.currentFacility.facilityId);
           this.loadCCFisCCRIMedian(); //this can be async. no need to wait.
-          this.prevFeesCorrect = this.CCFRIFacilityModel.existingFeesCorrect == 100000000 ? 'Yes' : 'No';
+          this.prevFeesCorrect =
+            this.CCFRIFacilityModel.existingFeesCorrect === CCFRI_FEE_CORRECT_TYPES.YES ? 'Yes' : 'No';
           this.pastCcfriGuid = cloneDeep(this.$route.params.urlGuid);
           this.updateChosenDates();
           this.loading = false;
@@ -676,6 +676,7 @@ export default {
   },
   created() {
     this.CCFRI_HAS_CLOSURE_FEE_TYPES = CCFRI_HAS_CLOSURE_FEE_TYPES;
+    this.CCFRI_FEE_CORRECT_TYPES = CCFRI_FEE_CORRECT_TYPES;
   },
   methods: {
     ...mapActions(useCcfriAppStore, [
@@ -710,8 +711,7 @@ export default {
       });
     },
     isDateLegal(obj) {
-      console.log(obj);
-      let dates = dateFunction(obj.formattedStartDate, obj.formattedEndDate);
+      const dates = dateFunction(obj.formattedStartDate, obj.formattedEndDate);
       obj.isIllegal = false;
 
       dates.forEach((date) => {
@@ -806,32 +806,24 @@ export default {
       return this.isValidForm; //false makes button clickable, true disables button
     },
     hasModelChanged() {
-      if (isEqual(this.CCFRIFacilityModel, this.loadedModel)) {
-        console.info('no model changes');
-        return false;
-      } else {
-        console.info('change in the model!');
-      }
-      return true;
+      return !isEqual(this.CCFRIFacilityModel, this.loadedModel);
     },
     async save(showMessage) {
       //only save data to Dynamics if the form has changed.
       if (this.hasModelChanged() || this.hasDataToDelete()) {
         this.processing = true;
-        // this.processing = true;
         this.setNavBarCCFRIComplete({ ccfriId: this.ccfriId, complete: this.isFormComplete() });
 
         if (this.changeType == CHANGE_TYPES.NEW_FACILITY) {
-          let newFac = this.getChangeActionNewFacByFacilityId(this.CCFRIFacilityModel.facilityId);
+          const newFac = this.getChangeActionNewFacByFacilityId(this.CCFRIFacilityModel.facilityId);
           newFac.ccfri.isCCFRIComplete = this.isFormComplete();
         }
         try {
           this.setLoadedModel(cloneDeep(this.CCFRIFacilityModel)); //when saving update the loaded model to look for changes
-          let res = await this.saveCcfri({
+          await this.saveCcfri({
             isFormComplete: this.isFormComplete(),
             hasRfi: this.getNavByCCFRIId(this.$route.params.urlGuid).hasRfi,
           });
-          console.log('the res is:', res);
           if (showMessage) {
             this.setSuccessAlert('Success! CCFRI Parent fees have been saved.');
           }
@@ -840,14 +832,8 @@ export default {
         } catch (error) {
           console.info(error);
           this.setFailureAlert('An error occurred while saving.');
-
-          //This fixes the edge case of fees needing be deleted without a guid - force a refesh. Then when the user clicks next, the guid will exist, it will be deleted,
-          //and life will be good :)
-          //window.location.reload(true);
         }
         this.processing = false;
-
-        //this.refreshNavBarList();
         this.forceNavBarRefresh();
       }
     },
diff --git a/frontend/src/components/summary/group/CCFRISummary.vue b/frontend/src/components/summary/group/CCFRISummary.vue
index 554572c1..87002c66 100644
--- a/frontend/src/components/summary/group/CCFRISummary.vue
+++ b/frontend/src/components/summary/group/CCFRISummary.vue
@@ -313,7 +313,6 @@
                       hide-details
                       :rules="rules.required"
                       readonly
-                      v-bind="props"
                     />
                   </v-col>
 
@@ -328,7 +327,6 @@
                       required
                       readonly
                       :rules="rules.required"
-                      v-bind="props"
                     />
                   </v-col>
 
@@ -419,7 +417,15 @@
 <script>
 import _ from 'lodash';
 import { isChangeRequest } from '@/utils/common.js';
-import { PATHS, pcfUrlGuid, pcfUrl, changeUrl, changeUrlGuid, CCFRI_HAS_CLOSURE_FEE_TYPES } from '@/utils/constants.js';
+import {
+  PATHS,
+  pcfUrlGuid,
+  pcfUrl,
+  changeUrl,
+  changeUrlGuid,
+  CCFRI_HAS_CLOSURE_FEE_TYPES,
+  CCFRI_FEE_CORRECT_TYPES,
+} from '@/utils/constants.js';
 import rules from '@/utils/rules.js';
 import { mapActions, mapState } from 'pinia';
 import globalMixin from '@/mixins/globalMixin.js';
@@ -455,7 +461,7 @@ export default {
     return {
       PATHS,
       rules,
-      isValidForm: true,
+      isValidForm: false,
       formObj: {
         formName: 'CCFRISummary',
         formId: this.ccfri?.ccfriId,
@@ -508,12 +514,20 @@ export default {
         findChildCareTypes(this.ccfri.currentYear);
 
         //only show last year fees if new app or previous year fees are incorrect
-        if (!this.isRenewal || this.ccfri.existingFeesCorrect == 100000001 || !this.ccfri.previousCcfriId) {
+        if (
+          !this.isRenewal ||
+          this.ccfri.existingFeesCorrect === CCFRI_FEE_CORRECT_TYPES.NO ||
+          !this.ccfri.previousCcfriId
+        ) {
           findChildCareTypes(this.ccfri.prevYear);
         }
 
         //check if we are missing any feed cards from the last year if previous fees are correct
-        else if (this.isRenewal && this.ccfri.existingFeesCorrect == 100000000 && this.ccfri.previousCcfriId) {
+        else if (
+          this.isRenewal &&
+          this.ccfri.existingFeesCorrect === CCFRI_FEE_CORRECT_TYPES.YES &&
+          this.ccfri.previousCcfriId
+        ) {
           findChildCareTypes(this.ccfri.prevYear, true);
         }
 
@@ -549,11 +563,11 @@ export default {
     },
   },
   watch: {
-    isLoadingComplete: {
-      handler: function (val) {
-        if (val) {
-          this.$emit('isSummaryValid', this.formObj, this.isValidForm);
-        }
+    isValidForm: {
+      handler() {
+        console.log(this.isValidForm);
+        this.$refs.ccfriSummaryForm.validate();
+        this.$emit('isSummaryValid', this.formObj, this.isValidForm);
       },
     },
   },
diff --git a/frontend/src/components/util/NavBar.vue b/frontend/src/components/util/NavBar.vue
index aca3667b..011c400f 100644
--- a/frontend/src/components/util/NavBar.vue
+++ b/frontend/src/components/util/NavBar.vue
@@ -287,6 +287,7 @@ export default {
     },
     addSummaryAndDeclarationToNavBar() {
       let declarationAccessible = this.areChildrenComplete(this.items);
+      console.log('is this ???', this.isDeclarationB());
       if (
         StaticConfig.DECB_VALIDATION_BYPASS &&
         this.isDeclarationB() &&
@@ -428,6 +429,7 @@ export default {
         const serverTime = new Date(this.userInfo.serverTime);
         if (programYear) {
           let declarationBStart = new Date(programYear.declarationbStart);
+          console.log(serverTime >= declarationBStart);
           return serverTime >= declarationBStart && this.organizationAccountNumber;
         }
       }
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index ae198953..7ee1e419 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -174,6 +174,11 @@ export const CCFRI_HAS_CLOSURE_FEE_TYPES = {
   NO: 100000001,
 };
 
+export const CCFRI_FEE_CORRECT_TYPES = {
+  YES: 100000000,
+  NO: 100000001,
+};
+
 export const ORGANIZATION_PROVIDER_TYPES_IDS = {
   GROUP: 100000000,
   FAMILY: 100000001,

From f7873a5df62b29423e2920336c3ba439b7c67be2 Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Tue, 24 Dec 2024 14:03:18 -0800
Subject: [PATCH 4/9] fixed bug where date removal was not obeying the index
 key. Also fixed ccfri summary dec to work better checking errrors

---
 backend/src/components/facility.js            | 268 ++++++++----------
 .../src/components/SummaryDeclaration.vue     |  13 +-
 .../ccfriApplication/group/AddNewFees.vue     |  35 +--
 .../EceweEligibilityQuestions.vue             |   3 +-
 .../components/summary/group/CCFRISummary.vue |  50 ++--
 frontend/src/components/util/NavBar.vue       |   2 -
 6 files changed, 169 insertions(+), 202 deletions(-)

diff --git a/backend/src/components/facility.js b/backend/src/components/facility.js
index 924e828d..1af2bcdb 100644
--- a/backend/src/components/facility.js
+++ b/backend/src/components/facility.js
@@ -1,34 +1,33 @@
 'use strict';
-const { getOperation, postOperation, patchOperationWithObjectId, minify, getLabelFromValue, getHttpHeader, deleteOperationWithObjectId, getApplicationDocument, deleteDocument} = require('./utils');
+const { getOperation, postOperation, patchOperationWithObjectId, minify, getLabelFromValue, getHttpHeader, deleteOperationWithObjectId, getApplicationDocument, deleteDocument } = require('./utils');
 const HttpStatus = require('http-status-codes');
 const axios = require('axios');
 const config = require('../config/index');
 const log = require('./logger');
 const { MappableObjectForFront, MappableObjectForBack, getMappingString } = require('../util/mapping/MappableObject');
 const { FacilityMappings, CCFRIFacilityMappings } = require('../util/mapping/Mappings');
-const { CHILD_AGE_CATEGORY_TYPES, ACCOUNT_TYPE, CCOF_STATUS_CODES, CHILD_AGE_CATEGORY_ORDER} = require('../util/constants');
+const { CHILD_AGE_CATEGORY_TYPES, ACCOUNT_TYPE, CCOF_STATUS_CODES, CHILD_AGE_CATEGORY_ORDER } = require('../util/constants');
 const { getLicenseCategory } = require('./lookup');
 
-
 function buildNewFacilityPayload(req) {
   let facility = req.body;
-  let organizationString = '/accounts(' + facility.organizationId + ')';
-  let applicationString = '/ccof_applications(' + facility.applicationId + ')';
+  const organizationString = '/accounts(' + facility.organizationId + ')';
+  const applicationString = '/ccof_applications(' + facility.applicationId + ')';
 
   facility = mapFacilityObjectForBack(facility);
   facility['ccof_accounttype'] = ACCOUNT_TYPE.FACILITY;
   facility['parentaccountid@odata.bind'] = organizationString;
   facility['ccof_application_basefunding_Facility'] = [
     {
-      'ccof_Application@odata.bind': applicationString
-    }
+      'ccof_Application@odata.bind': applicationString,
+    },
   ];
 
   return facility;
 }
 
 function mapFacilityObjectForBack(data) {
-  let facilityForBack = new MappableObjectForBack(data, FacilityMappings).toJSON();
+  const facilityForBack = new MappableObjectForBack(data, FacilityMappings).toJSON();
 
   if (facilityForBack.ccof_facilitystartdate) {
     facilityForBack.ccof_facilitystartdate = `${facilityForBack.ccof_facilitystartdate}-01-01`;
@@ -51,7 +50,7 @@ function mapFacilityObjectForBack(data) {
 
 function mapFacilityObjectForFront(data) {
   if (data.ccof_facilitystartdate) {
-    let year = data.ccof_facilitystartdate.split('-')[0];
+    const year = data.ccof_facilitystartdate.split('-')[0];
     data.ccof_facilitystartdate = year;
   }
 
@@ -59,7 +58,7 @@ function mapFacilityObjectForFront(data) {
     data.ccof_licensestartdate = data.ccof_licensestartdate.split('T')[0];
   }
 
-  let obj = new MappableObjectForFront(data, FacilityMappings).toJSON();
+  const obj = new MappableObjectForFront(data, FacilityMappings).toJSON();
 
   //TODO: map this if it is returned from dynamics
   if (data.ccof_everreceivedfundingundertheccofprogram === 100000001) {
@@ -79,37 +78,35 @@ function mapFacilityObjectForFront(data) {
 }
 
 function mapCCFRIObjectForFront(data) {
-
   return new MappableObjectForFront(data, CCFRIFacilityMappings).toJSON();
 }
 
 async function getFacility(req, res) {
   try {
     //,_ccof_change_request_value
-    let operation = 'accounts('+req.params.facilityId+')?$select=ccof_accounttype,name,ccof_facilitystartdate,address1_line1,address1_city,address1_stateorprovince,address1_postalcode,ccof_position,emailaddress1,address1_primarycontactname,telephone1,ccof_facilitylicencenumber,ccof_licensestartdate,ccof_formcomplete,ccof_everreceivedfundingundertheccofprogram,ccof_facilityreceived_ccof_funding,accountnumber,ccof_facilitystatus'; //+ getMappingString(FacilityMappings);
-    log.info('operation: ', operation);
+    const operation =
+      'accounts(' +
+      req.params.facilityId +
+      ')?$select=ccof_accounttype,name,ccof_facilitystartdate,address1_line1,address1_city,address1_stateorprovince,address1_postalcode,ccof_position,emailaddress1,address1_primarycontactname,telephone1,ccof_facilitylicencenumber,ccof_licensestartdate,ccof_formcomplete,ccof_everreceivedfundingundertheccofprogram,ccof_facilityreceived_ccof_funding,accountnumber,ccof_facilitystatus'; //+ getMappingString(FacilityMappings);
     let facility = await getOperation(operation);
 
     if (ACCOUNT_TYPE.FACILITY != facility?.ccof_accounttype) {
-      return res.status(HttpStatus.NOT_FOUND).json({message: 'Account found but is not facility.'});
+      return res.status(HttpStatus.NOT_FOUND).json({ message: 'Account found but is not facility.' });
     }
     facility = mapFacilityObjectForFront(facility);
     return res.status(HttpStatus.OK).json(facility);
   } catch (e) {
     log.error('failed with error', e);
-    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data? e.data : e?.status );
+    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data ? e.data : e?.status);
   }
 }
 
-async function getLicenseCategories(req, res){
+async function getLicenseCategories(req, res) {
   try {
     const url = config.get('dynamicsApi:apiEndpoint') + '/api/Facility?id=' + req.params.facilityId;
-    log.info('get Data Url', url);
     const response = await axios.get(url, getHttpHeader());
-    let map = new Map();
-
-    log.info(CHILD_AGE_CATEGORY_TYPES);
-    response.data.value.forEach(item => {
+    const map = new Map();
+    response.data.value.forEach((item) => {
       map.set(item['CareType.ccof_childcare_categoryid'], {
         childCareCategoryId: item['CareType.ccof_childcare_categoryid'],
         childCareCategory: CHILD_AGE_CATEGORY_TYPES.get(item['CareType.ccof_name']),
@@ -120,43 +117,44 @@ async function getLicenseCategories(req, res){
     return res.status(HttpStatus.OK).json(Array.from(map.values()));
   } catch (e) {
     log.error('failed with error', e);
-    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data? e.data : e?.status );
-
+    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data ? e.data : e?.status);
   }
 }
 
-async function getFacilityChildCareTypes(req, res){
+async function getFacilityChildCareTypes(req, res) {
   try {
     //this is actually the CCFRI guid rn
-    let operation = 'ccof_applicationccfris('+req.params.ccfriId+')?$select='+ getMappingString(CCFRIFacilityMappings) + '&$expand=ccof_application_ccfri_ccc($select=ccof_name,ccof_apr,ccof_may,ccof_jun,ccof_jul,ccof_aug,ccof_sep,ccof_oct,ccof_nov,ccof_dec,ccof_jan,ccof_feb,ccof_mar,_ccof_childcarecategory_value,_ccof_programyear_value,ccof_frequency,ccof_application_ccfri_childcarecategoryid)';
-    log.info('operation: ', operation);
+    const operation =
+      'ccof_applicationccfris(' +
+      req.params.ccfriId +
+      ')?$select=' +
+      getMappingString(CCFRIFacilityMappings) +
+      '&$expand=ccof_application_ccfri_ccc($select=ccof_name,ccof_apr,ccof_may,ccof_jun,ccof_jul,ccof_aug,ccof_sep,ccof_oct,ccof_nov,ccof_dec,ccof_jan,ccof_feb,ccof_mar,_ccof_childcarecategory_value,_ccof_programyear_value,ccof_frequency,ccof_application_ccfri_childcarecategoryid)';
     let ccfriData = await getOperation(operation);
 
-    let childCareTypes = [];
-    ccfriData.ccof_application_ccfri_ccc.forEach(item =>{
-      childCareTypes.push(
-        {
-          parentFeeGUID : item.ccof_application_ccfri_childcarecategoryid,
-          childCareCategory: CHILD_AGE_CATEGORY_TYPES.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
-          childCareCategoryId: item._ccof_childcarecategory_value,
-          programYear: item['_ccof_programyear_value@OData.Community.Display.V1.FormattedValue'],
-          programYearId: item._ccof_programyear_value,
-          approvedFeeApr: item.ccof_apr ,
-          approvedFeeAug: item.ccof_aug,
-          approvedFeeDec: item.ccof_dec,
-          approvedFeeFeb: item.ccof_feb,
-          approvedFeeJan: item.ccof_jan,
-          approvedFeeJul: item.ccof_jul,
-          approvedFeeJun: item.ccof_jun,
-          approvedFeeMar: item.ccof_mar,
-          approvedFeeMay: item.ccof_may,
-          approvedFeeNov: item.ccof_nov,
-          approvedFeeOct: item.ccof_oct,
-          approvedFeeSep: item.ccof_sep,
-          feeFrequency: (item.ccof_frequency == '100000000') ? 'Monthly' : ((item.ccof_frequency == '100000001') ? 'Weekly' : ((item.ccof_frequency == '100000002') ? 'Daily' : '') ),
-          orderNumber: CHILD_AGE_CATEGORY_ORDER.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
-        }
-      );
+    const childCareTypes = [];
+    ccfriData.ccof_application_ccfri_ccc.forEach((item) => {
+      childCareTypes.push({
+        parentFeeGUID: item.ccof_application_ccfri_childcarecategoryid,
+        childCareCategory: CHILD_AGE_CATEGORY_TYPES.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
+        childCareCategoryId: item._ccof_childcarecategory_value,
+        programYear: item['_ccof_programyear_value@OData.Community.Display.V1.FormattedValue'],
+        programYearId: item._ccof_programyear_value,
+        approvedFeeApr: item.ccof_apr,
+        approvedFeeAug: item.ccof_aug,
+        approvedFeeDec: item.ccof_dec,
+        approvedFeeFeb: item.ccof_feb,
+        approvedFeeJan: item.ccof_jan,
+        approvedFeeJul: item.ccof_jul,
+        approvedFeeJun: item.ccof_jun,
+        approvedFeeMar: item.ccof_mar,
+        approvedFeeMay: item.ccof_may,
+        approvedFeeNov: item.ccof_nov,
+        approvedFeeOct: item.ccof_oct,
+        approvedFeeSep: item.ccof_sep,
+        feeFrequency: item.ccof_frequency == '100000000' ? 'Monthly' : item.ccof_frequency == '100000001' ? 'Weekly' : item.ccof_frequency == '100000002' ? 'Daily' : '',
+        orderNumber: CHILD_AGE_CATEGORY_ORDER.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
+      });
       // }
     }); //end for each
 
@@ -168,91 +166,84 @@ async function getFacilityChildCareTypes(req, res){
     return res.status(HttpStatus.OK).json(ccfriData);
   } catch (e) {
     log.error('failed with error', e);
-    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data? e.data : e?.status );
+    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data ? e.data : e?.status);
   }
 }
 //a wrapper fn as getCCFRIClosureDates does not take in a req/res
-async function returnCCFRIClosureDates(req, res){
+async function returnCCFRIClosureDates(req, res) {
   try {
-    const dateData = {dates: await getCCFRIClosureDates(req.params.ccfriId)};
+    const dateData = { dates: await getCCFRIClosureDates(req.params.ccfriId) };
     return res.status(HttpStatus.OK).json(dateData);
-
   } catch (e) {
     log.error('failed with error', e);
-    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data? e.data : e?.status );
+    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data ? e.data : e?.status);
   }
 }
 
-async function getCCFRIClosureDates(ccfriId){
+async function getCCFRIClosureDates(ccfriId) {
   const url = `ccof_applicationccfris(${ccfriId})?$select=ccof_name,&$expand=ccof_ccfri_closure_application_ccfri`;
   let data = await getOperation(url);
-  log.info('get CCFRI closure dates url', url);
   data = data.ccof_ccfri_closure_application_ccfri;
 
-  let closureDates = [];
+  const closureDates = [];
 
   data.forEach((date) => {
-
-    let formattedStartDate = date.ccof_startdate ? new Date(date.ccof_startdate).toISOString().slice(0, 10) : date.ccof_startdate;
-    let formattedEndDate = date.ccof_enddate ? new Date(date.ccof_enddate).toISOString().slice(0, 10) : date.ccof_enddate;
+    const formattedStartDate = date.ccof_startdate ? new Date(date.ccof_startdate).toISOString().slice(0, 10) : date.ccof_startdate;
+    const formattedEndDate = date.ccof_enddate ? new Date(date.ccof_enddate).toISOString().slice(0, 10) : date.ccof_enddate;
 
     closureDates.push({
-      'closureDateId' : date.ccof_application_ccfri_closureid,
-      'startDate' : date.ccof_startdate,
-      'endDate' : date.ccof_enddate,
-      'feesPaidWhileClosed' : date.ccof_paidclosure,
-      'closureReason' : date.ccof_comment,
-      'formattedStartDate': formattedStartDate,
-      'formattedEndDate' : formattedEndDate
+      closureDateId: date.ccof_application_ccfri_closureid,
+      startDate: date.ccof_startdate,
+      endDate: date.ccof_enddate,
+      feesPaidWhileClosed: date.ccof_paidclosure,
+      closureReason: date.ccof_comment,
+      formattedStartDate: formattedStartDate,
+      formattedEndDate: formattedEndDate,
+      id: date.ccof_application_ccfri_closureid,
     });
-    //Mapping does not work i don't know why! :(
-    //closureDates.push( new MappableObjectForFront(date, CCFRIClosureDateMappings).toJSON());
   });
-
-  log.info('returned closed dates: ' , closureDates);
-
   return closureDates;
-
 }
 
 async function updateFacilityLicenseType(facilityId, data) {
   // Load the license categories from Lookup
-  let categories = await getLicenseCategory();
-  let groupLicenseCategory = categories.groupLicenseCategory;
+  const categories = await getLicenseCategory();
+  const groupLicenseCategory = categories.groupLicenseCategory;
 
   console.log('GroupLicenseCategory list: ', groupLicenseCategory);
   // Figure out new License categories from data form
-  let newLicenseCategories = [];
+  const newLicenseCategories = [];
   if (data.familyLicenseType) {
-    newLicenseCategories.push(categories.familyLicenseCategory.find(item => item.ccof_categorynumber == data.familyLicenseType).ccof_license_categoryid);
+    newLicenseCategories.push(categories.familyLicenseCategory.find((item) => item.ccof_categorynumber == data.familyLicenseType).ccof_license_categoryid);
   } else {
     if (data.maxGroupChildCareUnder36 > 0) {
-      newLicenseCategories.push(groupLicenseCategory.find(item => item.ccof_categorynumber == 1)?.ccof_license_categoryid);
+      newLicenseCategories.push(groupLicenseCategory.find((item) => item.ccof_categorynumber == 1)?.ccof_license_categoryid);
     }
     if (data.maxGroupChildCare36 > 0) {
-      newLicenseCategories.push(groupLicenseCategory.find(item => item.ccof_categorynumber == 2)?.ccof_license_categoryid);
+      newLicenseCategories.push(groupLicenseCategory.find((item) => item.ccof_categorynumber == 2)?.ccof_license_categoryid);
     }
     if (data.maxGroupChildCareMultiAge > 0) {
-      newLicenseCategories.push(groupLicenseCategory.find(item => item.ccof_categorynumber == 4)?.ccof_license_categoryid);
+      newLicenseCategories.push(groupLicenseCategory.find((item) => item.ccof_categorynumber == 4)?.ccof_license_categoryid);
     }
     if (data.maxGroupChildCareSchool > 0) {
-      newLicenseCategories.push(groupLicenseCategory.find(item => item.ccof_categorynumber == 3)?.ccof_license_categoryid);
+      newLicenseCategories.push(groupLicenseCategory.find((item) => item.ccof_categorynumber == 3)?.ccof_license_categoryid);
     }
     if (data.maxPreschool > 0) {
-      newLicenseCategories.push(groupLicenseCategory.find(item => item.ccof_categorynumber == 8)?.ccof_license_categoryid);
+      newLicenseCategories.push(groupLicenseCategory.find((item) => item.ccof_categorynumber == 8)?.ccof_license_categoryid);
     }
   }
 
   // Find the current License Categories associated with this facility
-  let toDelete = [];
+  const toDelete = [];
   log.verbose('New license categories: ', newLicenseCategories);
   try {
-    let currentCategoryList = await getOperation(`ccof_facility_licenseses?$select=ccof_facility_licensesid,_ccof_licensecategory_value,_ccof_facility_value&$filter=_ccof_facility_value eq '${facilityId}'`);
+    let currentCategoryList = await getOperation(
+      `ccof_facility_licenseses?$select=ccof_facility_licensesid,_ccof_licensecategory_value,_ccof_facility_value&$filter=_ccof_facility_value eq '${facilityId}'`,
+    );
     currentCategoryList = currentCategoryList.value;
-    log.verbose('current categories: ', currentCategoryList);
     if (currentCategoryList?.length) {
-      currentCategoryList.forEach(currentItem => {
-        let index = newLicenseCategories.indexOf(currentItem._ccof_licensecategory_value);
+      currentCategoryList.forEach((currentItem) => {
+        const index = newLicenseCategories.indexOf(currentItem._ccof_licensecategory_value);
         if (index > -1) {
           // item found, so no need to add it, remove for list
           log.verbose(`Found category for ${currentItem._ccof_licensecategory_value}, removing it from newLicenseCategories`);
@@ -266,46 +257,44 @@ async function updateFacilityLicenseType(facilityId, data) {
     }
     // delete old unneeded categories
     log.verbose(`Number of items to delete: [${toDelete.length}]`);
-    toDelete.forEach( async itemId =>  {
+    toDelete.forEach(async (itemId) => {
       await deleteOperationWithObjectId('ccof_facility_licenseses', itemId);
     });
     // add new reccords
     log.verbose(`Number of items to add: [${newLicenseCategories.length}]`);
-    newLicenseCategories.forEach ( async item => {
+    newLicenseCategories.forEach(async (item) => {
       await postOperation('ccof_facility_licenseses', {
         'ccof_LicenseCategory@odata.bind': `/ccof_license_categories(${item})`,
-        'ccof_Facility@odata.bind': `/accounts(${facilityId})`
+        'ccof_Facility@odata.bind': `/accounts(${facilityId})`,
       });
     });
-
   } catch (e) {
     log.error('Error while trying to get list of FacilityLicenses.', e);
     throw e;
   }
 }
 
-
 async function createFacility(req, res) {
-  let facility = buildNewFacilityPayload(req);
+  const facility = buildNewFacilityPayload(req);
   try {
-    let facilityGuid = await postOperation('accounts', facility);
+    const facilityGuid = await postOperation('accounts', facility);
     //After the base ccof application is created, get the application guid
-    let operation = 'accounts(' + facilityGuid + ')?$select=accountid&$expand=ccof_application_basefunding_Facility($select=ccof_application_basefundingid,statuscode)';
-    let ccofApplicationPayload = await getOperation(operation);
+    const operation = 'accounts(' + facilityGuid + ')?$select=accountid&$expand=ccof_application_basefunding_Facility($select=ccof_application_basefundingid,statuscode)';
+    const ccofApplicationPayload = await getOperation(operation);
     let ccofBaseFundingId = undefined;
     let ccofBaseFundingStatus = undefined;
-    if ( ccofApplicationPayload?.ccof_application_basefunding_Facility?.length > 0) {
+    if (ccofApplicationPayload?.ccof_application_basefunding_Facility?.length > 0) {
       ccofBaseFundingId = ccofApplicationPayload.ccof_application_basefunding_Facility[0].ccof_application_basefundingid;
       ccofBaseFundingStatus = getLabelFromValue(ccofApplicationPayload.ccof_application_basefunding_Facility[0].statuscode, CCOF_STATUS_CODES);
     }
-    return res.status(HttpStatus.CREATED).json({facilityId: facilityGuid, ccofBaseFundingId: ccofBaseFundingId, ccofBaseFundingStatus: ccofBaseFundingStatus});
+    return res.status(HttpStatus.CREATED).json({ facilityId: facilityGuid, ccofBaseFundingId: ccofBaseFundingId, ccofBaseFundingStatus: ccofBaseFundingStatus });
   } catch (e) {
-    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data? e.data : e?.status );
+    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data ? e.data : e?.status);
   }
 }
 
 async function updateFacility(req, res) {
-  let facility = mapFacilityObjectForBack(req.body);
+  const facility = mapFacilityObjectForBack(req.body);
   try {
     log.verbose('updateFacility: Payload is: ', minify(facility));
     let response = await patchOperationWithObjectId('accounts', req.params.facilityId, facility);
@@ -313,26 +302,25 @@ async function updateFacility(req, res) {
     log.verbose('updateFacility: Response is: ', minify(response));
     return res.status(HttpStatus.OK).json(response);
   } catch (e) {
-    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data? e.data : e?.status );
+    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data ? e.data : e?.status);
   }
 }
 
 async function deleteFacility(req, res) {
-  let { facilityId } = req.params;
-  let { changeRequestNewFacilityId, ccfriId, eceweId, ccofBaseFundingId, applicationId } = req.body;
-  log.info('deleting facility', facilityId);
+  const { facilityId } = req.params;
+  const { changeRequestNewFacilityId, ccfriId, eceweId, ccofBaseFundingId, applicationId } = req.body;
 
-  if (ccfriId){
+  if (ccfriId) {
     log.verbose('deleting facilitys CCFRI application', facilityId);
     await deleteOperationWithObjectId('ccof_applicationccfris', ccfriId);
   }
 
-  if (eceweId){
+  if (eceweId) {
     log.verbose('deleting facilitys eceweId application', eceweId);
     await deleteOperationWithObjectId('ccof_applicationecewes', eceweId);
   }
 
-  if (ccofBaseFundingId){
+  if (ccofBaseFundingId) {
     log.verbose('deleting facilitys ccofBaseFundingId application', ccofBaseFundingId);
     await deleteOperationWithObjectId('ccof_application_basefundings', ccofBaseFundingId);
   }
@@ -344,13 +332,12 @@ async function deleteFacility(req, res) {
   const document = organizationUploadedDocuments.find((document) => document['ApplicationFacilityDocument.ccof_facility'] == facilityId);
 
   //if at least 1 document exists for the facility, get the parent 'folder' GUID. Deleteing the parent entity removes all documents associated with the facility.
-  if (document){
-    log.verbose('deleting all documents associated with ' +  document['ApplicationFacilityDocument.ccof_facility@OData.Community.Display.V1.FormattedValue'] );
-    await deleteOperationWithObjectId ( 'ccof_application_facility_documents', document['ApplicationFacilityDocument.ccof_application_facility_documentid']);
+  if (document) {
+    log.verbose('deleting all documents associated with ' + document['ApplicationFacilityDocument.ccof_facility@OData.Community.Display.V1.FormattedValue']);
+    await deleteOperationWithObjectId('ccof_application_facility_documents', document['ApplicationFacilityDocument.ccof_application_facility_documentid']);
   }
 
   await deleteOperationWithObjectId('accounts', facilityId);
-  log.info('facility deleted successfully', facilityId);
 
   if (changeRequestNewFacilityId) {
     log.verbose('deleting change request facility', changeRequestNewFacilityId);
@@ -366,31 +353,29 @@ async function getApprovedParentFees(req, res) {
   const response = await getOperation(operation);
 
   try {
-    let childCareTypes = [];
-    response.ccof_account_ccof_parent_fees_Facility.forEach(item =>{
-      childCareTypes.push(
-        {
-          parentFeeGUID : item.ccof_application_ccfri_childcarecategoryid,
-          childCareCategory: CHILD_AGE_CATEGORY_TYPES.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
-          childCareCategoryId: item._ccof_childcarecategory_value,
-          programYear: item['_ccof_programyear_value@OData.Community.Display.V1.FormattedValue'],
-          programYearId: item._ccof_programyear_value,
-          approvedFeeApr: item.ccof_apr ,
-          approvedFeeAug: item.ccof_aug,
-          approvedFeeDec: item.ccof_dec,
-          approvedFeeFeb: item.ccof_feb,
-          approvedFeeJan: item.ccof_jan,
-          approvedFeeJul: item.ccof_jul,
-          approvedFeeJun: item.ccof_jun,
-          approvedFeeMar: item.ccof_mar,
-          approvedFeeMay: item.ccof_may,
-          approvedFeeNov: item.ccof_nov,
-          approvedFeeOct: item.ccof_oct,
-          approvedFeeSep: item.ccof_sep,
-          feeFrequency: (item.ccof_frequency == '100000000') ? 'Monthly' : ((item.ccof_frequency == '100000001') ? 'Weekly' : ((item.ccof_frequency == '100000002') ? 'Daily' : '') ),
-          orderNumber: CHILD_AGE_CATEGORY_ORDER.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
-        }
-      );
+    const childCareTypes = [];
+    response.ccof_account_ccof_parent_fees_Facility.forEach((item) => {
+      childCareTypes.push({
+        parentFeeGUID: item.ccof_application_ccfri_childcarecategoryid,
+        childCareCategory: CHILD_AGE_CATEGORY_TYPES.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
+        childCareCategoryId: item._ccof_childcarecategory_value,
+        programYear: item['_ccof_programyear_value@OData.Community.Display.V1.FormattedValue'],
+        programYearId: item._ccof_programyear_value,
+        approvedFeeApr: item.ccof_apr,
+        approvedFeeAug: item.ccof_aug,
+        approvedFeeDec: item.ccof_dec,
+        approvedFeeFeb: item.ccof_feb,
+        approvedFeeJan: item.ccof_jan,
+        approvedFeeJul: item.ccof_jul,
+        approvedFeeJun: item.ccof_jun,
+        approvedFeeMar: item.ccof_mar,
+        approvedFeeMay: item.ccof_may,
+        approvedFeeNov: item.ccof_nov,
+        approvedFeeOct: item.ccof_oct,
+        approvedFeeSep: item.ccof_sep,
+        feeFrequency: item.ccof_frequency == '100000000' ? 'Monthly' : item.ccof_frequency == '100000001' ? 'Weekly' : item.ccof_frequency == '100000002' ? 'Daily' : '',
+        orderNumber: CHILD_AGE_CATEGORY_ORDER.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
+      });
     }); //end for each
 
     const retVal = {
@@ -400,12 +385,10 @@ async function getApprovedParentFees(req, res) {
     return res.status(200).json(retVal);
   } catch (e) {
     log.error('failed with error', e);
-    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data? e.data : e?.status );
+    return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json(e.data ? e.data : e?.status);
   }
 }
 
-
-
 module.exports = {
   getFacility,
   getFacilityChildCareTypes,
@@ -417,6 +400,5 @@ module.exports = {
   getCCFRIClosureDates,
   mapFacilityObjectForBack,
   getApprovedParentFees,
-  returnCCFRIClosureDates
+  returnCCFRIClosureDates,
 };
-
diff --git a/frontend/src/components/SummaryDeclaration.vue b/frontend/src/components/SummaryDeclaration.vue
index e191a562..f4ef9e81 100644
--- a/frontend/src/components/SummaryDeclaration.vue
+++ b/frontend/src/components/SummaryDeclaration.vue
@@ -163,6 +163,7 @@
                         :facility-id="facility.facilityId"
                         :change-rec-guid="facility?.changeRequestId"
                         :program-year-id="summaryModel?.application?.programYearId"
+                        :is-processing="isProcessing"
                         @is-summary-valid="isFormComplete"
                       />
                     </v-expansion-panel>
@@ -440,8 +441,7 @@
           </v-row>
         </v-card>
       </v-row>
-      {{ !isPageComplete() }}
-      {{ isReadOnly }}
+
       <NavButton
         v-if="!printableVersion"
         :is-submit-displayed="true"
@@ -651,7 +651,6 @@ export default {
       return this.summaryModel?.facilities?.length > 0;
     },
     isSummaryComplete() {
-      console.log('len? ', this.invalidSummaryForms.length);
       return this.invalidSummaryForms.length < 1;
     },
     allFacilitiesApproved() {
@@ -750,10 +749,6 @@ export default {
     ...mapActions(useOrganizationStore, ['setIsOrganizationComplete']),
     ...mapActions(useReportChangesStore, ['getChangeRequestList', 'setCRIsLicenseComplete', 'setCRIsEceweComplete']),
     isPageComplete() {
-      console.log('is it complete here? ', this.isSummaryComplete);
-      console.log(this.model.agreeConsentCertify && this.model.orgContactName && this.isSummaryComplete);
-      console.log(this.canSubmit);
-
       if (
         (this.model.agreeConsentCertify && this.model.orgContactName && this.isSummaryComplete) ||
         (this.canSubmit && this.model.orgContactName && this.model.agreeConsentCertify)
@@ -892,13 +887,9 @@ export default {
       this.$router.push(this.previousPath);
     },
     async isFormComplete(formObj, isComplete) {
-      console.log(formObj);
-      console.log(isComplete);
       if (!isComplete) {
         this.invalidSummaryForms.push(formObj);
       }
-
-      console.log(this.invalidSummaryForms);
       this.updateNavBarStatus(formObj, isComplete);
     },
     expandAllPanels() {
diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index 9a74d49d..c8ba4010 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -316,16 +316,10 @@
               <v-radio label="No" :value="CCFRI_HAS_CLOSURE_FEE_TYPES.NO" />
             </v-radio-group>
 
-            <v-row v-if="closureFees == 'Yes' || CCFRIFacilityModel.hasClosureFees === CCFRI_FEE_CORRECT_TYPES.YES">
-              <v-row v-for="(obj, index) in CCFRIFacilityModel.dates" :key="index" color="#003366">
-                <v-col color="#003366" cols="auto" xl="1">
-                  <v-icon
-                    :disabled="isReadOnly"
-                    size="large"
-                    color="blue-darken-4"
-                    class=""
-                    @click="removeIndex(index)"
-                  >
+            <div v-if="closureFees == 'Yes' || CCFRIFacilityModel.hasClosureFees === CCFRI_FEE_CORRECT_TYPES.YES">
+              <v-row v-for="(obj, index) in CCFRIFacilityModel.dates" :key="obj.id" color="#003366">
+                <v-col color="#003366" cols="auto">
+                  <v-icon :disabled="isReadOnly" size="large" color="blue-darken-4" @click="removeIndex(index)">
                     mdi-close
                   </v-icon>
                 </v-col>
@@ -385,16 +379,8 @@
                 <span class="text-white"> . </span>
                 <v-row v-if="obj.isIllegal">
                   <v-card width="100%" class="mx-3 my-10">
-                    <v-row>
-                      <v-col class="py-0">
-                        <v-card-title class="py-1 noticeAlert">
-                          <span style="float: left">
-                            <v-icon size="x-large" class="py-1 px-3 noticeAlertIcon"> mdi-alert-octagon </v-icon>
-                          </span>
-                          Invalid Dates
-                        </v-card-title>
-                      </v-col>
-                    </v-row>
+                    <AppAlertBanner type="error" class="mb-4 w-100">Invalid Dates</AppAlertBanner>
+
                     <v-card-text>
                       It appears that the closure start and end dates you've selected for this facility overlap with
                       dates you've previously selected.
@@ -423,7 +409,7 @@
                 </v-row>
               </v-container>
               <br />
-            </v-row>
+            </div>
           </div>
         </v-card-text>
       </v-card>
@@ -513,6 +499,7 @@
 <script>
 import { mapState, mapActions } from 'pinia';
 import { isEqual, cloneDeep } from 'lodash';
+import { uuid } from 'vue-uuid';
 
 import { useAppStore } from '@/store/app.js';
 import { useApplicationStore } from '@/store/application.js';
@@ -523,6 +510,7 @@ import { useReportChangesStore } from '@/store/reportChanges.js';
 import NavButton from '@/components/util/NavButton.vue';
 import FacilityHeader from '@/components/guiComponents/FacilityHeader.vue';
 import AppDateInput from '@/components/guiComponents/AppDateInput.vue';
+import AppAlertBanner from '@/components/guiComponents/AppAlertBanner.vue';
 import rules from '@/utils/rules.js';
 
 import {
@@ -558,7 +546,7 @@ function dateFunction(date1, date2) {
 }
 
 export default {
-  components: { NavButton, FacilityHeader, AppDateInput },
+  components: { NavButton, FacilityHeader, AppDateInput, AppAlertBanner },
   mixins: [alertMixin, globalMixin],
   beforeRouteLeave(_to, _from, next) {
     this.save(false);
@@ -699,7 +687,8 @@ export default {
     ]),
     addRow() {
       this.updateChosenDates();
-      this.CCFRIFacilityModel.dates.push(Object.assign({}, this.dateObj));
+      const newObj = { ...this.dateObj, id: uuid.v1() };
+      this.CCFRIFacilityModel.dates.push(newObj);
     },
     allowedDates(val) {
       return !this.chosenDates.includes(val);
diff --git a/frontend/src/components/eceweApplication/EceweEligibilityQuestions.vue b/frontend/src/components/eceweApplication/EceweEligibilityQuestions.vue
index 94333c71..3d9b4f84 100644
--- a/frontend/src/components/eceweApplication/EceweEligibilityQuestions.vue
+++ b/frontend/src/components/eceweApplication/EceweEligibilityQuestions.vue
@@ -159,8 +159,7 @@
                <div v-if="model.fundingModel">
                   <v-row class="justify-left">
                     <AppAlertBanner  type="info" class="ma-2 mb-4 w-100"
-                      >Please Confirm</AppAlertBanner
-                    />
+                      >Please Confirm</AppAlertBanner>
                   </v-row>
                   <v-row>
                     <v-col class="pl-6 d-flex py-0">
diff --git a/frontend/src/components/summary/group/CCFRISummary.vue b/frontend/src/components/summary/group/CCFRISummary.vue
index 87002c66..9eeb4e70 100644
--- a/frontend/src/components/summary/group/CCFRISummary.vue
+++ b/frontend/src/components/summary/group/CCFRISummary.vue
@@ -377,24 +377,25 @@
               />
             </v-row>
           </v-col>
-          <v-col cols="12" class="pb-2 pt-2">
-            <v-row no-gutters class="d-flex justify-start">
-              <span class="summary-label"
-                >Is there any other information about this facility you would like us to know?</span
-              >
-              <v-textarea
-                class="col-12 summary-value-small"
-                :model-value="ccfri.ccfriApplicationNotes"
-                density="compact"
-                flat
-                variant="solo"
-                hide-details
-                no-resize
-                readonly
-                rows="3"
-              />
-            </v-row>
-          </v-col>
+
+          <v-row no-gutters class="d-flex justify-start">
+            <span class="summary-label"
+              >Is there any other information about this facility you would like us to know?</span
+            >
+          </v-row>
+          <v-row>
+            <v-textarea
+              class="col-10 summary-value-small"
+              :model-value="ccfri.ccfriApplicationNotes"
+              density="compact"
+              flat
+              variant="solo"
+              hide-details
+              no-resize
+              readonly
+              rows="3"
+            />
+          </v-row>
         </v-row>
 
         <v-row v-if="!isValidForm" class="d-flex justify-start">
@@ -455,6 +456,11 @@ export default {
       required: false,
       default: '',
     },
+    isProcessing: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   emits: ['isSummaryValid'],
   data() {
@@ -565,9 +571,12 @@ export default {
   watch: {
     isValidForm: {
       handler() {
-        console.log(this.isValidForm);
         this.$refs.ccfriSummaryForm.validate();
-        this.$emit('isSummaryValid', this.formObj, this.isValidForm);
+        //validate for this page is kinda slow. isValidForm becomes null when validation is in process.. that throws off the warning message on SummaryDec.vue
+        //if form is invalid, it will be set to false and the emit will still fire.
+        if (!this.isProcessing && this.isLoadingComplete && this.isValidForm !== null) {
+          this.$emit('isSummaryValid', this.formObj, this.isValidForm);
+        }
       },
     },
   },
@@ -575,7 +584,6 @@ export default {
     this.CCFRI_HAS_CLOSURE_FEE_TYPES = CCFRI_HAS_CLOSURE_FEE_TYPES;
   },
   methods: {
-    ...mapActions(useSummaryDeclarationStore, ['setIsLoadingComplete']),
     getRoutingPath() {
       if (!this.ccfri && isChangeRequest(this)) {
         return changeUrl(PATHS.CCFRI_HOME, this.changeRecGuid);
diff --git a/frontend/src/components/util/NavBar.vue b/frontend/src/components/util/NavBar.vue
index 011c400f..aca3667b 100644
--- a/frontend/src/components/util/NavBar.vue
+++ b/frontend/src/components/util/NavBar.vue
@@ -287,7 +287,6 @@ export default {
     },
     addSummaryAndDeclarationToNavBar() {
       let declarationAccessible = this.areChildrenComplete(this.items);
-      console.log('is this ???', this.isDeclarationB());
       if (
         StaticConfig.DECB_VALIDATION_BYPASS &&
         this.isDeclarationB() &&
@@ -429,7 +428,6 @@ export default {
         const serverTime = new Date(this.userInfo.serverTime);
         if (programYear) {
           let declarationBStart = new Date(programYear.declarationbStart);
-          console.log(serverTime >= declarationBStart);
           return serverTime >= declarationBStart && this.organizationAccountNumber;
         }
       }

From c8c4f5f82adf19c8d6f88eee72fd5b122e0033fa Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Tue, 24 Dec 2024 14:07:57 -0800
Subject: [PATCH 5/9] remove unused import

---
 frontend/src/components/summary/group/CCFRISummary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/summary/group/CCFRISummary.vue b/frontend/src/components/summary/group/CCFRISummary.vue
index 9eeb4e70..d1e3ba84 100644
--- a/frontend/src/components/summary/group/CCFRISummary.vue
+++ b/frontend/src/components/summary/group/CCFRISummary.vue
@@ -428,7 +428,7 @@ import {
   CCFRI_FEE_CORRECT_TYPES,
 } from '@/utils/constants.js';
 import rules from '@/utils/rules.js';
-import { mapActions, mapState } from 'pinia';
+import { mapState } from 'pinia';
 import globalMixin from '@/mixins/globalMixin.js';
 import { useSummaryDeclarationStore } from '@/store/summaryDeclaration.js';
 import { useApplicationStore } from '@/store/application.js';

From d4394e6105ed7035ac1a058e4298403b8c5d44f5 Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Thu, 2 Jan 2025 11:25:33 -0800
Subject: [PATCH 6/9] add deafult font family

---
 backend/src/components/facility.js                         | 6 ++----
 frontend/public/styles/common.css                          | 7 +++++++
 .../src/components/ccfriApplication/group/AddNewFees.vue   | 4 +---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/backend/src/components/facility.js b/backend/src/components/facility.js
index 1af2bcdb..fcbf4d22 100644
--- a/backend/src/components/facility.js
+++ b/backend/src/components/facility.js
@@ -11,15 +11,13 @@ const { getLicenseCategory } = require('./lookup');
 
 function buildNewFacilityPayload(req) {
   let facility = req.body;
-  const organizationString = '/accounts(' + facility.organizationId + ')';
-  const applicationString = '/ccof_applications(' + facility.applicationId + ')';
 
   facility = mapFacilityObjectForBack(facility);
   facility['ccof_accounttype'] = ACCOUNT_TYPE.FACILITY;
-  facility['parentaccountid@odata.bind'] = organizationString;
+  facility['parentaccountid@odata.bind'] = `/accounts(${facility.organizationId})`;
   facility['ccof_application_basefunding_Facility'] = [
     {
-      'ccof_Application@odata.bind': applicationString,
+      'ccof_Application@odata.bind': `/ccof_applications(${facility.applicationId})`,
     },
   ];
 
diff --git a/frontend/public/styles/common.css b/frontend/public/styles/common.css
index 39b6e51b..2b935bbd 100644
--- a/frontend/public/styles/common.css
+++ b/frontend/public/styles/common.css
@@ -132,6 +132,13 @@ input[type="number"] {
   background-color: #e5e4e4;
 }
 
+.span-label {
+  color: grey;
+  font-style: normal;
+  font-family: "BCSans", Verdana, Arial, sans-serif;
+  font-size: 14px;
+}
+
 div.text-h4,
 h4.text-h4,
 p.text-h4,
diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index c8ba4010..f0a4aa0d 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -362,9 +362,7 @@
                 </v-col>
 
                 <v-col cols="12" md="2" class="mt-n1">
-                  <span style="color: grey; font-style: normal; font-family: BCSans; font-size: 14px"
-                    >Did parents pay for this closure?</span
-                  >
+                  <span class="span-label">Did parents pay for this closure?</span>
                   <v-radio-group
                     v-model="obj.feesPaidWhileClosed"
                     :disabled="isReadOnly"

From b486f39d634f9e4535939e7917fe155be0fd65e6 Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Thu, 2 Jan 2025 12:52:27 -0800
Subject: [PATCH 7/9] fixed something I broke

---
 backend/src/components/facility.js      | 43 ++++++++++++++-----------
 frontend/src/components/LandingPage.vue |  2 +-
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/backend/src/components/facility.js b/backend/src/components/facility.js
index fcbf4d22..edc6c5ad 100644
--- a/backend/src/components/facility.js
+++ b/backend/src/components/facility.js
@@ -1,5 +1,5 @@
 'use strict';
-const { getOperation, postOperation, patchOperationWithObjectId, minify, getLabelFromValue, getHttpHeader, deleteOperationWithObjectId, getApplicationDocument, deleteDocument } = require('./utils');
+const { getOperation, postOperation, patchOperationWithObjectId, minify, getLabelFromValue, getHttpHeader, deleteOperationWithObjectId, getApplicationDocument } = require('./utils');
 const HttpStatus = require('http-status-codes');
 const axios = require('axios');
 const config = require('../config/index');
@@ -12,12 +12,15 @@ const { getLicenseCategory } = require('./lookup');
 function buildNewFacilityPayload(req) {
   let facility = req.body;
 
+  const organizationString = `/accounts(${facility.organizationId})`;
+  const applicationString = `/ccof_applications(${facility.applicationId})`;
+
   facility = mapFacilityObjectForBack(facility);
   facility['ccof_accounttype'] = ACCOUNT_TYPE.FACILITY;
-  facility['parentaccountid@odata.bind'] = `/accounts(${facility.organizationId})`;
+  facility['parentaccountid@odata.bind'] = organizationString;
   facility['ccof_application_basefunding_Facility'] = [
     {
-      'ccof_Application@odata.bind': `/ccof_applications(${facility.applicationId})`,
+      'ccof_Application@odata.bind': applicationString,
     },
   ];
 
@@ -81,11 +84,7 @@ function mapCCFRIObjectForFront(data) {
 
 async function getFacility(req, res) {
   try {
-    //,_ccof_change_request_value
-    const operation =
-      'accounts(' +
-      req.params.facilityId +
-      ')?$select=ccof_accounttype,name,ccof_facilitystartdate,address1_line1,address1_city,address1_stateorprovince,address1_postalcode,ccof_position,emailaddress1,address1_primarycontactname,telephone1,ccof_facilitylicencenumber,ccof_licensestartdate,ccof_formcomplete,ccof_everreceivedfundingundertheccofprogram,ccof_facilityreceived_ccof_funding,accountnumber,ccof_facilitystatus'; //+ getMappingString(FacilityMappings);
+    const operation = `accounts(${req.params.facilityId})?$select=ccof_accounttype,name,ccof_facilitystartdate,address1_line1,address1_city,address1_stateorprovince,address1_postalcode,ccof_position,emailaddress1,address1_primarycontactname,telephone1,ccof_facilitylicencenumber,ccof_licensestartdate,ccof_formcomplete,ccof_everreceivedfundingundertheccofprogram,ccof_facilityreceived_ccof_funding,accountnumber,ccof_facilitystatus`;
     let facility = await getOperation(operation);
 
     if (ACCOUNT_TYPE.FACILITY != facility?.ccof_accounttype) {
@@ -119,15 +118,22 @@ async function getLicenseCategories(req, res) {
   }
 }
 
+function getFeeFrequency(feeCode) {
+  if (feeCode === 100000000) {
+    return 'Monthly';
+  } else if (feeCode === 100000001) {
+    return 'Weekly';
+  } else if (feeCode === 100000002) {
+    return 'Daily';
+  }
+  return '';
+}
+
 async function getFacilityChildCareTypes(req, res) {
   try {
-    //this is actually the CCFRI guid rn
-    const operation =
-      'ccof_applicationccfris(' +
-      req.params.ccfriId +
-      ')?$select=' +
-      getMappingString(CCFRIFacilityMappings) +
-      '&$expand=ccof_application_ccfri_ccc($select=ccof_name,ccof_apr,ccof_may,ccof_jun,ccof_jul,ccof_aug,ccof_sep,ccof_oct,ccof_nov,ccof_dec,ccof_jan,ccof_feb,ccof_mar,_ccof_childcarecategory_value,_ccof_programyear_value,ccof_frequency,ccof_application_ccfri_childcarecategoryid)';
+    const operation = `ccof_applicationccfris(${req.params.ccfriId})?$select=${getMappingString(
+      CCFRIFacilityMappings,
+    )}&$expand=ccof_application_ccfri_ccc($select=ccof_name,ccof_apr,ccof_may,ccof_jun,ccof_jul,ccof_aug,ccof_sep,ccof_oct,ccof_nov,ccof_dec,ccof_jan,ccof_feb,ccof_mar,_ccof_childcarecategory_value,_ccof_programyear_value,ccof_frequency,ccof_application_ccfri_childcarecategoryid)`;
     let ccfriData = await getOperation(operation);
 
     const childCareTypes = [];
@@ -150,13 +156,12 @@ async function getFacilityChildCareTypes(req, res) {
         approvedFeeNov: item.ccof_nov,
         approvedFeeOct: item.ccof_oct,
         approvedFeeSep: item.ccof_sep,
-        feeFrequency: item.ccof_frequency == '100000000' ? 'Monthly' : item.ccof_frequency == '100000001' ? 'Weekly' : item.ccof_frequency == '100000002' ? 'Daily' : '',
+        feeFrequency: getFeeFrequency(item.ccof_frequency),
         orderNumber: CHILD_AGE_CATEGORY_ORDER.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
       });
-      // }
     }); //end for each
 
-    ccfriData = mapCCFRIObjectForFront(ccfriData); //////
+    ccfriData = mapCCFRIObjectForFront(ccfriData);
 
     ccfriData.childCareTypes = childCareTypes;
     ccfriData.dates = await getCCFRIClosureDates(req.params.ccfriId);
@@ -371,7 +376,7 @@ async function getApprovedParentFees(req, res) {
         approvedFeeNov: item.ccof_nov,
         approvedFeeOct: item.ccof_oct,
         approvedFeeSep: item.ccof_sep,
-        feeFrequency: item.ccof_frequency == '100000000' ? 'Monthly' : item.ccof_frequency == '100000001' ? 'Weekly' : item.ccof_frequency == '100000002' ? 'Daily' : '',
+        feeFrequency: getFeeFrequency(item.ccof_frequency),
         orderNumber: CHILD_AGE_CATEGORY_ORDER.get(item['_ccof_childcarecategory_value@OData.Community.Display.V1.FormattedValue']),
       });
     }); //end for each
diff --git a/frontend/src/components/LandingPage.vue b/frontend/src/components/LandingPage.vue
index feee2cdd..8e52509b 100644
--- a/frontend/src/components/LandingPage.vue
+++ b/frontend/src/components/LandingPage.vue
@@ -267,7 +267,7 @@
           cols="12"
           md="6"
         >
-          <v-card class="blueBorder rounded-lg elevation-4" min-height="230">
+          <v-card class="blueBorder rounded-lg elevation-4 pb-2" min-height="230">
             <v-card-text>
               <p v-if="facility?.facilityAccountNumber" class="text-h5 text--primary text-center">
                 Facility ID: {{ facility?.facilityAccountNumber }}

From 889e3788c9befbf4ffce60843d7def9c45417164 Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:19:44 -0800
Subject: [PATCH 8/9] update from Wes

---
 backend/src/components/facility.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/backend/src/components/facility.js b/backend/src/components/facility.js
index edc6c5ad..746620da 100644
--- a/backend/src/components/facility.js
+++ b/backend/src/components/facility.js
@@ -119,14 +119,16 @@ async function getLicenseCategories(req, res) {
 }
 
 function getFeeFrequency(feeCode) {
-  if (feeCode === 100000000) {
-    return 'Monthly';
-  } else if (feeCode === 100000001) {
-    return 'Weekly';
-  } else if (feeCode === 100000002) {
-    return 'Daily';
+  switch (feeCode) {
+    case 100000000:
+      return 'Monthly';
+    case 100000001:
+      return 'Weekly';
+    case 100000002:
+      return 'daily';
+    default:
+      return '';
   }
-  return '';
 }
 
 async function getFacilityChildCareTypes(req, res) {

From 1e9323404925f12e196dd7e3afa110f915d2b512 Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:23:13 -0800
Subject: [PATCH 9/9] words are hard

---
 backend/src/components/facility.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/components/facility.js b/backend/src/components/facility.js
index 746620da..84bcac08 100644
--- a/backend/src/components/facility.js
+++ b/backend/src/components/facility.js
@@ -125,7 +125,7 @@ function getFeeFrequency(feeCode) {
     case 100000001:
       return 'Weekly';
     case 100000002:
-      return 'daily';
+      return 'Daily';
     default:
       return '';
   }