Release 2.3 Updates (#610)

* ecewe org questions show for all applications, expansion panel order changed

* fix home page facility cards for orgs with multiple facilities

* removed an empty class

* ccfri-4307 ecewe status codes incorrect

* Ccfri 4274 closure data lost (#606)


* fixed bug where date removal was not obeying the index key. Also fixed ccfri summary dec to work better while checking errors

* remove unused import

* add default font family

* Ccfri 4321 rfi UI fix (#609)

* UI updates for RFI , fix bug where rows containing dates do not delete properly

* fix next button on existing fees correct page

* fixed alignment on ul

* Ccfri 4247 fix closure table (#611)

* when tables open, default them to have one row populated

* Ccfri 4362 fix closure table validations (#612)


Co-authored-by: weskubo-cgi <[email protected]>

Author: jenbeckett

backend/src/components/facility.js

@@ -1,4 +1,3 @@
-
 //TODO: this really should be a lookup in dynamics
 const CHILD_AGE_CATEGORY_TYPES = new Map();
 CHILD_AGE_CATEGORY_TYPES.set('0-18', '0 to 18 months');
@@ -16,21 +15,17 @@ CHILD_AGE_CATEGORY_ORDER.set('OOSC-K', 4);
 CHILD_AGE_CATEGORY_ORDER.set('OOSC-G', 5);
 CHILD_AGE_CATEGORY_ORDER.set('PRE', 6);
 
-
-
-
 //Jen changed these string values ^^ for the lookup mapping to work -- now they match EXACTLY what comes back from the Dynamics API
 
 const ACCOUNT_TYPE = Object.freeze({
   FACILITY: 100000001,
-  ORGANIZATION: 100000000
+  ORGANIZATION: 100000000,
 });
 
-
 const CCOF_APPLICATION_TYPES = Object.freeze({
   NEW: 100000000,
   FACILITY: 100000001,
-  RENEW: 100000002
+  RENEW: 100000002,
 });
 
 const CHANGE_REQUEST_STATUS_CODES = Object.freeze({
@@ -40,7 +35,7 @@ const CHANGE_REQUEST_STATUS_CODES = Object.freeze({
   WITH_PROVIDER: 5,
   INELIGIBLE: 6,
   APPROVED: 7,
-  CANCELLED: 8
+  CANCELLED: 8,
 });
 
 const APPLICATION_STATUS_CODES = Object.freeze({
@@ -50,35 +45,34 @@ const APPLICATION_STATUS_CODES = Object.freeze({
   WITHDRAWN: 4,
   // Additional status codes not from Dynamics
   APPROVED: 10,
-  ACTION_REQUIRED: 11
+  'ACTION REQUIRED': 11,
 });
 
 const CHANGE_REQUEST_EXTERNAL_STATUS_CODES = Object.freeze({
   INCOMPLETE: 1,
   SUBMITTED: 2,
-  ACTION_REQUIRED: 3,
+  'ACTION REQUIRED': 3,
   INELIGIBLE: 4,
   APPROVED: 5,
-  CANCELLED: 6
+  CANCELLED: 6,
 });
 
 const CCOF_STATUS_CODES = Object.freeze({
   SUBMITTED: 1,
-  ACTION_REQUIRED: 2,
+  'ACTION REQUIRED': 2,
   ACTIVE: 3,
   INACTIVE: 4,
-  CANCELLED: 5
+  CANCELLED: 5,
 });
 
 const ORGANIZATION_PROVIDER_TYPES = Object.freeze({
   GROUP: 100000000,
   FAMILY: 100000001,
 });
 
-
 const OPTIN_STATUS_CODES = Object.freeze({
   OUT: 0,
-  IN:  1,
+  IN: 1,
 });
 
 const CCFRI_STATUS_CODES = Object.freeze({
@@ -87,43 +81,42 @@ const CCFRI_STATUS_CODES = Object.freeze({
   SUBMITTED: 1,
   NOT_APPROVED: 4,
   INELIGIBLE: 5,
-  ACTION_REQUIRED: 6,
+  'ACTION REQUIRED': 6,
   'Opt-Out': 7,
-  'New': 8,
+  NEW: 8,
   'MTFI Requested': 9,
   'MTFI Approved': 10,
   'MTFI Action Required': 13,
 });
 
 const ECEWE_STATUS_CODES = Object.freeze({
+  SUBMITTED: 1,
   APPROVED: 3,
   DRAFT: 2,
-  SUBMITTED: 1,
-  NOT_APPROVED: 4,
-  INELIGIBLE: 5,
-  ACTION_REQUIRED: 6
+  INELIGIBLE: 4,
+  'ACTION REQUIRED': 5,
+  'Opt-Out': 6,
+  NEW: 7,
 });
 
 const PROGRAM_YEAR_STATUS_CODES = Object.freeze({
-  CURRENT:	1,
-  INACTIVE:	2,
-  FUTURE:	3,
-  HISTORICAL:	4,
+  CURRENT: 1,
+  INACTIVE: 2,
+  FUTURE: 3,
+  HISTORICAL: 4,
 });
 
-
-
 const FACILITY_AGE_GROUP_CODES = Object.freeze({
-  '1': '0 to 18 months',
-  '2': '18 to 36 months',
-  '3': '3 Years to Kindergarten',
-  '4': 'Out of School Care - Kindergarten',
-  '5': 'Out of School Care - Grade 1+' ,
-  '6': 'Preschool'
+  1: '0 to 18 months',
+  2: '18 to 36 months',
+  3: '3 Years to Kindergarten',
+  4: 'Out of School Care - Kindergarten',
+  5: 'Out of School Care - Grade 1+',
+  6: 'Preschool',
 });
 
 const CHANGE_REQUEST_TYPES = Object.freeze({
-  LEGAL_ORG_NAME_CHANGE: 100000000 ,
+  LEGAL_ORG_NAME_CHANGE: 100000000,
   ORG_MAILING_ADDRESS: 100000001,
   FACILITY_ADDRESS: 100000002,
   FACILITY_NAME: 100000003,
@@ -155,6 +148,5 @@ module.exports = {
   CHILD_AGE_CATEGORY_ORDER,
   CHANGE_REQUEST_TYPES,
   CHANGE_REQUEST_EXTERNAL_STATUS_CODES,
-  CHANGE_REQUEST_STATUS_CODES
+  CHANGE_REQUEST_STATUS_CODES,
 };
-

backend/src/util/constants.js

@@ -107,6 +107,7 @@ const ServiceExpansionDetailsMappings = [
   { back: 'ccof_paymentfrequencydetails', front: 'frequency' },
   { back: 'ccof_dateofchange', front: 'date' },
   { back: 'ccof_amountofexpense', front: 'expense' },
+  { back: 'ccof_rfipfiserviceexpansiondetailid', front: 'id' },
 ];
 
 const DCSWageIncreaseMappings = [
@@ -117,13 +118,15 @@ const DCSWageIncreaseMappings = [
   { back: 'ccof_wageafterincrease', front: 'wageAfterIncrease' },
   { back: 'ccof_averagehoursperweek', front: 'averageHours' },
   { back: 'ccof_wageincreasedate', front: 'wageDate' },
+  { back: 'ccof_rfi_pfi_dcs_wi_detailid', front: 'id' },
 ];
 
 const ExpenseInformationMappings = [
   { back: 'ccof_expensedescription', front: 'description' },
   { back: 'ccof_dateofexpense', front: 'date' },
   { back: 'ccof_paymentfrequencydetails', front: 'frequency' },
   { back: 'ccof_expenseamountt', front: 'expense' },
+  { back: 'ccof_rfipfiexpenseinfoid', front: 'id' },
 ];
 
 const OtherFundingProgramMappings = [
@@ -132,13 +135,15 @@ const OtherFundingProgramMappings = [
   { back: 'ccof_statusofapplication', front: 'status' },
   { back: 'ccof_amountreceived', front: 'amount' },
   { back: 'ccof_expense', front: 'expenses' },
+  { back: 'ccof_rfi_pfi_other_fundingid', front: 'id' },
 ];
 
 const IndigenousExpenseMappings = [
   { back: 'ccof_expensedescription', front: 'description' },
   { back: 'ccof_date', front: 'date' },
   { back: 'ccof_paymentfrequency', front: 'frequency' },
   { back: 'ccof_amount', front: 'expense' },
+  { back: 'ccof_rfipfiserviceexpansionindigenouscommunityid', front: 'id' },
 ];
 
 const NMFApplicationMappings = [

backend/src/util/mapping/Mappings.js

@@ -113,10 +113,22 @@ input[type="number"] {
   color: #ff5252;
 }
 
-.add-file-button {
+.font-large {
+  font-size: 18px;
+}
+
+.font-regular {
   font-size: 16px;
 }
 
+.font-small {
+  font-size: 14px;
+}
+
+.font-xsmall {
+  font-size: 12px;
+}
+
 .border-right {
   border-right: 0.5px solid lightgray;
 }
@@ -132,6 +144,12 @@ input[type="number"] {
   background-color: #e5e4e4;
 }
 
+.span-label {
+  color: #636262;
+  font-style: normal;
+  font-family: "BCSans", Verdana, Arial, sans-serif;
+}
+
 div.text-h4,
 h4.text-h4,
 p.text-h4,

frontend/public/styles/common.css

@@ -259,13 +259,15 @@
           </v-row>
         </v-col>
       </v-row>
-      <v-row no-gutters justify="space-around">
+      <v-row no-gutters class="justify-space-around">
         <v-col
           v-for="facility in filteredFacilityListForFacilityCards"
-          :key="facility?.facilityId"
-          class="col-12 col-xl-6 pa-4 flex d-flex flex-column"
+          :key="facility.facilityId"
+          class="pa-2"
+          cols="12"
+          md="6"
         >
-          <v-card class="elevation-4 pa-2 rounded-lg blueBorder flex d-flex flex-column" 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 }}

frontend/src/components/LandingPage.vue

@@ -26,14 +26,7 @@
         >
           <template #top>
             <v-col flex>
-              <AppButton
-                v-if="!isLocked"
-                id="add-new-file"
-                :primary="false"
-                size="large"
-                class="add-file-button mb-2"
-                @click="addNew"
-              >
+              <AppButton v-if="!isLocked" id="add-new-file" :primary="false" size="large" class="mb-2" @click="addNew">
                 Add File
               </AppButton>
             </v-col>