Member filters and templates added

fet2020/members/models.py

@@ -141,8 +141,10 @@ class Job(models.Model):
     @property
     def active_members(self):
         "Active Members for this job"
+        date_today = timezone.now().date()
         def sorted_jobmembers():
-            return sorted(list(self.jobmembers.all()), # filter active fehlt noch
+            return sorted(list(self.jobmembers.filter(Q(member__role ='A') &
+                      (Q(job_end__gt=date_today) | Q(job_end__isnull=True))).all()), # filter active fehlt noch
                     key=lambda x: (JobMember._role_sort[x.job_role], JobMember.job_start))
         m =[jm.member_with_role for jm in sorted_jobmembers()]
 
@@ -151,12 +153,17 @@ class Job(models.Model):
     @property
     def active_members_count(self):
         "Count Active Members"
-        return self.jobmembers.count()
+        date_today = timezone.now().date()
+        return self.jobmembers.filter(Q(member__role ='A') &
+                      (Q(job_end__gt=date_today) | Q(job_end__isnull=True))).count()
 
     @property
     def inactive_members(self):
         "return the inactive members"
-        return [jm.member for jm in self.jobmembers.all()] # filter inactive fehlt noch
+        date_today = timezone.now().date()
+        return [jm.member for jm in self.jobmembers.filter(~Q(member__role ='A') |
+                      (Q(job_end__lt=date_today) & Q(job_end__isnull=False))).all()] # filter inactive fehlt noch
+
 
     class Meta:
         verbose_name = "Tätigkeit"