merged

fet2020/members/admin.py

@@ -54,12 +54,41 @@ class JobInline(admin.TabularInline):
 class MyMemberAdmin(admin.ModelAdmin):
     form = MyMemberForm
     model = Member
+    fieldsets = (
+        (None, {
+            'fields': (
+                ('firstname', 'surname',),
+                'nickname',
+                'mailaccount',
+                'role',
+                'description',
+                'image',
+                'birthday',
+                'phone',
+                'address',
+            )
+        }),
+    )
     list_display = ['nickname', 'firstname', 'surname', 'mailaccount', 'role']
     inlines = (JobOverviewInline,)
 
     search_fields = ['firstname', 'surname', 'nickname', 'mailaccount']
     list_filter = [MemberRoleFilter]
 
+    def add_view(self, request, form_url='', extra_context=None):
+        extra_context = extra_context or {}
+        extra_context['help_text'] = "Fette Schriften sind Pflichtfelder."
+        return super().add_view(
+            request, form_url, extra_context=extra_context,
+        )
+
+    def change_view(self, request, object_id, form_url='', extra_context=None):
+        extra_context = extra_context or {}
+        extra_context['help_text'] = "Fette Schriften sind Pflichtfelder."
+        return super().change_view(
+            request, object_id, form_url, extra_context=extra_context,
+        )
+
     def save_model(self, request, obj, form, change):
         obj.author = request.user
         super().save_model(request, obj, form, change)
@@ -76,6 +105,20 @@ class MyJobAdmin(admin.ModelAdmin):
 
     search_fields = ['name']
 
+    def add_view(self, request, form_url='', extra_context=None):
+        extra_context = extra_context or {}
+        extra_context['help_text'] = "Fette Schriften sind Pflichtfelder."
+        return super().add_view(
+            request, form_url, extra_context=extra_context,
+        )
+
+    def change_view(self, request, object_id, form_url='', extra_context=None):
+        extra_context = extra_context or {}
+        extra_context['help_text'] = "Fette Schriften sind Pflichfelder."
+        return super().change_view(
+            request, object_id, form_url, extra_context=extra_context,
+        )
+
     def save_model(self, request, obj, form, change):
         obj.author = request.user
         super().save_model(request, obj, form, change)
@@ -92,6 +135,20 @@ class MyJobGroupAdmin(admin.ModelAdmin):
 
     search_fields = ['name']
 
+    def add_view(self, request, form_url='', extra_context=None):
+        extra_context = extra_context or {}
+        extra_context['help_text'] = "Fette Schriften sind Pflichtfelder."
+        return super().add_view(
+            request, form_url, extra_context=extra_context,
+        )
+
+    def change_view(self, request, object_id, form_url='', extra_context=None):
+        extra_context = extra_context or {}
+        extra_context['help_text'] = "Fette Schriften sind Pflichfelder."
+        return super().change_view(
+            request, object_id, form_url, extra_context=extra_context,
+        )
+
     def save_model(self, request, obj, form, change):
         obj.author = request.user
         super().save_model(request, obj, form, change)

fet2020/members/models.py

@@ -1,4 +1,4 @@
-from django.core.validators import RegexValidator
+from django.core.validators import RegexValidator, ValidationError
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone
@@ -6,6 +6,7 @@ from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
 from datetime import timedelta
+from easy_thumbnails.fields import ThumbnailerImageField
 from rest_framework import serializers
 
 
@@ -91,7 +92,7 @@ class Member(models.Model):
     role = models.CharField(max_length=1, choices=MemberRole.choices, default=MemberRole.ACTIVE)
 
     description = models.TextField(null=True, blank=True)
-    image = models.ImageField(null=True, blank=True)
+    image = ThumbnailerImageField()
 
     birthday = models.DateField(null=True, blank=True)
 
@@ -113,6 +114,15 @@ class Member(models.Model):
         verbose_name = "Mitglied"
         verbose_name_plural = "Mitglieder"
 
+    def clean(self):
+        if self.image.height < 150 or self.image.width < 150:
+            raise ValidationError(
+                _('Das Bild ist zu klein. (Höhe: {}, Breite: {})').format(
+                    self.image.height,
+                    self.image.width
+                )
+            )
+
     def __str__(self):
         return self.firstname + " " + self.surname
 
@@ -139,6 +149,10 @@ class JobGroup(models.Model):
 
     is_pinned = models.BooleanField(default=False)
 
+    class Meta:
+        verbose_name = "Tätigkeit-Gruppierung"
+        verbose_name_plural = "Tätigkeit-Gruppierungen"
+
     def __str__(self):
         return self.name
 

fet2020/members/urls.py

@@ -5,7 +5,8 @@ from . import views
 
 urlpatterns = [
     path('', views.index, name='members'),
-    path('<str:filter>', views.index),
-    path('jobs/<str:slug>', views.index),
-    path('m/<str:nickname>',views.show, name="member")
-]
+
+    path('<str:filter>', views.members_view),
+    path('jobs/<str:slug>', views.jobs_view),
+    path('member/<str:member_name>', views.profile_view, name="member"),
+]

fet2020/members/views.py

@@ -10,39 +10,81 @@ from rest_framework import permissions
 # from django_filters.rest_framework import DjangoFilterBackend
 
 
+<<<<<<< HEAD
 def show(request,nickname=None):
     return render(request, 'members/index.html', context)
 
 
 def index(request, slug=None, filter=None):
     job_group = deque(JobGroup.objects.all())
-    job_list = []
     members = None
 
-    if slug is not None:
-        job_names = JobMember.jobs.get_job_names(slug=slug)
-        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]))
+    if filter is None:
+        members = deque(Member.all_members.all())
+    elif filter in Member.MemberRole:
+        members = deque(Member.all_members.filter(role=filter))
     else:
-        if filter is None:
-            members = deque(Member.all_members.all())
-        elif filter in Member.MemberRole:
-            members = deque(Member.all_members.filter(role=filter))
-        else:
-            members = None
+        members = None
+
+    context = {
+        "job_group": job_group,
+        "members": members,
+    }
+
+    return render(request, 'members/index.html', context)
+
+
+def jobs_view(request, slug=None):
+    job_group = deque(JobGroup.objects.all())
+    job_list = []
+
+    job_names = JobMember.jobs.get_job_names(slug=slug)
+    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)
+
+
+def members_view(request, filter=None):
+    job_group = deque(JobGroup.objects.all())
+
+    if filter is None:
+        members = deque(Member.all_members.all())
+    elif filter in Member.MemberRole:
+        members = deque(Member.all_members.filter(role=filter))
+    else:
+        members = None
+
+    context = {
+        "job_group": job_group,
         "members": members,
     }
 
     return render(request, 'members/index.html', context)
 
 
+def profile_view(request, member_name=None):
+    job_group = deque(JobGroup.objects.all())
+    member = None
+
+    member = deque(Member.all_members.filter(nickname=member_name))
+
+    context = {
+        "job_group": job_group,
+        "member": member,
+    }
+
+    return render(request, 'members/index.html', context)
+
+
 class MemberViewSet(viewsets.ModelViewSet):
     """
     API endpoint that allows users to be viewed or edited.