From b1b0c07098bba8f8272f81bd5a6f1a9229b256f8 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Tue, 13 Sep 2022 14:52:47 +0200
Subject: [PATCH] Added new icon for cloth mask

---
 caimira/apps/static/images/masks/cloth.png       | Bin 0 -> 2189 bytes
 .../apps/templates/base/calculator.form.html.j2  |   2 +-
 .../apps/calculator/test_model_generator.py      |   1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 caimira/apps/static/images/masks/cloth.png

diff --git a/caimira/apps/static/images/masks/cloth.png b/caimira/apps/static/images/masks/cloth.png
new file mode 100644
index 0000000000000000000000000000000000000000..40481b68dcb01794b3a8e6ef9ec8a4d57f8e1766
GIT binary patch
literal 2189
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
P00000NkvXXu0mjf@R&MP

literal 0
HcmV?d00001

diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2
index 4a73a9fb..665527f6 100644
--- a/caimira/apps/templates/base/calculator.form.html.j2
+++ b/caimira/apps/templates/base/calculator.form.html.j2
@@ -299,7 +299,7 @@
         <input type="radio" id="mask_type_cloth"  name="mask_type" value="Cloth" onclick="require_fields(this)">
           <label for="mask_type_cloth">
             Cloth
-            <img class="mask_icons" src="/static/images/masks/ffp2.png">
+            <img class="mask_icons" src="/static/images/masks/cloth.png">
           </label>
       </div>
     </div>
diff --git a/caimira/tests/apps/calculator/test_model_generator.py b/caimira/tests/apps/calculator/test_model_generator.py
index 1dbb4961..787e7a8e 100644
--- a/caimira/tests/apps/calculator/test_model_generator.py
+++ b/caimira/tests/apps/calculator/test_model_generator.py
@@ -30,6 +30,7 @@ def test_model_from_dict_invalid(baseline_form_data):
     [
         ["No mask"],
         ["Type I"],
+        ["Cloth"],
     ]
 )
 def test_blend_expiration(mask_type):