small fix

This commit is contained in:
2020-08-29 13:01:07 +00:00
parent 04e7bb911b
commit 7f8bd2240b
4 changed files with 24 additions and 7 deletions

View File

@@ -8,5 +8,6 @@ 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"),
]

View File

@@ -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)