Merge pull request #149 from icefoganalytics/test

CSLFT Parent contribution fix
ytgov · Sep 16, 2023 · 4dbdd7f · 4dbdd7f
2 parents 4451f65 + 1dd0bcf
commit 4dbdd7f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/db/4_functions.sql b/db/4_functions.sql
@@ -2909,7 +2909,8 @@ FROM sfa.person p
 	LEFT JOIN sfa.person_address pa
 		ON pa.person_id = p.id 
 WHERE p.id = @person_id
-AND pa.address_type_id = @address_type;
+AND pa.address_type_id = @address_type
+AND pa.is_active = 1;
 GO
 
 -- Get Standard Living Amount

diff --git a/src/api/routes/admin/application-router.ts b/src/api/routes/admin/application-router.ts
@@ -1230,7 +1230,7 @@ applicationRouter.patch(
         delete data.student_id;
       }
       const resUpdate = await db("sfa.person_address")
-        .update({ ...data })
+        .update({ ...data, is_active: true })
         .where({ id: person_address_id })
         .returning("*");
 

diff --git a/src/web/src/modules/cslft/store/index.js b/src/web/src/modules/cslft/store/index.js
@@ -422,7 +422,10 @@ const getters = {
         return Math.max(numHelper.round(getters.cslft_parent_net_income - numHelper.getNum(state.cslft.parent_msol)), 0);
     },
     cslft_calculated_parental_contribution(state, getters) {
-        return numHelper.getNum(state.cslft.parent_ps_depend_count) === 0 ? 0 : numHelper.round(numHelper.getNum(state.cslft.parent_weekly_contrib) * numHelper.getNum(state.cslft.study_weeks) / numHelper.getNum(state.cslft.parent_ps_depend_count));
+        let baseDependCount = state.cslft.parent_ps_depend_count || 0; // this does not include current student
+        baseDependCount +=1;
+
+        return numHelper.round(numHelper.getNum(state.cslft.parent_weekly_contrib) * numHelper.getNum(state.cslft.study_weeks) / baseDependCount);
     },
     cslft_parent_total_contribution(state, getters) {
         return numHelper.round(Math.max(numHelper.getNum(state.cslft.parent_contribution_override), numHelper.getNum(getters.cslft_calculated_parental_contribution)));