bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add 'show only jobs with active members'; add 'hide subitem if no members'

Browse Source
This commit is contained in:
Patrick Mayr
2020-09-07 11:16:54 +00:00
parent 5026fb1ff8
commit 6ab25da5c7
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fet2020/posts/views.py
View File

@@ -43,9 +43,10 @@ def tags(request, tag=""):
active_members = JobMember.active_member.get_members_of_job(job_names=job_names) active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
for idx, item in enumerate(job_names): for idx, item in enumerate(job_names):
members.append( if active_members[idx]:
(job_names[idx], active_members[idx], tag + "#" + slug_list[idx]) members.append(
) (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
)
context = { context = {
"posts": posts, "posts": posts,

24
fet2020/templates/members/jobs_list.html
View File

@@ -1,10 +1,18 @@
<b>Aktuelle Mitglieder:</b>
{% with job_memberships=active_members %} {% if active_members %}
{% include 'members/partials/_job_membership_grid.html' %}
{% endwith %}
<b>Vergangene Mitglieder: </b> <b>Aktuelle Mitglieder:</b>
{% with job_memberships=inactive_members %} {% with job_memberships=active_members %}
{% include 'members/partials/_job_membership_grid.html' %} {% include 'members/partials/_job_membership_grid.html' %}
{% endwith %} {% endwith %}
{% endif %}
{% if inactive_members %}
<b>Vergangene Mitglieder: </b>
{% with job_memberships=inactive_members %}
{% include 'members/partials/_job_membership_grid.html' %}
{% endwith %}
{% endif %}