diff --git a/caimira/apps/calculator/model_generator.py b/caimira/apps/calculator/model_generator.py index 5931c980..5c0fe232 100644 --- a/caimira/apps/calculator/model_generator.py +++ b/caimira/apps/calculator/model_generator.py @@ -36,6 +36,7 @@ class FormData: specific_breaks: dict precise_activity: dict ceiling_height: float + conditional_probability_plot: bool exposed_coffee_break_option: str exposed_coffee_duration: int exposed_finish: minutes_since_midnight @@ -104,6 +105,7 @@ class FormData: 'precise_activity': '{}', 'calculator_version': _NO_DEFAULT, 'ceiling_height': 0., + 'conditional_probability_plot': False, 'exposed_coffee_break_option': 'coffee_break_0', 'exposed_coffee_duration': 5, 'exposed_finish': '17:30', @@ -900,6 +902,7 @@ def baseline_raw_form_data() -> typing.Dict[str, typing.Union[str, float]]: 'air_changes': '', 'air_supply': '', 'ceiling_height': '', + 'conditional_probability_plot': '0', 'exposed_coffee_break_option': 'coffee_break_4', 'exposed_coffee_duration': '10', 'exposed_finish': '18:00', diff --git a/caimira/apps/calculator/report_generator.py b/caimira/apps/calculator/report_generator.py index 14531cbd..8c870a08 100644 --- a/caimira/apps/calculator/report_generator.py +++ b/caimira/apps/calculator/report_generator.py @@ -137,6 +137,7 @@ def calculate_report_data(form: FormData, model: models.ExposureModel) -> typing er = np.array(model.concentration_model.infected.emission_rate_when_present()).mean() exposed_occupants = model.exposed.number expected_new_cases = np.array(model.expected_new_cases()).mean() + uncertainties_plot_src = img2base64(_figure2bytes(uncertainties_plot(model))) if form.conditional_probability_plot else None return { "model_repr": repr(model), @@ -158,7 +159,7 @@ def calculate_report_data(form: FormData, model: models.ExposureModel) -> typing "emission_rate": er, "exposed_occupants": exposed_occupants, "expected_new_cases": expected_new_cases, - "uncertainties_plot_scr": img2base64(_figure2bytes(uncertainties_plot([model]))) + "uncertainties_plot_src": uncertainties_plot_src, } diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2 index 448350b7..00dd2a37 100644 --- a/caimira/apps/templates/base/calculator.form.html.j2 +++ b/caimira/apps/templates/base/calculator.form.html.j2 @@ -406,6 +406,11 @@ +