handled probabilistic exposure from review

Author: lrdossan

caimira/apps/calculator/report_generator.py

@@ -171,7 +171,7 @@ def calculate_report_data(form: VirusFormData, model: models.ExposureModel, exec
     # Probabilistic exposure
     if form.exposure_option == "p_probabilistic_exposure" and form.occupancy_format == "static":
         prob_probabilistic_exposure = np.array(model.total_probability_rule()).mean()
-    else: prob_probabilistic_exposure = -1
+    else: prob_probabilistic_exposure = None
 
     exposed_presence_intervals = [list(interval) for interval in model.exposed.presence_interval().boundaries()]
 

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

@@ -145,19 +145,23 @@
 													{% if form.exposure_option == "p_probabilistic_exposure" %}
 														<br>
 														<div class="align-self-center alert alert-dark mb-0" role="alert">
-															The above {{ "result assumes" if form.short_range_option == "short_range_no" else "results assume" }} that <b>{{ form.infected_people }}
-															{{ "occupant is infected" if form.infected_people == 1 else "occupants are infected" }}
-															</b> in the room.
-															By taking into account the estimate of cases currently circulating in <b>{{ form.location_name }}</b>,
-															the probability of on-site transmission, having at least 1 new infection in an <b>event
-															with {{ form.total_people }} occupants</b>, is
-															{% if form.short_range_option == 'short_range_yes' %}:
-																<ul>
-																	<li><b>{{ long_range_prob_probabilistic_exposure | non_zero_percentage }}</b>, assuming all occupants are exposed equally (i.e. without short-range interactions).</li>
-																	<li><b>{{ prob_probabilistic_exposure | non_zero_percentage }}</b>, assuming short-range interactions occur with the infector(s).</li>
-																</ul>
+															{% if form.occupancy_format == "static" %}
+																The above {{ "result assumes" if form.short_range_option == "short_range_no" else "results assume" }} that <b>{{ form.infected_people }}
+																{{ "occupant is infected" if form.infected_people == 1 else "occupants are infected" }}
+																</b> in the room.
+																By taking into account the estimate of cases currently circulating in <b>{{ form.location_name }}</b>,
+																the probability of on-site transmission, having at least 1 new infection in an <b>event
+																with {{ form.total_people }} occupants</b>, is
+																{% if form.short_range_option == 'short_range_yes' %}:
+																	<ul>
+																		<li><b>{{ long_range_prob_probabilistic_exposure | non_zero_percentage }}</b>, assuming all occupants are exposed equally (i.e. without short-range interactions).</li>
+																		<li><b>{{ prob_probabilistic_exposure | non_zero_percentage }}</b>, assuming short-range interactions occur with the infector(s).</li>
+																	</ul>
+																{% else %}
+																	<b>{{ prob_probabilistic_exposure | non_zero_percentage }}</b>.
+																{% endif %}
 															{% else %}
-																<b>{{ prob_probabilistic_exposure | non_zero_percentage }}</b>.
+																<p><strong>Warning: </strong>Since dynamic occupancy was defined, the results for probabilistic exposure with incidence rates have not been computed.</p>
 															{% endif %}
 														</div>
 													{% endif %}

caimira/tests/apps/calculator/test_report_generator.py

@@ -173,5 +173,5 @@ def test_static_vs_dynamic_occupancy_from_form(baseline_form_data, data_registry
 
     np.testing.assert_almost_equal(static_occupancy_report_data['prob_inf'], dynamic_occupancy_report_data['prob_inf'], 1)
     np.testing.assert_almost_equal(static_occupancy_report_data['expected_new_cases'], dynamic_occupancy_report_data['expected_new_cases'], 1)
-    assert dynamic_occupancy_report_data['prob_probabilistic_exposure'] == -1
+    assert dynamic_occupancy_report_data['prob_probabilistic_exposure'] == None