Merge pull request #271 from icefoganalytics/test

Fix for parent contribution and add family size to base
ytgov · Jun 27, 2024 · b2efaf7 · b2efaf7
2 parents d012677 + 85dba25
commit b2efaf7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/api/repositories/assessment/assessment-cslft-repository-v2.ts b/src/api/repositories/assessment/assessment-cslft-repository-v2.ts
@@ -275,8 +275,8 @@ export class AssessmentCslftRepositoryV2 {
         if (input.parent_discretionary_income > 0) {
           let contribution = await this.db("sfa.parent_contribution_formula")
             .where({ academic_year_id: this.application.academic_year_id })
-            .where("income_from_amount", ">=", input.parent_discretionary_income)
-            .where("income_to_amount", "<=", input.parent_discretionary_income)
+            .where("income_from_amount", "<=", input.parent_discretionary_income)
+            .where("income_to_amount", ">=", input.parent_discretionary_income)
             .first();
 
           if (contribution) {

diff --git a/src/web/src/components/application/assessments/components/csl-ft/tab-base.vue b/src/web/src/components/application/assessments/components/csl-ft/tab-base.vue
@@ -40,7 +40,7 @@
             <v-date-picker v-model="assessment.assessed_date" @input="assessed_date_menu = false"></v-date-picker>
           </v-menu>
         </v-col>
-        <v-col cols="12" md="4">
+        <v-col cols="12" md="2">
           <v-text-field
             outlined
             dense
@@ -52,6 +52,18 @@
             v-model="assessment.dependent_count"
           />
         </v-col>
+        <v-col cols="12" md="2">
+          <v-text-field
+            outlined
+            dense
+            background-color="#ddd"
+            append-icon="mdi-lock"
+            readonly
+            hide-details
+            label="Familiy size"
+            v-model="assessment.family_size"
+          />
+        </v-col>
       </v-row>
       <v-divider class="my-5" />
       <h3 class="mb-5">Pre-Study Period</h3>