change jobs to section and blackboard to jobs

fet2020/fet2020/urls.py

@@ -8,7 +8,6 @@ from django.urls import include, path, re_path
 from django.views.generic import RedirectView
 
 from posts.viewsets import PostViewSet
-from members.urls import jobs_urlpatterns, member_urlpatterns
 from members.viewsets import (
     MemberViewSet,
     JobViewSet,
@@ -28,18 +27,16 @@ router.register(r"jobmembers", JobMemberViewSet)
 
 urlpatterns = [
     path("", views.index, name="home"),
+    path("", include("members.urls")),
     path("admin/doc/", include("django.contrib.admindocs.urls")),
     path("admin/login/", RedirectView.as_view(pattern_name="authentications:login")),
     path("admin/", admin.site.urls),
     path("auth/", include("authentications.urls")),
     path("api/", include(router.urls)),
-    path("blackboard/", include("blackboard.urls")),
     path("ckeditor/", include("ckeditor_uploader.urls")),
     path("gallery/", include("gallery.urls")),
     path("intern/", include("intern.urls")),
-    path("jobs/", include(jobs_urlpatterns)),
+    path("jobs/", include("blackboard.urls")),
-    path("members/", include("members.urls")),
-    path("member/", include(member_urlpatterns)),
     path("posts/", include("posts.urls")),
     path("search/", include("search.urls")),
     path("tasks/", include("tasks.urls")),

fet2020/members/models.py

@@ -87,7 +87,7 @@ class Member(models.Model):
 
     # need to have 'View on site' link in admin app
     def get_absolute_url(self):
-        return reverse("member", kwargs={"member_id": self.id})
+        return reverse("members:member", kwargs={"member_id": self.id})
 
     def clean(self):
         if not self.image:
@@ -126,7 +126,7 @@ class JobGroup(models.Model):
 
     # need to have 'View on site' link in admin app
     def get_absolute_url(self):
-        return reverse("jobs", kwargs={"slug": self.slug})
+        return reverse("members:jobs", kwargs={"slug": self.slug})
 
     def clean(self):
         if not self.shortterm:
@@ -157,7 +157,7 @@ class Job(models.Model):
         return self.name
 
     def get_absolute_url(self):
-        return reverse("jobs", kwargs={"slug": self.job_group.slug}) + "#" + self.slug
+        return reverse("members:jobs", kwargs={"slug": self.job_group.slug}) + "#" + self.slug
 
     def clean(self):
         if not self.shortterm:

fet2020/members/urls.py

@@ -6,14 +6,8 @@ from . import views
 app_name = apps.MembersConfig.name
 
 urlpatterns = [
-    path("", views.index, name="index"),
+    path("members/", views.index, name="index"),
-    path("<str:filter>/", views.members, name="members"),
+    path("members/<str:role>/", views.members, name="members"),
-]
+    path("member/<int:member_id>/", views.profile, name="member"),
-
+    path("section/<slug:slug>/", views.jobs, name="jobs"),
-member_urlpatterns = [
-    path("<int:member_id>/", views.profile, name="member"),
-]
-
-jobs_urlpatterns = [
-    path("<slug:slug>/", views.jobs, name="jobs"),
 ]

fet2020/members/views.py

@@ -23,7 +23,7 @@ def __get_job_groups():
 
 def index(request):
     job_groups = __get_job_groups()
-    members = Member.all_members.all()
+    members = Member.all_members.filter(role=Member.MemberRole.ACTIVE)
 
     context = {
         "job_groups": job_groups,
@@ -55,16 +55,15 @@ def jobs(request, slug=None):
     return render(request, "members/jobs.html", context)
 
 
-def members(request, filter=None):
+def members(request, role=None):
     job_groups = __get_job_groups()
 
     for elem in Member.MemberRole:
-        if filter == elem.label.lower():
+        if role == elem.label.lower():
             members = Member.all_members.filter(role=elem.value)
             break
     else:
-        logger.info("Wrong member role '{}'".format(filter))
+        members = Member.all_members.all()
-        raise Http404("no member role")
 
     context = {
         "job_groups": job_groups,

fet2020/templates/base.html

@@ -58,9 +58,9 @@
                 <ul id="navBarContent" class="navbar-content" x-show="getShowNavBarLg" x-collapse.min.0px>
                 {% endif %}
                     <li class="{% if 'posts' in request.path %}active{% endif %}"><a href="{% url 'posts:index' %}">News</a></li>
-                    <li class="{% if 'members' in request.path %}active{% endif %}"><a href="{% url 'members:members' 'active' %}">Fachschaft</a></li>
+                    <li class="{% if 'members' in request.path %}active{% endif %}"><a href="{% url 'members:index' %}">Fachschaft</a></li>
                     <li class="{% if 'gallery' in request.path %}active{% endif %}"><a href="{% url 'gallery:index' %}">Galerie</a></li>
-                    <li class="{% if 'blackboard' in request.path %}active{% endif %}"><a href="{% url 'blackboard:index' %}">Blackboard</a></li>
+                    <li class="{% if 'jobs' in request.path %}active{% endif %}"><a href="{% url 'blackboard:index' %}">Jobs</a></li>
 
                     {% get_flatpages '/kontakt/' as pages %}
                     {% if pages %}

fet2020/templates/blackboard/index.html

@@ -2,12 +2,12 @@
 
 {% load flatpages %}
 
-{% block title %}Blackboard{% endblock %}
+{% block title %}Jobs{% endblock %}
 
 {% block content %}
 	<!-- Main Content -->
 	<main class="container mx-auto w-full px-4 mt-8 flex-1">
-		<h1 class="page-title">Blackboard</h1>
+		<h1 class="page-title">Jobs</h1>
 
 		<div class="lg:w-2/3 xl:w-7/12 mx-auto">
             {% get_flatpages '/blackboard-info/' as bb_infos %}

fet2020/templates/members/index.html

@@ -47,16 +47,16 @@
 
                             <hr class="">
 
-                            <li class="{% if 'active' in request.path %}active{% endif %}">
+                            <li class="{% if '/members/' == request.path %}active{% endif %}">
-                                <a href="{% url 'members:members' 'active' %}">Fachschaft</a>
+                                <a href="{% url 'members:index' %}">Fachschaft</a>
                             </li>
                             
                             <li class="{% if 'pension' in request.path %}active{% endif %}">
                                 <a href="{% url 'members:members' 'pension' %}">Pension</a>
                             </li>
                             
-                            <li class="{% if '/members/' == request.path %}active{% endif %}">
+                            <li class="{% if '/all/' in request.path %}active{% endif %}">
-                                <a href="{% url 'members:index' %}">Alle Mitglieder</a>
+                                <a href="{% url 'members:members' 'all' %}">Alle Mitglieder</a>
                             </li>
 
                             {% if request.user.is_authenticated %}

fet2020/templates/members/partials/_jobs_side_bar.html

@@ -1,5 +1,5 @@
 <li class="{% if job.slug in request.path %}active{% endif %}">
-    <a href="{% url 'jobs' job.slug %}">{{ job.name }}</a>
+    <a href="{% url 'members:jobs' job.slug %}">{{ job.name }}</a>
 </li>
 
 {% if job.slug == active_job_group.slug %}