Merge pull request #2595 from bitzesty/cherrypick-percentage-staging

[Staging] - fix float issue when calculating percentage of trade
bitzesty · Sep 11, 2023 · 2c219c8 · 2c219c8
2 parents 87efa44 + 851dadd
commit 2c219c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -698,7 +698,7 @@ window.FormValidation =
         totalOverseasTradePercentage += parseFloat($(this).val())
       else
         missingOverseasTradeValue = true
-    if totalOverseasTradePercentage != 100
+    if totalOverseasTradePercentage.toFixed(2) != (100).toFixed(2)
       @logThis(question, "validateGoodsServicesPercentage", "% of your total overseas trade should add up to 100")
       @appendMessage(question, "% of your total overseas trade should add up to 100")
       @addErrorClass(question)

diff --git a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
@@ -28,7 +28,7 @@ def errors
 
       total = 0
       question.answers["trade_goods_and_services_explanations"]&.each do |product|
-        total += product["total_overseas_trade"].to_i
+        total += product["total_overseas_trade"].to_f.round(2)
       end
       if total != 100
         result[question.key] ||= {}