From f5210e5c8a17b63e40293b7fe603d3fce6177f68 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 15:49:40 +0100 Subject: [PATCH 1/8] mv filters to the left --- castellum/studies/templates/studies/study_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index bed11a955..b000ef50d 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -30,7 +30,7 @@
-
+
{% translate 'Membership' %}
-- GitLab From 2b58de933a9392c6e23c17b1f06bf7ddb03139bd Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 15:50:15 +0100 Subject: [PATCH 2/8] mv search into sidebar --- .../studies/templates/studies/study_list.html | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index b000ef50d..d54b3055d 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -6,31 +6,29 @@ {% block container_class %}container-lg{% endblock %} {% block content %} -
-
    - {% for value, label in form.display.field.choices %} -
  • - {{ label }} -
    • - {% endfor %} -
-
-
- - {% for field in form %} - {% if field.name != 'q' and field.value %} - {{ field.as_hidden }} - {% endif %} - {% endfor %} -
- -
-
-
-
+
    + {% for value, label in form.display.field.choices %} +
  • + {{ label }} +
    • + {% endfor %} +
+
+
+ + {% for field in form %} + {% if field.name != 'q' and field.value %} + {{ field.as_hidden }} + {% endif %} + {% endfor %} +
+ +
+
+
{% translate 'Membership' %}
-- GitLab From 7b8befa7912d2ff9d69959197069cf06afbfa932 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 15:50:52 +0100 Subject: [PATCH 3/8] turn pills into tabs --- castellum/studies/templates/studies/study_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index d54b3055d..bb664a08d 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -6,7 +6,7 @@ {% block container_class %}container-lg{% endblock %} {% block content %} -
    +
      {% for value, label in form.display.field.choices %}
    • {{ label }} -- GitLab From 5bf972217c3ff8874c538c4415c40228568cdf6d Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 15:51:23 +0100 Subject: [PATCH 4/8] mv tabs into column --- .../studies/templates/studies/study_list.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index bb664a08d..cf235c602 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -6,14 +6,6 @@ {% block container_class %}container-lg{% endblock %} {% block content %} -
        - {% for value, label in form.display.field.choices %} -
      • - {{ label }} -
        • - {% endfor %} -
      -
      @@ -59,6 +51,14 @@
      +
        + {% for value, label in form.display.field.choices %} +
      • + {{ label }} +
        • + {% endfor %} +
      + {% if form.cleaned_data.display == 'calendar' %}
      {% else %} -- GitLab From 6a90655cbd3d0a50003b86b5308008a8ce9e7193 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 15:53:03 +0100 Subject: [PATCH 5/8] mv buttons to top --- .../studies/templates/studies/study_list.html | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index cf235c602..c51d80ea9 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -51,6 +51,21 @@
      +
      + {% has_perm 'studies.change_study' user as can_add_study %} + {% if can_add_study %} + {% if CASTELLUM_ENABLE_STUDY_EXPORT %} + {% translate "Import study" %} + {% endif %} + {% translate "Create new study" %} + + + {% csrf_token %} + + + {% endif %} +
      +
        {% for value, label in form.display.field.choices %}
      • @@ -113,22 +128,6 @@ {% endif %} {% endif %} - -
        - {% has_perm 'studies.change_study' user as can_add_study %} - {% if can_add_study %} - {% if CASTELLUM_ENABLE_STUDY_EXPORT %} - {% translate "Import study" %} - {% endif %} - {% translate "Create new study" %} - -
        - {% csrf_token %} - -
        - - {% endif %} -
      {% endblock %} -- GitLab From 86b01df7281e141e5787a920a673f0ced11ebd9d Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 15:53:54 +0100 Subject: [PATCH 6/8] highlight create button --- castellum/studies/templates/studies/study_list.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index c51d80ea9..9fa1b37b2 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -54,14 +54,13 @@
      {% has_perm 'studies.change_study' user as can_add_study %} {% if can_add_study %} + {% translate "Create new study" %} {% if CASTELLUM_ENABLE_STUDY_EXPORT %} - {% translate "Import study" %} + {% translate "Import study" %} {% endif %} - {% translate "Create new study" %} -
      {% csrf_token %} - +
      {% endif %}
      -- GitLab From bf60e8708322d906caca1bc029c72f95d1919cf9 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 16:41:32 +0100 Subject: [PATCH 7/8] convert filters to form --- castellum/studies/forms.py | 7 ++ .../studies/templates/studies/study_list.html | 73 +++++++++++-------- 2 files changed, 49 insertions(+), 31 deletions(-) diff --git a/castellum/studies/forms.py b/castellum/studies/forms.py index 74b8028a8..9970d818e 100644 --- a/castellum/studies/forms.py +++ b/castellum/studies/forms.py @@ -116,6 +116,13 @@ class StudyFilterForm(forms.Form): start = forms.DateTimeField() end = forms.DateTimeField() + def clean(self): + cleaned_data = super().clean() + if self.data.get('type') == 'onetime_invitation': + cleaned_data['is_onetime_invitation'] = True + print(cleaned_data) + return cleaned_data + class SessionForm(forms.ModelForm): class Meta: diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index 9fa1b37b2..fc29d08ce 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -7,47 +7,58 @@ {% block content %}
      -
      -
      -
      +
      + +
      - {% for field in form %} - {% if field.name != 'q' and field.value %} - {{ field.as_hidden }} - {% endif %} - {% endfor %}
      - +
      - -
      -
      {% translate 'Membership' %}
      -
      +
      +
      + {% translate 'Membership' %} {% for value, label in form.member.field.choices %} - {{ label }} + {% endfor %} -
      -
      -
      -
      {{ form.status.label }}
      -
      - {% translate 'All' %} + +
      +
      + {{ form.status.label }} + {% for value, label in form.status.field.choices %} - {{ label }} + {% endfor %} -
      -
      -
      -
      {{ form.type.label }}
      -
      - {% translate 'All' %} + +
      +
      + {{ form.type.label }} + {% for value, label in form.type.field.choices %} - {{ label }} + {% endfor %} - {{ form.is_onetime_invitation.label }} -
      -
      + + + +
      -- GitLab From eee399446dff05090a4deb8b02603abd03c57d3f Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 30 Nov 2021 19:23:04 +0100 Subject: [PATCH 8/8] fix top margin on missing permission --- castellum/studies/templates/studies/study_list.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index fc29d08ce..6643777b1 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -62,9 +62,9 @@
      -
      - {% has_perm 'studies.change_study' user as can_add_study %} - {% if can_add_study %} + {% has_perm 'studies.change_study' user as can_add_study %} + {% if can_add_study %} +
      {% translate "Create new study" %} {% if CASTELLUM_ENABLE_STUDY_EXPORT %} {% translate "Import study" %} @@ -73,8 +73,8 @@ {% csrf_token %} - {% endif %} -
      +
      + {% endif %}
        {% for value, label in form.display.field.choices %} -- GitLab