added generation of conditional probability of infection values based on form condition

caimira/apps/calculator/defaults.py

@@ -19,6 +19,7 @@ DEFAULTS = {
     'calculator_version': NO_DEFAULT,
     'ceiling_height': 0.,
     'conditional_probability_plot': False,
+    'conditional_probability_viral_loads': False,
     'exposed_coffee_break_option': 'coffee_break_0',
     'exposed_coffee_duration': 5,
     'exposed_finish': '17:30',

caimira/apps/calculator/model_generator.py

@@ -35,6 +35,7 @@ class FormData:
     precise_activity: dict
     ceiling_height: float
     conditional_probability_plot: bool
+    conditional_probability_viral_loads: bool
     exposed_coffee_break_option: str
     exposed_coffee_duration: int
     exposed_finish: minutes_since_midnight
@@ -776,6 +777,7 @@ def baseline_raw_form_data() -> typing.Dict[str, typing.Union[str, float]]:
         'air_supply': '',
         'ceiling_height': '',
         'conditional_probability_plot': '0',
+        'conditional_probability_viral_loads': '0',
         'exposed_coffee_break_option': 'coffee_break_4',
         'exposed_coffee_duration': '10',
         'exposed_finish': '18:00',

caimira/apps/calculator/report_generator.py

@@ -463,7 +463,7 @@ class ReportGenerator:
         context.update(report_data)
 
         alternative_scenarios = manufacture_alternative_scenarios(form)
-        context['alternative_viral_load'] = manufacture_viral_load_scenarios(model)
+        context['alternative_viral_load'] = manufacture_viral_load_scenarios(model) if form.conditional_probability_viral_loads else None
         context['alternative_scenarios'] = comparison_report(
             form, report_data, alternative_scenarios, scenario_sample_times, executor_factory=executor_factory,
         )

caimira/apps/templates/base/calculator.form.html.j2

@@ -408,6 +408,7 @@
 
     <div class="form-check d-none">
       <input type="checkbox" id="conditional_probability_plot" class="tabbed form-check-input" name="conditional_probability_plot" value="0" disabled>
+      <input type="checkbox" id="conditional_probability_viral_loads" class="tabbed form-check-input" name="conditional_probability_viral_loads" value="0" disabled>
     </div>
 
     <span id="training_limit_error" class="red_text" hidden>Conference/Training activities limited to 1 infected<br></span>