Added validation for the case the header is not a string

CERN · Nov 14, 2023 · aecd532 · aecd532
1 parent 0a712a4
commit aecd532
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/caimira/apps/calculator/static/js/co2_form.js b/caimira/apps/calculator/static/js/co2_form.js
@@ -64,6 +64,7 @@ function uploadFile(endpoint) {
       const cellValue = worksheet[headerCoordinates[header]]?.v;
       if (
         !cellValue ||
+        $.type(cellValue) !== "string" ||
         cellValue.trim().toLowerCase() !== header.toLowerCase()
       ) {
         $("#upload-error")

diff --git a/caimira/tests/apps/calculator/test_model_generator.py b/caimira/tests/apps/calculator/test_model_generator.py
@@ -171,8 +171,8 @@ def test_ventilation_window_hepa(baseline_form: model_generator.FormData):
 @pytest.mark.parametrize(
     ["activity", "total_people", "infected_people", "error"],
     [
-        ['office', 10, 11, "Number of infected people cannot be more or equal than number of total people."],
-        ['office', 10, 10, "Number of infected people cannot be more or equal than number of total people."],
+        ['office', 10, 11, "Number of infected people cannot be greater or equal to the number of total people"],
+        ['office', 10, 10, "Number of infected people cannot be greater or equal to the number of total people"],
         ['training', 10, 2, "Conference/Training activities are limited to 1 infected."],
     ]
 )