From 443bb1e4b39fa9086f28288e8e79f9051b527c97 Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Thu, 20 Jan 2022 12:19:43 +0000
Subject: [PATCH] update and simplify members

---
 fet2020/members/views.py                      |  2 +-
 fet2020/templates/members/jobs_list.html      | 17 ------
 fet2020/templates/members/members_list.html   |  8 ---
 .../partials/_job_membership_grid.html        | 10 ----
 .../templates/members/partials/_member.html   |  8 ---
 .../members/partials/_member_details.html     | 57 -------------------
 6 files changed, 1 insertion(+), 101 deletions(-)
 delete mode 100644 fet2020/templates/members/jobs_list.html
 delete mode 100644 fet2020/templates/members/members_list.html
 delete mode 100644 fet2020/templates/members/partials/_job_membership_grid.html
 delete mode 100644 fet2020/templates/members/partials/_member.html
 delete mode 100644 fet2020/templates/members/partials/_member_details.html

diff --git a/fet2020/members/views.py b/fet2020/members/views.py
index adc47e6b..99a70b35 100644
--- a/fet2020/members/views.py
+++ b/fet2020/members/views.py
@@ -83,7 +83,7 @@ def members_view(request, filter=None):
 
     for elem in Member.MemberRole:
         if filter == elem.label.lower():
-            members = deque(Member.all_members.filter(role=elem.value))
+            members = Member.all_members.filter(role=elem.value)
             break
     else:
         logger.info("Wrong member role '{}'".format(filter))
diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html
deleted file mode 100644
index c90be67d..00000000
--- a/fet2020/templates/members/jobs_list.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% regroup job_members by job.name as all_jobmem_list %}
-
-{% for jobmem in all_jobmem_list %}
-    <article id="{{ jobmem.list.0.job.slug }}" class="members-article">
-        <a href="#{{ jobmem.list.0.job.slug }}" class="title">
-            <i class="far fa-link"></i>
-            <h3 class="members-section-title">{{ jobmem.grouper }}</h3>
-        </a>
-        <div class="members-listing">
-            {% for jm in jobmem.list %}
-                {% with member=jm.member %}
-                {% include 'members/partials/_job_membership_grid.html' %}
-                {% endwith %}
-            {% endfor %}
-        </div>
-    </article>
-{% endfor %}
diff --git a/fet2020/templates/members/members_list.html b/fet2020/templates/members/members_list.html
deleted file mode 100644
index 7b428a30..00000000
--- a/fet2020/templates/members/members_list.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="grid-x align-bottom">
-    {% for member in members %}
-        <div class="cell large-2 medium-3 small-6 padding-right-1" style="text-align: center">
-            <h2>{{member.firstname}} {{member.surname}}</h2>
-            {% include 'members/partials/_member.html' %}
-        </div>
-    {% endfor %}
-</div>
diff --git a/fet2020/templates/members/partials/_job_membership_grid.html b/fet2020/templates/members/partials/_job_membership_grid.html
deleted file mode 100644
index 42393ea0..00000000
--- a/fet2020/templates/members/partials/_job_membership_grid.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<figure>
-    <a href="{{ member.get_absolute_url }}">
-        <img loading="lazy" src="{{ member.image.thumb.url }}" alt="Portraitfoto von {{ member.firstname }}" class="w-36 h-36 bg-white">
-        <figcaption>
-            <h4 class="member-name">{{ member.firstname }} {{ member.surname }}</h4>
-            <p class="member-role">{{ jm.get_job_role_display }}</p>
-            <p class="member-date">Seit {{ jm.job_start|date:"d. M. Y" }}</p>
-        </figcaption>
-    </a>
-</figure>
diff --git a/fet2020/templates/members/partials/_member.html b/fet2020/templates/members/partials/_member.html
deleted file mode 100644
index c3cb8a52..00000000
--- a/fet2020/templates/members/partials/_member.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<figure>
-    <a href="{{ member.get_absolute_url }}">
-        <img loading="lazy" src="{{ member.image.thumb.url }}" alt="Portraitfoto von {{ member.firstname }}" class="w-36 h-36 bg-white">
-        <figcaption>
-            <h3>{{ member.firstname }} {{ member.surname }}</h3>
-        </figcaption>
-    </a>
-</figure>
diff --git a/fet2020/templates/members/partials/_member_details.html b/fet2020/templates/members/partials/_member_details.html
deleted file mode 100644
index e460ea21..00000000
--- a/fet2020/templates/members/partials/_member_details.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{#  This template shows one member and all the details (that are ment for public) including a list of current jobs #}
-{% load softhyphen_tags %}
-{% load static %}
-
-<section class="flex-grow max-w-prose my-8 sm:my-0 text-justify text-gray-800 dark:text-gray-300">
-    <!-- Alternativtext auf jede Person anpassen: Name im alt="" dynamisch erzeugen -->
-    <img loading="lazy" src="{{ member.image.portrait.url }}" alt="Portraitfoto von {{ member.firstname }} {{ member.surname }}" class="md:float-left w-36 mr-2 mb-2">
-    <div x-data="{ expandList: false }">
-        <h2 class="mb-2 text-lg text-gray-900 dark:text-gray-100 text-left">{{ member.firstname }} {{ member.surname }}</h2>
-        <div class="mb-2">
-            Spitzname: {{ member.nickname }} <br>
-            Mailaccount: {{ member.mailaccount }} <br>
-        </div>
-        <div class="mb-2">
-            {{ member.description|softhyphen|safe }}
-        </div>
-        {% if active_jobs or inactive_jobs %}
-            <h3 class="group mt-4 mb-2 text-lg text-gray-900">Ehrenamtliche Tätigkeiten:
-                {% if inactive_jobs %}
-                    <button class="inline float-right text-sm px-2 py-1 text-gray-600 md:text-gray-500 group-hover:text-gray-600 border rounded border-gray-500 md:border-gray-400 group-hover:border-gray-500"
-                        @click="expandList = ! expandList"
-                    >
-                        <span x-show="!expandList">Mehr</span><span x-show="expandList">Weniger</span><span class="hidden md:inline"> anzeigen</span>
-                        <i class="fa-fw fa-solid fa-angle-left transition transform -ml-1"
-                            :class="expandList ? '-rotate-90' : ''"
-                        ></i>
-                    </button>
-                {% endif %}
-            </h3>
-
-            <ul class="flex flex-col gap-1">
-                {% for jobm in active_jobs %}
-                    <li class="flex flex-row flex-wrap">
-                        <span>{{ jobm.job.name }}:</span>
-                        <span class="ml-2 text-gray-600 dark:text-gray-400">{{ jobm.job_start|date }} -</span>
-                    </li>
-                {% endfor %}
-            </ul>
-            <ul class="flex flex-col gap-1 mt-1"
-                x-show="expandList"
-                x-transition:enter="transition duration-100 ease-in"
-                x-transition:enter-start="opacity-0"
-                x-transition:enter-end="opacity-100"
-                x-transition:leave="transition duration-100 ease-out"
-                x-transition:leave-start="opacity-100"
-                x-transition:leave-end="opacity-0"
-            >
-                {% for jobm in inactive_jobs %}
-                    <li class="flex flex-row flex-wrap">
-                        <span>{{ jobm.job.name }}:</span>
-                        <span class="ml-2 text-gray-600 dark:text-gray-400">{{ jobm.job_start|date }} - {{ jobm.job_end|date }}</span>
-                    </li>
-                {% endfor %}
-            </ul>
-        {% endif %}
-    </div>
-</section>