update member view (add jobs for each member, delete one grid style)

fet2020/members/urls.py

@@ -8,6 +8,5 @@ urlpatterns = [
 
     path('<str:filter>', views.members_view),
     path('jobs/<str:slug>', views.jobs_view),
-    path('job/<str:slug>', views.job_view),
     path('member/<str:member_name>', views.profile_view, name="member"),
 ]

fet2020/members/views.py

@@ -1,9 +1,8 @@
 from django.shortcuts import render
-# from django.http import HttpResponse
 
 from collections import deque
 
-from .models import Member, JobMember, JobGroup, MemberSerializer, Job
+from .models import Member, JobMember, JobGroup, MemberSerializer
 
 from rest_framework import viewsets
 from rest_framework import permissions
@@ -47,24 +46,6 @@ def jobs_view(request, slug=None):
     return render(request, 'members/index.html', context)
 
 
-def job_view(request, slug=None):
-    job_group = deque(JobGroup.objects.all())
-    job_list = []
-    job = Job.objects.get(slug=slug)
-    job_names = [job.name]
-    active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
-    inactive_members = JobMember.inactive_member.get_members_of_job(job_names=job_names)
-
-    for idx, item in enumerate(job_names):
-        job_list.append((job_names[idx], active_members[idx], inactive_members[idx]))
-
-    context = {
-        "job_group": job_group,
-        "job_list": job_list,
-    }
-    return render(request, 'members/index.html', context)
-
-
 def members_view(request, filter=None):
     job_group = deque(JobGroup.objects.all())
 
@@ -86,12 +67,15 @@ def members_view(request, filter=None):
 def profile_view(request, member_name=None):
     job_group = deque(JobGroup.objects.all())
     member = None
+    jobs = None
 
     member = deque(Member.all_members.filter(nickname=member_name))
+    jobs = deque(JobMember.members.filter(member__nickname=member_name))
 
     context = {
         "job_group": job_group,
         "member": member,
+        "jobs": jobs,
     }
 
     return render(request, 'members/index.html', context)

fet2020/templates/members/jobs_list.html

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

fet2020/templates/members/members_list.html

@@ -1,18 +1,11 @@
 
 <div class="grid-container">
-    <h2> Grid Style</h2>
     <div class="grid-x">
     {% for member in members %}
         <div class="medium-3 large-2 small-6 cell">
+        <h2>{{member.surname}}</h2>
         {% include 'members/partials/_member.html' %}
         </div>
     {% endfor %}
     </div>
-
-    <h2> Grid Style 2</h2>
-    <div class="grid-x">
-    {% for member in members %}
-        {% include 'members/partials/_member.html' %}
-    {% endfor %}
-    </div>
 </div>

fet2020/templates/members/partials/_member.html

@@ -1,8 +1,10 @@
-
-
 {# only thumb and name of member #}
-{% load thumbnail %}
 <a class="thumbnail member-thumb" href="/members/member/{{member.nickname}}" style="width:150px;height:150px">
     <img src="{{member.image.thumb.url}}" alt="" />
-<div class="thumb-layer"><div><h1>{{member.nickname}}</h1> <p>{{member.firstname}} {{member.surname}}</p></div></div>
+    <div class="thumb-layer">
+        <div>
+            <h1>{{member.nickname}}</h1>
+            <p>{{member.firstname}} {{member.surname}}</p>
+        </div>
+    </div>
 </a>

fet2020/templates/members/partials/_member_details.html

@@ -1,19 +1,20 @@
 {#  This template shows one member and all the details (that are ment for public) including a list of current jobs #}
-{% load thumbnail %}
 <div class="media-object">
-  <div class="media-object-section">
-    <div class="thumbnail">
-      <img src= "{{member.image.url}}" style="width:150px;">
-      
+    <div class="media-object-section">
+        <div class="thumbnail">
+            <img src= "{{member.image.url}}" style="width:150px;">
+        </div>
+    </div>
+    <div class="media-object-section main-section">
+        <h1>{{member.firstname}} {{member.surname}}</h1>
+        <p>Spitzname: {{member.nickname}} </br>
+        Name: {{member.firstname}} {{member.surname}} </br>
+        Mailaccount: {{member.mailaccount}} </br>
+        Beschreibung: {{member.description|safe}} </br>
+        </p>
+        ehrenamtliche Tätigkeiten </br>
+        {% for jobm in jobs %}
+            {{jobm.job.name}}: {{jobm.job_start|date}} - {{jobm.job_end|date}} </br>
+        {% endfor %}
     </div>
-  </div>
-  <div class="media-object-section main-section">
-    <h1>{{member.firstname}} {{member.surname}}</h1>
-    <p>Spitzname: {{member.nickname}} </br>
-    Name: {{member.firstname}} {{member.surname}} </br>
-    Mailaccount: {{member.mailaccount}} </br>
-    Beschreibung: {{member.description|safe}} </br>
-    </p>
-  </div>
 </div>
-