From 1471eb1ec908667749c2b825baf80a121969dba2 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Wed, 1 Dec 2021 16:56:18 +0100
Subject: [PATCH 1/3] study overview: display all members

---
 .../studies/templates/studies/study_detail.html  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/castellum/studies/templates/studies/study_detail.html b/castellum/studies/templates/studies/study_detail.html
index 2b95e902f..d773d23db 100644
--- a/castellum/studies/templates/studies/study_detail.html
+++ b/castellum/studies/templates/studies/study_detail.html
@@ -27,19 +27,17 @@
             </dd>
         {% endif %}
 
+        <dt class="col-sm-6">{% translate 'Members' %}</dt>
+        <dd class="col-sm-6">
+            {% for member in object.members.all %}
+                {{ member.get_full_name }}{% if not forloop.last %},{% endif %}
+            {% endfor %}
+        </dd>
+
         <dt class="col-sm-6">{% translate 'Consent document uploaded' %}</dt>
         <dd class="col-sm-6">{% if object.consent %}{% translate 'Yes' %}{% else %}{% translate 'No' %}{% endif %}</dd>
     </dl>
 
-    {% if not object.is_onetime_invitation %}
-        <h3 class="h5">{% translate "Member management" %}</h3>
-
-        <dl class="row">
-            <dt class="col-sm-6">{% translate 'Recruiters' %}</dt>
-            <dd class="col-sm-6">{{ object.recruiters|join:', '|default:'—' }}</dd>
-        </dl>
-    {% endif %}
-
     <h3 class="h5">{% translate "Recruitment settings" %}</h3>
 
     <dl class="row">
-- 
GitLab


From e342cb553fa4354a7f25a96fca012ea114456ab4 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Wed, 1 Dec 2021 17:01:37 +0100
Subject: [PATCH 2/3] study overview: add dedicated section on sessions

---
 .../templates/studies/study_detail.html       | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/castellum/studies/templates/studies/study_detail.html b/castellum/studies/templates/studies/study_detail.html
index d773d23db..3caa0034f 100644
--- a/castellum/studies/templates/studies/study_detail.html
+++ b/castellum/studies/templates/studies/study_detail.html
@@ -3,7 +3,6 @@
 
 {% block content %}
     <h3 class="h5">{% translate "General" %}</h3>
-
     <dl class="row">
         <dt class="col-sm-6">{{ object|verbose_name:'principal_investigator' }}</dt>
         <dd class="col-sm-6">{{ object|display:'principal_investigator' }}</dd>
@@ -11,10 +10,26 @@
         <dt class="col-sm-6">{{ object|verbose_name:'affiliated_scientists' }}</dt>
         <dd class="col-sm-6">{{ object|display:'affiliated_scientists' }}</dd>
 
-        <dt class="col-sm-6">{% translate 'Type of study' %}</dt>
-        <dd class="col-sm-6">{{ object|display:'study_type' }}</dd>
+        <dt class="col-sm-6">{% translate 'Members' %}</dt>
+        <dd class="col-sm-6">
+            {% for member in object.members.all %}
+                {{ member.get_full_name }}{% if not forloop.last %},{% endif %}
+            {% endfor %}
+        </dd>
+
+        <dt class="col-sm-6">{% translate 'Consent document uploaded' %}</dt>
+        <dd class="col-sm-6">{% if object.consent %}{% translate 'Yes' %}{% else %}{% translate 'No' %}{% endif %}</dd>
+    </dl>
+
+    {% if not object.is_onetime_invitation %}
+        <h3 class="h5">{% translate "Sessions" %}</h3>
+        <dl class="row">
+            <dt class="col-sm-6">{% translate 'Count' %}</dt>
+            <dd class="col-sm-6">{{ object.studysession_set.count }}</dd>
+
+            <dt class="col-sm-6">{% translate 'Types of sessions' %}</dt>
+            <dd class="col-sm-6">{{ object|display:'study_type' }}</dd>
 
-        {% if not object.is_onetime_invitation %}
             <dt class="col-sm-6">{% translate 'Scheduled runtime' %}</dt>
             <dd class="col-sm-6">
                 {% if object.sessions_start and object.sessions_end %}
@@ -25,21 +40,10 @@
                     &mdash;
                 {% endif %}
             </dd>
-        {% endif %}
-
-        <dt class="col-sm-6">{% translate 'Members' %}</dt>
-        <dd class="col-sm-6">
-            {% for member in object.members.all %}
-                {{ member.get_full_name }}{% if not forloop.last %},{% endif %}
-            {% endfor %}
-        </dd>
-
-        <dt class="col-sm-6">{% translate 'Consent document uploaded' %}</dt>
-        <dd class="col-sm-6">{% if object.consent %}{% translate 'Yes' %}{% else %}{% translate 'No' %}{% endif %}</dd>
-    </dl>
+        </dl>
+    {% endif %}
 
     <h3 class="h5">{% translate "Recruitment settings" %}</h3>
-
     <dl class="row">
         {% if study.is_onetime_invitation %}
             <dt class="col-sm-6">{% translate 'Contacted subjects' %}</dt>
-- 
GitLab


From 7a47d1f83917b6d223d6f8223c0a4e1b5c1e1fd9 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Wed, 1 Dec 2021 17:02:27 +0100
Subject: [PATCH 3/3] study overview: rm affiliated scientists

---
 castellum/studies/templates/studies/study_detail.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/castellum/studies/templates/studies/study_detail.html b/castellum/studies/templates/studies/study_detail.html
index 3caa0034f..74d5fac86 100644
--- a/castellum/studies/templates/studies/study_detail.html
+++ b/castellum/studies/templates/studies/study_detail.html
@@ -3,13 +3,11 @@
 
 {% block content %}
     <h3 class="h5">{% translate "General" %}</h3>
+
     <dl class="row">
         <dt class="col-sm-6">{{ object|verbose_name:'principal_investigator' }}</dt>
         <dd class="col-sm-6">{{ object|display:'principal_investigator' }}</dd>
 
-        <dt class="col-sm-6">{{ object|verbose_name:'affiliated_scientists' }}</dt>
-        <dd class="col-sm-6">{{ object|display:'affiliated_scientists' }}</dd>
-
         <dt class="col-sm-6">{% translate 'Members' %}</dt>
         <dd class="col-sm-6">
             {% for member in object.members.all %}
-- 
GitLab