From 446cc88345cf6351e2f97d300fbbd7a3a5eb4892 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Wed, 1 Nov 2023 16:03:33 +0100 Subject: [PATCH] removed unused parameters --- caimira/apps/calculator/co2_model_generator.py | 6 +----- caimira/apps/calculator/static/js/co2_form.js | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/caimira/apps/calculator/co2_model_generator.py b/caimira/apps/calculator/co2_model_generator.py index bc55ae4e..cde150e3 100644 --- a/caimira/apps/calculator/co2_model_generator.py +++ b/caimira/apps/calculator/co2_model_generator.py @@ -34,12 +34,12 @@ class CO2FormData(model_generator.FormData): infected_people: int infected_start: model_generator.minutes_since_midnight room_volume: float + specific_breaks: dict total_people: int #: The default values for undefined fields. Note that the defaults here #: and the defaults in the html form must not be contradictory. _DEFAULTS: typing.ClassVar[typing.Dict[str, typing.Any]] = { - 'activity_type': 'office', 'CO2_data': '{}', 'exposed_coffee_break_option': 'coffee_break_0', 'exposed_coffee_duration': 5, @@ -48,7 +48,6 @@ class CO2FormData(model_generator.FormData): 'exposed_lunch_option': True, 'exposed_lunch_start': '12:30', 'exposed_start': '08:30', - 'mask_wearing_option': False, 'fitting_ventilation_states': '[]', 'fitting_ventilation_type': 'fitting_natural_ventilation', 'infected_coffee_break_option': 'coffee_break_0', @@ -63,9 +62,6 @@ class CO2FormData(model_generator.FormData): 'room_volume': NO_DEFAULT, 'specific_breaks': '{}', 'total_people': NO_DEFAULT, - 'vaccine_option': False, - 'ventilation_type': 'from_fitting', - 'virus_type': 'SARS_CoV_2', } def __init__(self, **kwargs): diff --git a/caimira/apps/calculator/static/js/co2_form.js b/caimira/apps/calculator/static/js/co2_form.js index db6fb864..e16cf39d 100644 --- a/caimira/apps/calculator/static/js/co2_form.js +++ b/caimira/apps/calculator/static/js/co2_form.js @@ -20,8 +20,8 @@ const CO2_data_form = [ "infected_people", "infected_start", "room_volume", + "specific_breaks", "total_people", - "ventilation_type", ]; // Method to upload a valid excel file