From a0d8f45424cb4619f7167e04c51c8622975a3455 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 23 May 2024 09:19:57 +0200 Subject: [PATCH] renamed new input "short_range_total_people" to "short_range_occupants" --- caimira/apps/calculator/defaults.py | 2 +- caimira/apps/calculator/model_generator.py | 8 ++++---- caimira/apps/calculator/report_generator.py | 2 +- caimira/apps/calculator/static/js/form.js | 2 +- caimira/apps/templates/base/calculator.form.html.j2 | 2 +- caimira/apps/templates/base/calculator.report.html.j2 | 2 +- caimira/tests/apps/calculator/conftest.py | 2 +- caimira/tests/apps/calculator/test_report_generator.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/caimira/apps/calculator/defaults.py b/caimira/apps/calculator/defaults.py index 70f61a68..40e6ad33 100644 --- a/caimira/apps/calculator/defaults.py +++ b/caimira/apps/calculator/defaults.py @@ -73,7 +73,7 @@ DEFAULTS = { 'sensor_in_use': '', 'short_range_option': 'short_range_no', 'short_range_interactions': '[]', - 'short_range_total_people': 1, + 'short_range_occupants': 1, } # ------------------ Activities ---------------------- diff --git a/caimira/apps/calculator/model_generator.py b/caimira/apps/calculator/model_generator.py index 5ab6099c..234f2752 100644 --- a/caimira/apps/calculator/model_generator.py +++ b/caimira/apps/calculator/model_generator.py @@ -72,7 +72,7 @@ class VirusFormData(FormData): sensor_in_use: str short_range_option: str short_range_interactions: list - short_range_total_people: int + short_range_occupants: int _DEFAULTS: typing.ClassVar[typing.Dict[str, typing.Any]] = DEFAULTS @@ -186,9 +186,9 @@ class VirusFormData(FormData): # Validate number of people with short-range interactions max_people_for_sr = self.total_people - self.infected_people - if self.short_range_total_people > max_people_for_sr: + if self.short_range_occupants > max_people_for_sr: raise ValueError( - f'The total number of people having short-range interactions ({self.short_range_total_people}) should be lower than the exposed population ({max_people_for_sr}).' + f'The total number of people having short-range interactions ({self.short_range_occupants}) should be lower than the exposed population ({max_people_for_sr}).' ) def initialize_room(self) -> models.Room: @@ -241,7 +241,7 @@ class VirusFormData(FormData): geographic_cases=self.geographic_cases, ascertainment_bias=CONFIDENCE_LEVEL_OPTIONS[self.ascertainment_bias], ), - exposed_to_short_range=self.short_range_total_people, + exposed_to_short_range=self.short_range_occupants, ) def build_model(self, sample_size=None) -> models.ExposureModel: diff --git a/caimira/apps/calculator/report_generator.py b/caimira/apps/calculator/report_generator.py index cf6ab070..8ae92987 100644 --- a/caimira/apps/calculator/report_generator.py +++ b/caimira/apps/calculator/report_generator.py @@ -431,7 +431,7 @@ def manufacture_alternative_scenarios(form: VirusFormData) -> typing.Dict[str, m scenarios['Neither ventilation nor masks'] = without_mask_or_vent.build_mc_model() else: - no_short_range_alternative = dataclass_utils.replace(form, short_range_interactions=[], total_people=form.total_people - form.short_range_total_people) + no_short_range_alternative = dataclass_utils.replace(form, short_range_interactions=[], total_people=form.total_people - form.short_range_occupants) scenarios['Base scenario without short-range interactions'] = no_short_range_alternative.build_mc_model() return scenarios diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js index be376497..71023c2a 100644 --- a/caimira/apps/calculator/static/js/form.js +++ b/caimira/apps/calculator/static/js/form.js @@ -1268,7 +1268,7 @@ $(document).ready(function () { let activity = validate_sr_parameter('#sr_expiration_no_' + String(index)[0], "Required input."); let start = validate_sr_parameter('#sr_start_no_' + String(index)[0], "Required input."); let duration = validate_sr_parameter('#sr_duration_no_' + String(index)[0], "Required input."); - let total_people = validate_sr_people('#short_range_total_people'); + let total_people = validate_sr_people('#short_range_occupants'); if (activity && start && duration && total_people) { if (validate_sr_time('#sr_start_no_' + String(index)) && validate_sr_time('#sr_duration_no_' + String(index))) { document.getElementById('sr_expiration_no_' + String(index)).disabled = true; diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2 index 3aacea77..745612e6 100644 --- a/caimira/apps/templates/base/calculator.form.html.j2 +++ b/caimira/apps/templates/base/calculator.form.html.j2 @@ -590,7 +590,7 @@
- +
diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2 index 1c11b192..cc6190c5 100644 --- a/caimira/apps/templates/base/calculator.report.html.j2 +++ b/caimira/apps/templates/base/calculator.report.html.j2 @@ -614,7 +614,7 @@ Short-range interactions: {{ form.short_range_interactions|length }}

  • - Total number of people having short-range interactions: {{ form.short_range_total_people }} + Total number of people having short-range interactions: {{ form.short_range_occupants }}