diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index 032748ad..7e4a95c3 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -31,6 +31,7 @@ class FormData: mask_type: str mask_wearing: str mechanical_ventilation_type: str + model_version: str opening_distance: float recurrent_event_month: str room_number: str @@ -101,6 +102,7 @@ class FormData: mask_type=form_data['mask_type'], mask_wearing=form_data['mask_wearing'], mechanical_ventilation_type=form_data['mechanical_ventilation_type'], + model_version=form_data['model_version'], opening_distance=float(form_data['opening_distance']), recurrent_event_month=form_data['recurrent_event_month'], room_number=form_data['room_number'], @@ -295,6 +297,7 @@ def baseline_raw_form_data(): 'mask_type': 'Type I', 'mask_wearing': 'removed', 'mechanical_ventilation_type': '', + 'model_version': 'BetaV1.1.0', 'opening_distance': '0.2', 'recurrent_event_month': 'January', 'room_number': '123', diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py index 93d07d01..ee9aa22e 100644 --- a/cara/apps/calculator/report_generator.py +++ b/cara/apps/calculator/report_generator.py @@ -87,8 +87,7 @@ def build_report(model: models.Model, form: FormData): 'model': model, 'request': request, 'form': form, - 'creation_date': time, - 'model_version': 'Beta v1.0.0', + 'creation_date': time, } context.update(calculate_report_data(model)) diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index 32e666fc..d41ae4d6 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -1,5 +1,6 @@ {% extends "layout.html.j2" %} +{% set MODEL_VERSION="BetaV1.1.0" %} {% set CALCULATOR_ACTIVE=1 %} {% set DEBUG=False %} @@ -19,7 +20,7 @@
-Beta v1.0.0 Please send feedback to CARA-dev@cern.ch +{{ MODEL_VERSION }} Please send feedback to CARA-dev@cern.chCARA Covid Airborne Risk Assessment tool
{% if DEBUG %} @@ -28,6 +29,8 @@ Beta v1.0.0 Please send feedback to