From 5026fb1ff8ee14bae300b02217c30e1ae937e897 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Mon, 7 Sep 2020 10:20:05 +0000
Subject: [PATCH 1/2] add 'show members when searching for the correspondent
 hashtag'

---
 fet2020/members/models.py        |  6 +++---
 fet2020/posts/views.py           | 14 +++++++++++++-
 fet2020/templates/posts/tag.html | 32 +++++++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/fet2020/members/models.py b/fet2020/members/models.py
index d9569356..b10fa292 100644
--- a/fet2020/members/models.py
+++ b/fet2020/members/models.py
@@ -11,7 +11,7 @@ from rest_framework import serializers
 
 
 class MemberQuerySet(models.QuerySet):
-    def get_members(self):
+    def get_active(self):
         date_today = timezone.now().date()
 
         return self.filter(
@@ -35,11 +35,11 @@ class ActiveMemberManager(models.Manager):
     def get_members_of_job(self, job_names):
         tmp_list = []
         for job_name in job_names:
-            tmp_list.append(self.get_queryset().get_members().filter(Q(job__name=job_name)))
+            tmp_list.append(self.get_queryset().get_active().filter(Q(job__name=job_name)))
         return tmp_list
 
     def get_all(self):
-        return self.get_queryset().get_members()
+        return self.get_queryset().get_active()
 
     def get_queryset(self):
         return MemberQuerySet(self.model, using=self._db)
diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index 40eb18f4..b8d7a0fb 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -10,7 +10,7 @@ from rest_framework import viewsets
 # from rest_framework import permissions
 
 from .models import Post, PostSerializer, FetMeeting
-from members.models import Member
+from members.models import Member, JobMember
 # from documents import add_ep_to_response, get_ep_sessionid2
 from documents import get_pad_link
 from documents.etherpadlib import add_ep_cookie
@@ -35,10 +35,22 @@ def index(request):
 def tags(request, tag=""):
     posts = deque(Post.objects.get_visible_articles().filter(tags__name=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 job_names:
+        active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
+
+        for idx, item in enumerate(job_names):
+            members.append(
+                (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
+            )
 
     context = {
         "posts": posts,
         "featured_post": featured_post,
+        "members": members,
         "tags_list": None,
     }
 
diff --git a/fet2020/templates/posts/tag.html b/fet2020/templates/posts/tag.html
index b1f036c6..f518f382 100644
--- a/fet2020/templates/posts/tag.html
+++ b/fet2020/templates/posts/tag.html
@@ -34,19 +34,37 @@
     </div>
 </div>
 </div>
- {% endwith %}
+{% endwith %}
 {% 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>
 
+        <div class="grid-x">
+            {% for mem in member.1 %}
 
-<div class="grid-x">
+                {% with member=mem.member %}
+                <div class="medium-3 large-2 small-6 cell">
+                    <h2>{{member.surname}}</h2>
+                    {% include 'members/partials/_member.html' %}
+                </div>
+                {% endwith %}
+
+            {% endfor %}
+        </div>
+
+    {% endfor %}
+</div>
+
+<div class="grid-container">
+    <div class="grid-x">
     <div class="medium-8 cell">
     {% for post in posts %}
-   {% include 'posts/partials/_posts_hero.html' %}
+        {% include 'posts/partials/_posts_hero.html' %}
     {% endfor %}
-
-    
+    </div>
     </div>
 </div>
-</div>
-{% endblock %}
\ No newline at end of file
+
+{% endblock %}

From 6ab25da5c7a413bfcc08d4090ea307966a63e57c Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Mon, 7 Sep 2020 11:16:54 +0000
Subject: [PATCH 2/2] add 'show only jobs with active members'; add 'hide
 subitem if no members'

---
 fet2020/posts/views.py                   |  7 ++++---
 fet2020/templates/members/jobs_list.html | 24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index b8d7a0fb..95af1ae0 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -43,9 +43,10 @@ def tags(request, tag=""):
         active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
 
         for idx, item in enumerate(job_names):
-            members.append(
-                (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
-            )
+            if active_members[idx]:
+                members.append(
+                    (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
+                )
 
     context = {
         "posts": posts,
diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html
index cb9f680e..db5acb90 100644
--- a/fet2020/templates/members/jobs_list.html
+++ b/fet2020/templates/members/jobs_list.html
@@ -1,10 +1,18 @@
-<b>Aktuelle Mitglieder:</b>
 
-{% with job_memberships=active_members %}
-    {% include 'members/partials/_job_membership_grid.html' %}
-{% endwith %}
+{% if active_members %}
 
-<b>Vergangene Mitglieder: </b>
-{% with job_memberships=inactive_members %}
-    {% include 'members/partials/_job_membership_grid.html' %}
-{% endwith %}
+    <b>Aktuelle Mitglieder:</b>
+    {% with job_memberships=active_members %}
+        {% include 'members/partials/_job_membership_grid.html' %}
+    {% endwith %}
+
+{% endif %}
+
+{% if inactive_members %}
+
+    <b>Vergangene Mitglieder: </b>
+    {% with job_memberships=inactive_members %}
+        {% include 'members/partials/_job_membership_grid.html' %}
+    {% endwith %}
+
+{% endif %}