From 32fe76f8aeae8425220fe8d3d688fcda1d78ec6c Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Sat, 24 Oct 2020 18:30:17 +0000
Subject: [PATCH] fix member list in hashtag links

---
 fet2020/posts/views.py           | 13 ++-----------
 fet2020/templates/posts/tag.html | 31 ++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index b0c5c209..ac40ebb5 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -38,16 +38,7 @@ def tags(request, tag=""):
     featured_post = Post.objects.get_visible_articles().filter(slug=tag).first()
     members = []
 
-    #job_names, slug_list = JobMember.jobs.get_job_names(slug=tag)
-
-    if None:
-        active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
-
-        for idx, item in enumerate(job_names):
-            if active_members[idx]:
-                members.append(
-                    (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
-                )
+    job_members = JobMember.active_member.get_all_by_slug(slug=tag)
 
     author_image = None
     if featured_post:
@@ -60,7 +51,7 @@ def tags(request, tag=""):
         "posts": posts,
         "author_image": author_image,
         "featured_post": featured_post,
-        "members": None,
+        "job_members": job_members,
         "tags_list": None,
     }
 
diff --git a/fet2020/templates/posts/tag.html b/fet2020/templates/posts/tag.html
index 7c773635..8b116fc7 100644
--- a/fet2020/templates/posts/tag.html
+++ b/fet2020/templates/posts/tag.html
@@ -37,23 +37,32 @@
 {% endif %}
 
 <div class="grid-container">
-    {% for member in members %}
-        <h2>{{member.0}}<a class="headerlink" href="/members/jobs/{{member.2}}" title="Permalink to {{member.2}}"> #</a></h2>
+    <!-- show job lists in a job group -->
+    {% regroup job_members by job.name as all_jobmem_list %}
 
-        <div class="grid-x">
-            {% for mem in member.1 %}
+    {% for jobmem in all_jobmem_list %}
 
-                {% with member=mem.member %}
-                <div class="medium-3 large-2 small-6 cell">
-                    <h2>{{member.surname}}</h2>
-                    {% include 'members/partials/_member.html' %}
-                </div>
-                {% endwith %}
+        <div class="padding-top-1 padding-left-1 padding-bottom-1 padding-right-1" style="background-color: white;">
 
-            {% endfor %}
+            <h2>{{jobmem.grouper}}<a class="headerlink" href="#{{jobmem.list.0.job.slug}}" title="Permalink to {{jobmem.grouper}}"> #</a></h2>
+            <b>Aktuelle Mitglieder:</b>
+
+            <div class="grid-x">
+
+                {% for jm in jobmem.list %}
+                    {% with member=jm.member %}
+                    <div class="medium-3 large-2 small-6 cell">
+                        <h2>{{jm.member.firstname}} {{jm.member.surname}}</h2>
+                        {% include 'members/partials/_member.html' %}
+                    </div>
+                    {% endwith %}
+                {% endfor %}
+
+            </div>
         </div>
 
     {% endfor %}
+
 </div>
 
 <div class="grid-container">