From c9fec0ac05855fa4b413f6e742110d0cc450d0c1 Mon Sep 17 00:00:00 2001
From: Phil Elson <philip.elson@cern.ch>
Date: Thu, 1 Apr 2021 18:17:43 +0200
Subject: [PATCH] Rename the form element to calculator_version.

---
 cara/apps/calculator/model_generator.py                | 4 ++--
 cara/apps/calculator/templates/calculator.form.html.j2 | 2 +-
 cara/apps/calculator/templates/report.html.j2          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py
index baa164e1..b31528f4 100644
--- a/cara/apps/calculator/model_generator.py
+++ b/cara/apps/calculator/model_generator.py
@@ -42,7 +42,7 @@ class FormData:
     mask_type: str
     mask_wearing_option: str
     mechanical_ventilation_type: str
-    model_version: str
+    calculator_version: str
     opening_distance: float
     event_month: str
     room_number: str
@@ -552,7 +552,7 @@ def baseline_raw_form_data():
         'mask_type': 'Type I',
         'mask_wearing_option': 'mask_off',
         'mechanical_ventilation_type': '',
-        'model_version': calculator.__version__,
+        'calculator_version': calculator.__version__,
         'opening_distance': '0.2',
         'event_month': 'January',
         'room_number': '123',
diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2
index 88993e2f..64731dda 100644
--- a/cara/apps/calculator/templates/calculator.form.html.j2
+++ b/cara/apps/calculator/templates/calculator.form.html.j2
@@ -32,7 +32,7 @@ v{{ calculator_version }} <span style="float:right; font-weight:bold">Please sen
 {% endif %}
 {{ xsrf_form_html }}
 
-<input type="hidden" name="model_version" value="{{ calculator_version }}">
+<input type="hidden" name="calculator_version" value="{{ calculator_version }}">
 
 <div style="width: 33%; float:left;">
 
diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index 93996d71..491fdde1 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -17,7 +17,7 @@
 		<h1 style="display:inline-block; vertical-align:middle; margin-left:-30pt;">Report</h1>
 	</div>
 
-	<p class=subtitle> Created {{ creation_date }} using model version v{{ form.model_version }}</p><br>
+	<p class=subtitle> Created {{ creation_date }} using CARA calculator version v{{ form.calculator_version }}</p><br>
 
   <p><strong>Applicable rules: <br>
   Please ensure that this scenario conforms to current <a href="https://hse.cern/covid-19-information"> CERN HSE rules</a> (minimum ventilation requirements, mask wearing and the maximum number of people permitted in a space).</strong> <br>