Merge pull request #2637 from bitzesty/matrix-validation

Only allow whole numbers for matrix question inputs
bitzesty · Oct 18, 2023 · 00cf850 · 00cf850
2 parents 262b4d9 + 39d299c
commit 00cf850
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/app/assets/javascripts/frontend/matrix.js b/app/assets/javascripts/frontend/matrix.js
@@ -0,0 +1,4 @@
+$(document).on("input", ".matrix-question-input", function() {
+  // allow only numbers on input
+  this.value = this.value.replace(/\D/g,'');
+});
diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
@@ -41,7 +41,7 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
               ]
               span.govuk-error-message aria-live="polite"
                 - if @form_answer.validator_errors && @form_answer.validator_errors["#{question.hash_key}_#{x_heading.key}_#{y_heading.key}"].present?
-                  | Required
+                  = @form_answer.validator_errors["#{question.hash_key}_#{x_heading.key}_#{y_heading.key}"]
                   span.govuk-visually-hidden id="error_for_#{question.key}"
                     | Error:
                   =< @form_answer.validator_errors[question.hash_key]
diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
@@ -8,10 +8,17 @@ def errors
         question.y_headings.each do |y_heading|
           question.x_headings.each do |x_heading|
             suffix = "#{x_heading.key}_#{y_heading.key}"
-            if !question.input_value(suffix: suffix).present? && !AUTO_CALCULATED_HEADINGS.any? { |excluded| question.input_name(suffix: suffix).include?(excluded) }
-              if (question.required_row_parent && question.required_rows.include?(y_heading.key)) || !question.required_row_parent
-                result[question.hash_key(suffix: suffix)] ||= ""
-                result[question.hash_key(suffix: suffix)] << "Required"
+            if !AUTO_CALCULATED_HEADINGS.any? { |excluded| question.input_name(suffix: suffix).include?(excluded) }
+              if !question.input_value(suffix: suffix).present?
+                if (question.required_row_parent && question.required_rows.include?(y_heading.key)) || !question.required_row_parent
+                  result[question.hash_key(suffix: suffix)] ||= ""
+                  result[question.hash_key(suffix: suffix)] << "Required"
+                end
+              else
+                if !/\A\d+\z/.match(question.input_value(suffix: suffix).to_s)
+                  result[question.hash_key(suffix: suffix)] ||= ""
+                  result[question.hash_key(suffix: suffix)] << "Must be a whole number"
+                end
               end
             end
           end