Merge pull request #3100 from bitzesty/auto-subtotals-rows-fix-qa

Fix displaying of auto-calculated rows [QA]
bitzesty · Sep 27, 2024 · 5e708ea · 5e708ea
2 parents 8f49d8b + 1c8dd44
commit 5e708ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -502,7 +502,7 @@ window.FormValidation =
             key.includes(v)
           map.set(key, cond)
 
-        if !cond && shouldHideRow
+        if !cond && !qRow.hasClass('js-prevent-hide') && shouldHideRow
           subq.val("")
           if shouldDisableRow
             subq.prop('disabled', true)

diff --git a/forms/award_years/v2025/social_mobility/social_mobility_step3.rb b/forms/award_years/v2025/social_mobility/social_mobility_step3.rb
@@ -634,6 +634,10 @@ def mobility_step3
             [:normal, "If none, please enter '0'."],
           ]
           corner_label "Disadvantaged group type"
+          subtotals_label "Subtotal number of discrete disadvantaged participants who benefited (the system will calculate this)"
+          others_label "Others receiving support from you who are not disadvantaged who benefited"
+          totals_label "Total number of discrete participants (the system will calculate this)"
+          proportion_label "The proportion of disadvantaged participants from the total (the system will calculate this)"
 
           x_headings [2020, 2021, 2022, 2023, 2024]