diff --git a/fet2020/members/urls.py b/fet2020/members/urls.py index 39b4f029..9a9fedc4 100644 --- a/fet2020/members/urls.py +++ b/fet2020/members/urls.py @@ -8,5 +8,6 @@ urlpatterns = [ path('', views.members_view), path('jobs/', views.jobs_view), + path('job/', views.job_view), path('member/', views.profile_view, name="member"), ] \ No newline at end of file diff --git a/fet2020/members/views.py b/fet2020/members/views.py index 69b45384..bcf55e56 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -3,7 +3,7 @@ from django.shortcuts import render from collections import deque -from .models import Member, JobMember, JobGroup, MemberSerializer +from .models import Member, JobMember, JobGroup, MemberSerializer, Job from rest_framework import viewsets from rest_framework import permissions @@ -45,7 +45,24 @@ def jobs_view(request, slug=None): "job_group": job_group, "job_list": job_list, } + 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) diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html index 43254720..66493f63 100644 --- a/fet2020/templates/layout.html +++ b/fet2020/templates/layout.html @@ -12,7 +12,7 @@ {% block header %} {% endblock %} - +