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

Merge branch 'master' of https://git.fet.at/bofh/fet2020

Browse Source
This commit is contained in:
Patrick Mayr
2020-09-05 09:57:04 +00:00
parent b578f7679c 36761ac4d5
commit 2cf7108236
3 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fet2020/templates/members/index.html
View File

@@ -34,8 +34,7 @@
<div id="jobs-{{job.slug}}" class="tab-pane"> <div id="jobs-{{job.slug}}" class="tab-pane">
<div class="grid-container"> <div class="grid-container">
<h2>{{job.0}}</h2>
<h2>{{job.0}}</h2>
{% with active_members=job.1 inactive_members=job.2 %} {% with active_members=job.1 inactive_members=job.2 %}
{% include 'members/jobs_list.html' %} {% include 'members/jobs_list.html' %}

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

@@ -1,26 +1,10 @@
<b>Aktuelle Mitglieder:</b>
Aktuelle Mitglieder: {{active_members.count}} {% with job_memberships=active_members %}
<div class="grid-x"> {% include 'members/partials/_job_membership_grid.html' %}
{% for mem in active_members %} {% endwith %}
<div class="medium-6 cell">
<h2>{{mem.member.surname}}</h2>
{% with member=mem.member %}
{% include 'members/partials/_member.html' %}
{% endwith %}
<h2>{{mem.get_job_role_display}} (seit {{mem.job_start}})</h2>
</div>
{% endfor %}
</div>
Vergangene Mitglieder: {{inactive_members.count}} <b>Vergangene Mitglieder: </b>
<div class="grid-x"> {% with job_memberships=inactive_members %}
{% for mem in inactive_members %} {% include 'members/partials/_job_membership_grid.html' %}
<div class="medium-6 cell"> {% endwith %}
<h2>{{mem.member.surname}}</h2>
{% with member=mem.member %}
{% include 'members/partials/_member.html' %}
{% endwith %}
<h2>{{mem.get_job_role_display}} ({{mem.job_start}} - {{mem.job_end}})</h2>
</div>
{% endfor %}
</div>

11
fet2020/templates/members/partials/_job_membership_grid.html Normal file
View File

@@ -0,0 +1,11 @@
<div class="grid-x">
{% for mem in job_memberships %}
{% with member=mem.member %}
<div class="medium-3 large-2 small-6 cell">
<h2>{{mem.member.surname}}</h2>
{% include 'members/partials/_member.html' %}
<h2>{{mem.get_job_role_display}} ({{mem.job_start}} - {{mem.job_end}})</h2>
</div>
{%endwith %}
{% endfor %}
</div>