From c97d41d00148fb98779362d58daa9e44cf863a0c Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Mon, 13 Jun 2022 17:19:05 +0200
Subject: [PATCH] Short range interaction - changed "shouting" to
 "shouting/singing" UI

---
 cara/apps/calculator/static/js/form.js             | 2 +-
 cara/apps/templates/base/calculator.report.html.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index fafb63dd..7471ccea 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -865,7 +865,7 @@ $(document).ready(function () {
               <option value="" selected disabled>Select type</option>
               <option value="Breathing">Breathing</option>
               <option value="Speaking">Speaking</option>
-              <option value="Shouting">Shouting</option>
+              <option value="Shouting">Shouting/Singing</option>
             </select><br>
             </div>
           </div>
diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2
index 900c87cb..67b579a8 100644
--- a/cara/apps/templates/base/calculator.report.html.j2
+++ b/cara/apps/templates/base/calculator.report.html.j2
@@ -384,7 +384,7 @@
 							</p></li>
 							<ul>
 							{% for interaction in form.short_range_interactions %}
-								<li>Expiratory activity {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.expiration }} </li>
+								<li>Expiratory activity {{ loop.index if form.short_range_interactions|length > 1 }}: {{ "Shouting/Singing" if interaction.expiration == "Shouting" else interaction.expiration }} </li>
 								<li>Start time {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.start_time }} </li>
 								<li>Duration {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.duration }} {{ "minutes" if interaction.duration|float > 1 else "minute" }}</li>
 							{% endfor %}