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

update and simplify members

Browse Source
This commit is contained in:
Patrick Mayr
2022-01-20 12:19:43 +00:00
parent 6112bb2623
commit aed985f549
11 changed files with 156 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fet2020/members/views.py
View File

@@ -39,7 +39,7 @@ def __get_job_groups():
def index(request):
pinned_job_groups, unpinned_job_groups = __get_job_groups()
members = deque(Member.all_members.all())
members = Member.all_members.all()
fs_info = CustomFlatPage.objects.filter(title__iexact="fachschaft").first()
@@ -50,7 +50,7 @@ def index(request):
"fs_info": fs_info,
}
return render(request, "members/index.html", context)
return render(request, "members/members.html", context)
def jobs_view(request, slug=None):
@@ -65,15 +65,17 @@ def jobs_view(request, slug=None):
raise Http404("wrong job")
job_members = JobMember.active_member.get_all_by_slug(slug=slug)
active_job_group = JobGroup.objects.filter(slug=slug).first()
context = {
"pinned_job_groups": pinned_job_groups,
"unpinned_job_groups": unpinned_job_groups,
"description": description,
"job_members": job_members,
"active_job_group": active_job_group,
}
return render(request, "members/index.html", context)
return render(request, "members/jobs.html", context)
def members_view(request, filter=None):
@@ -96,7 +98,7 @@ def members_view(request, filter=None):
"fs_info": fs_info,
}
return render(request, "members/index.html", context)
return render(request, "members/members.html", context)
def profile_view(request, member_id=None):
@@ -107,8 +109,8 @@ def profile_view(request, member_id=None):
logger.info("Wrong member id '{}'".format(member_id))
raise Http404("no member")
active_jobs = deque(JobMember.members.get_active_jobs(member_id))
inactive_jobs = deque(JobMember.members.get_inactive_jobs(member_id))
active_jobs = JobMember.members.get_active_jobs(member_id)
inactive_jobs = JobMember.members.get_inactive_jobs(member_id)
context = {
"pinned_job_groups": pinned_job_groups,