From 44191f4406bd6c47966785ccded145d06e35125c Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 21 Sep 2021 16:39:01 +0200
Subject: [PATCH 1/2] display blocked/deceased in contact details

---
 .../templates/contacts/__contact_detail.html         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/castellum/contacts/templates/contacts/__contact_detail.html b/castellum/contacts/templates/contacts/__contact_detail.html
index 5a0180aec..0ea83b781 100644
--- a/castellum/contacts/templates/contacts/__contact_detail.html
+++ b/castellum/contacts/templates/contacts/__contact_detail.html
@@ -47,4 +47,16 @@
             {% endblocktranslate %}
         {% endif %}
     </dd>
+
+    {% if contact.subject.blocked or contact.subject.deceased %}
+        <dt class="col-sm-6">{% translate "Status" %}</dt>
+        <dd class="col-sm-6">
+            {% if contact.subject.blocked %}
+                <span class="badge badge-dark my-1">{{ contact.subject|verbose_name:'blocked' }}</span>
+            {% endif %}
+            {% if contact.subject.deceased %}
+                <span class="badge badge-dark my-1">{{ contact.subject|verbose_name:'deceased' }}</span>
+            {% endif %}
+        </dd>
+    {% endif %}
 </dl>
-- 
GitLab


From a7014f2c3b39f690ee217608f5522739bf3146d4 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Wed, 22 Sep 2021 15:22:37 +0200
Subject: [PATCH 2/2] mv badges to name

---
 .../templates/contacts/__contact_detail.html   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/castellum/contacts/templates/contacts/__contact_detail.html b/castellum/contacts/templates/contacts/__contact_detail.html
index 0ea83b781..939b7bd83 100644
--- a/castellum/contacts/templates/contacts/__contact_detail.html
+++ b/castellum/contacts/templates/contacts/__contact_detail.html
@@ -10,6 +10,12 @@
             {% if contact.guardian_of.count > 1 %}
                 {% icon 'users' label=_('This guardian has other wards who may also be suitable for this study.') %}
             {% endif %}
+            {% if contact.subject.blocked %}
+                <span class="badge badge-dark my-1">{{ contact.subject|verbose_name:'blocked' }}</span>
+            {% endif %}
+            {% if contact.subject.deceased %}
+                <span class="badge badge-dark my-1">{{ contact.subject|verbose_name:'deceased' }}</span>
+            {% endif %}
         </dd>
     {% endif %}
 
@@ -47,16 +53,4 @@
             {% endblocktranslate %}
         {% endif %}
     </dd>
-
-    {% if contact.subject.blocked or contact.subject.deceased %}
-        <dt class="col-sm-6">{% translate "Status" %}</dt>
-        <dd class="col-sm-6">
-            {% if contact.subject.blocked %}
-                <span class="badge badge-dark my-1">{{ contact.subject|verbose_name:'blocked' }}</span>
-            {% endif %}
-            {% if contact.subject.deceased %}
-                <span class="badge badge-dark my-1">{{ contact.subject|verbose_name:'deceased' }}</span>
-            {% endif %}
-        </dd>
-    {% endif %}
 </dl>
-- 
GitLab