@@ -1381,7 +1407,7 @@ export default {
...mapState(useRfiAppStore, ['rfiModel', 'loadedModel']),
...mapState(useSupportingDocumentUploadStore, ['uploadedDocuments']),
currentFacility() {
- return this.navBarList.find((el) => el.ccfriApplicationId == this.$route.params.urlGuid);
+ return this.navBarList.find((el) => el.ccfriApplicationId === this.$route.params.urlGuid);
},
fundingUrl() {
return this.getFundingUrl(this.programYearId);
@@ -1410,27 +1436,27 @@ export default {
isFormComplete() {
let done = true;
if (
- this.model.exceptionalCircumstances == 1 &&
- this.model.circumstanceOccurWithin6Month == 1 &&
- this.model.expenseList.length == 0
+ this.model.exceptionalCircumstances === 1 &&
+ this.model.circumstanceOccurWithin6Month === 1 &&
+ this.model.expenseList.length === 0
) {
done = false;
}
if (
this.model.q3 === 1 &&
- this.model.exceptionalCircumstances == 1 &&
- this.model.circumstanceOccurWithin6Month == 1 &&
- this.model.fundingList.length == 0
+ this.model.exceptionalCircumstances === 1 &&
+ this.model.circumstanceOccurWithin6Month === 1 &&
+ this.model.fundingList.length === 0
) {
done = false;
}
- if (this.model.feeIncreaseDueToWage == 1 && this.model.wageList.length == 0) {
+ if (this.model.feeIncreaseDueToWage === 1 && this.model.wageList.length === 0) {
done = false;
}
- if (this.model.feeIncreaseExtendedHours == 1 && this.model.expansionList.length == 0) {
+ if (this.model.feeIncreaseExtendedHours === 1 && this.model.expansionList.length === 0) {
done = false;
}
- if (this.model.IndigenousConnection == 1 && this.model.indigenousExpenseList.length == 0) {
+ if (this.model.IndigenousConnection === 1 && this.model.indigenousExpenseList.length === 0) {
done = false;
}
return this.isValidForm && done; //false makes button clickable, true disables button
@@ -1520,12 +1546,17 @@ export default {
}
this.processing = false;
},
- addObjToList(obj, list) {
+ addObjToList(obj, list, arrayHasItems = false) {
+ //when opening table for the first time, add a row so it always populates with one.
+ //check below so if user hits the radio button multiple times, it won't keep adding rows
+ if (arrayHasItems) {
+ return;
+ }
const newObj = { ...obj, id: uuid.v1() };
list.push(newObj);
},
removeObjFromList(index, list) {
- if (index == -1) {
+ if (index === -1) {
return;
}
list.splice(index, 1);
diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index fc671db2..6259242a 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -312,7 +312,7 @@
:rules="rules.required"
>
-
+
@@ -401,7 +401,7 @@
-
+
ADD NEW CLOSURE
@@ -683,7 +683,10 @@ export default {
'setNavBarValue',
'setNavBarCCFRIComplete',
]),
- addRow() {
+ addRow(radioButtonClicked) {
+ //when opening table for the first time, add a row so it always populates with one.
+ //check below so if user hits the radio button multiple times, it won't keep adding rows
+ if (radioButtonClicked && this.CCFRIFacilityModel.dates.length > 0) return;
this.updateChosenDates();
const newObj = { ...this.dateObj, id: uuid.v1() };
this.CCFRIFacilityModel.dates.push(newObj);