added new inputs for dynamic occupancy

caimira/src/caimira/calculator/validators/defaults.py

@@ -37,6 +37,7 @@ DEFAULTS = {
     'infected_lunch_option': True,
     'infected_lunch_start': '12:30',
     'infected_people': 1,
+    'dynamic_infected_occupancy': '[]',
     'infected_start': '08:30',
     'inside_temp': NO_DEFAULT,
     'location_latitude': NO_DEFAULT,
@@ -55,6 +56,7 @@ DEFAULTS = {
     'room_volume': 0.,
     'simulation_name': NO_DEFAULT,
     'total_people': NO_DEFAULT,
+    'dynamic_exposed_occupancy': '[]',
     'vaccine_option': False,
     'vaccine_booster_option': False,
     'vaccine_type': 'AZD1222_(AstraZeneca)',

caimira/src/caimira/calculator/validators/form_validator.py

@@ -37,9 +37,11 @@ class FormData:
     # Used if infected_dont_have_breaks_with_exposed
     infected_lunch_start: minutes_since_midnight
     infected_people: int
+    dynamic_infected_occupancy: list
     infected_start: minutes_since_midnight
     room_volume: float
     total_people: int
+    dynamic_exposed_occupancy: list
 
     data_registry: DataRegistry
 

caimira/src/caimira/calculator/validators/virus/virus_validator.py

@@ -549,6 +549,7 @@ def baseline_raw_form_data() -> typing.Dict[str, typing.Union[str, float]]:
         'infected_lunch_option': '1',
         'infected_lunch_start': '12:30',
         'infected_people': '1',
+        'dynamic_infected_occupancy': '[]',
         'infected_start': '09:00',
         'inside_temp': '293.',
         'location_latitude': 46.20833,
@@ -568,6 +569,7 @@ def baseline_raw_form_data() -> typing.Dict[str, typing.Union[str, float]]:
         'room_volume': '75',
         'simulation_name': 'Test',
         'total_people': '10',
+        'dynamic_exposed_occupancy': '[]',
         'vaccine_option': '0',
         'vaccine_booster_option': '0',
         'vaccine_type': 'Ad26.COV2.S_(Janssen)',

cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2

@@ -447,6 +447,9 @@
         <span class="tooltip_text">?</span>
     </div><br>
 
+    <input type="text" class="form-control d-none" name="dynamic_exposed_occupancy">
+    <input type="text" class="form-control d-none" name="dynamic_infected_occupancy">
+
     <div class="form-group row">
       <div class="col-sm-4"><label class="col-form-label">Total number of occupants:</label></div>
       <div class="col-sm-6 align-self-center"><input type="number" id="total_people" class="form-control" name="total_people" placeholder="Number" min=1 required></div>