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

small fix

Browse Source
This commit is contained in:
Andreas Stephanides
2020-08-29 13:01:07 +00:00
parent 04e7bb911b
commit 7f8bd2240b
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fet2020/members/urls.py
View File

@@ -8,5 +8,6 @@ urlpatterns = [
path('<str:filter>', views.members_view), path('<str:filter>', views.members_view),
path('jobs/<str:slug>', views.jobs_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"), path('member/<str:member_name>', views.profile_view, name="member"),
] ]

19
fet2020/members/views.py
View File

@@ -3,7 +3,7 @@ from django.shortcuts import render
from collections import deque 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 viewsets
from rest_framework import permissions from rest_framework import permissions
@@ -45,7 +45,24 @@ def jobs_view(request, slug=None):
"job_group": job_group, "job_group": job_group,
"job_list": job_list, "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) return render(request, 'members/index.html', context)

4
fet2020/templates/layout.html
View File

@@ -12,7 +12,7 @@
{% block header %} {% block header %}
{% endblock %} {% endblock %}
</head> </head>
<body style="min-height:100%;"> <body style="min-height:100%; position:relative">
<div class="top-bar" id="main-menu"> <div class="top-bar" id="main-menu">
<div class="top-bar-left"><a href="{% url 'home' %}"> <div class="top-bar-left"><a href="{% url 'home' %}">
@@ -31,7 +31,7 @@
{% block content %} {% block content %}
{% endblock %} {% endblock %}
<div class="grid-y footer" style="height:8em; bottom:0"> <div class="grid-y footer" style="height:8em; bottom:-8em; position: absolute; right:0; left:0">
<div class="grid-x medium-padding-1 large-padding-left-2" style=""> <div class="grid-x medium-padding-1 large-padding-left-2" style="">
<div class="cell"> <div class="cell">

5
fet2020/templates/members/index.html
View File

@@ -34,9 +34,9 @@
<div id="jobs-{{job.slug}}" class="tab-pane"> <div id="jobs-{{job.slug}}" class="tab-pane">
<div class="grid-container"> <div class="grid-container">
{% if job_list|length > 1 %}
<h2>{{job.0}}</h2> <h2>{{job.0}}</h2>
{% endif %}
{% with active_members=job.1 inactive_members=job.2 %} {% with active_members=job.1 inactive_members=job.2 %}
{% include 'members/jobs_list.html' %} {% include 'members/jobs_list.html' %}
{% endwith %} {% endwith %}
@@ -44,7 +44,6 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}