cleanup

fet2020/blackboard/models.py

@@ -53,7 +53,7 @@ class JobPosting(models.Model):
         encoding = locale.getpreferredencoding()
         args = [a.encode(encoding) for a in args]
 
-        #ghostscript.Ghostscript(*args)
+        # ghostscript.Ghostscript(*args)
         with ghostscript.Ghostscript(*args) as g:
             ghostscript.cleanup()
 

fet2020/members/managers.py

@@ -0,0 +1,91 @@
+from django.db.models import Q
+from django.db import models
+from django.utils import timezone
+
+from datetime import timedelta
+
+
+class ActiveJobMemberManager(models.Manager):
+    """
+    return a list of active member, and members who are still working
+    """
+
+    def get_all_by_slug(self, slug):
+        return (
+            self.get_queryset()
+            .filter(job__job_group__slug=slug)
+            .order_by("job__slug", "job_role", "member__firstname")
+        )
+
+    def get_queryset(self):
+        date_today = timezone.now().date()
+        qs = super().get_queryset().order_by("member__firstname")
+
+        return qs.filter(
+            Q(member__role=Member.MemberRole.ACTIVE)
+            & (Q(job_end__gt=date_today) | Q(job_end__isnull=True))
+        )
+
+
+class InactiveJobMemberManager(models.Manager):
+    """
+    return a list of inactive member
+    """
+
+    def get_all_by_slug(self, slug):
+        return (
+            self.get_queryset()
+            .filter(job__job_group__slug=slug)
+            .order_by("job__slug", "job_role", "member__firstname")
+        )
+
+    def get_queryset(self):
+        date_today = timezone.now().date()
+        qs = super().get_queryset().order_by("member__firstname")
+
+        return qs.filter(
+            Q(member__role=Member.MemberRole.PENSION)
+            | (Q(job_end__lt=date_today + timedelta(days=1)) & Q(job_end__isnull=False))
+        )
+
+
+class JobMemberManager(models.Manager):
+    def get_members(self, role):
+        qs = self.get_queryset().order_by("member__firstname")
+
+        return qs.filter(Q(member__role=role))
+
+
+class JobGroupManager(models.Manager):
+    def get_active_jobgroup(self):
+        job_groups = list(self.get_queryset())
+
+        # delete job groups which don't have active members
+        for elem in job_groups:
+            if not JobMember.active_member.get_all_by_slug(slug=elem.slug):
+                job_groups.remove(elem)
+
+        return job_groups
+
+    def get_pinned_active_jobgroups(self):
+        job_groups = []
+
+        for elem in self.get_active_jobgroup():
+            if elem.is_pinned:
+                job_groups.append(elem)
+
+        return job_groups
+
+    def get_unpinned_active_jobgroups(self):
+        job_groups = []
+
+        for elem in self.get_active_jobgroup():
+            if not elem.is_pinned:
+                job_groups.append(elem)
+
+        return job_groups
+
+
+class MemberManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().order_by("firstname")

fet2020/members/models.py

@@ -1,98 +1,17 @@
 from django.core.validators import RegexValidator, ValidationError
 from django.db import models
-from django.db.models import Q
-from django.utils import timezone
 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 .managers import (
-class ActiveJobMemberManager(models.Manager):
+    MemberManager,
-    """
+    JobGroupManager,
-    return a list of active member, and members who are still working
+    JobMemberManager,
-    """
+    ActiveJobMemberManager,
-
+    InactiveJobMemberManager,
-    def get_all_by_slug(self, slug):
+)
-        return (
-            self.get_queryset()
-            .filter(job__job_group__slug=slug)
-            .order_by("job__slug", "job_role", "member__firstname")
-        )
-
-    def get_queryset(self):
-        date_today = timezone.now().date()
-        qs = super().get_queryset().order_by("member__firstname")
-
-        return qs.filter(
-            Q(member__role=Member.MemberRole.ACTIVE)
-            & (Q(job_end__gt=date_today) | Q(job_end__isnull=True))
-        )
-
-
-class InactiveJobMemberManager(models.Manager):
-    """
-    return a list of inactive member
-    """
-
-    def get_all_by_slug(self, slug):
-        return (
-            self.get_queryset()
-            .filter(job__job_group__slug=slug)
-            .order_by("job__slug", "job_role", "member__firstname")
-        )
-
-    def get_queryset(self):
-        date_today = timezone.now().date()
-        qs = super().get_queryset().order_by("member__firstname")
-
-        return qs.filter(
-            Q(member__role=Member.MemberRole.PENSION)
-            | (Q(job_end__lt=date_today + timedelta(days=1)) & Q(job_end__isnull=False))
-        )
-
-
-class JobMemberManager(models.Manager):
-    def get_members(self, role):
-        qs = self.get_queryset().order_by("member__firstname")
-
-        return qs.filter(Q(member__role=role))
-
-
-class JobGroupManager(models.Manager):
-    def get_active_jobgroup(self):
-        job_groups = list(self.get_queryset())
-
-        # delete job groups which don't have active members
-        for elem in job_groups:
-            if not JobMember.active_member.get_all_by_slug(slug=elem.slug):
-                job_groups.remove(elem)
-
-        return job_groups
-
-    def get_pinned_active_jobgroups(self):
-        job_groups = []
-
-        for elem in self.get_active_jobgroup():
-            if elem.is_pinned:
-                job_groups.append(elem)
-
-        return job_groups
-
-    def get_unpinned_active_jobgroups(self):
-        job_groups = []
-
-        for elem in self.get_active_jobgroup():
-            if not elem.is_pinned:
-                job_groups.append(elem)
-
-        return job_groups
-
-
-class MemberManager(models.Manager):
-    def get_queryset(self):
-        return super().get_queryset().order_by("firstname")
 
 
 class Member(models.Model):

fet2020/posts/managers.py

@@ -14,7 +14,9 @@ class PostManager(models.Manager):
 
     def get_last_months_posts(self):
         date_today = timezone.now().date()
-        return self.get_visible_articles().filter(public_date__gt=date_today - timedelta(days=365))
+        return self.get_visible_articles().filter(
+            public_date__gt=date_today - timedelta(days=365)
+        )
 
     def get_all_posts_with_date(self):
         return (

fet2020/posts/serializers.py

@@ -5,7 +5,7 @@ from rest_framework import serializers
 
 class PostSerializer(serializers.HyperlinkedModelSerializer):
     agenda_html = serializers.CharField(required=False)
-    protocol_html = serializers.CharField(required=False)    
+    protocol_html = serializers.CharField(required=False)
     tag_string = serializers.CharField(required=False, read_only=True)
     imageurl = serializers.CharField(required=False, read_only=True)