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)