Department members

members/admin/union_admin.py

@@ -29,7 +29,7 @@ def get_queryset(self, request):
             },
         ),
         (
-            "Bestyrelsen nye felter",
+            "Bestyrelsen",
             {
                 "fields": (
                     "chairman",
@@ -40,28 +40,20 @@ def get_queryset(self, request):
                 )
             },
         ),
-        (
-            "Bestyrelsen gamle felter",
-            {
-                "fields": (
-                    "chairman_old",
-                    "chairman_email_old",
-                    "second_chair_old",
-                    "second_chair_email_old",
-                    "cashier_old",
-                    "cashier_email_old",
-                    "secretary_old",
-                    "secretary_email_old",
-                    "board_members_old",
-                )
-            },
-        ),
         (
             "Info",
             {
-                "fields": ("bank_main_org", "bank_account", "statues", "founded"),
-                "description": "Indsæt et link til jeres vedtægter, hvornår I er stiftet (har holdt stiftende \
-                generalforsamling) og jeres bankkonto hvis I har sådan en til foreningen.",
+                "fields": (
+                    "bank_main_org",
+                    "bank_account",
+                    "statues",
+                    "meeting_notes",
+                    "founded",
+                ),
+                "description": """
+                    Indsæt et link til jeres vedtægter, jeres seneste referater, \
+                    hvornår I er stiftet (har holdt stiftende generalforsamling) \
+                    og jeres bankkonto hvis I har sådan en til foreningen.""",
             },
         ),
     ]

members/management/commands/create_membership_activitys.py

@@ -62,8 +62,8 @@ def handle(self, *args, **options):
                 union=curUnion,
                 name=name,
                 open_hours=open_hours,
-                responsible_name=curUnion.chairman_old,
-                responsible_contact=curUnion.chairman_email_old,
+                responsible_name=curUnion.chairman.name,
+                responsible_contact=curUnion.chairman.email,
                 placename=curUnion.address.placename,
                 zipcode=curUnion.address.zipcode,
                 city=curUnion.address.city,

members/management/commands/get_live_data.py

@@ -1,13 +1,14 @@
 from zipfile import ZipFile
-import os
 import json
+import os
 from django.core.management.base import BaseCommand
 from django.core.management import call_command
 from django.db import DatabaseError
 from members.models import Department, Union, Address, Person
 from members.tests.factories import PersonFactory
 import requests
 import shutil
+import datetime
 
 from .dump_public_data import MODELS_TO_DUMP as MODELS_TO_LOAD
 
@@ -48,6 +49,8 @@ def handle(self, *args, **options):
             union_json = json.load(union_file)
 
         for union in union_json:
+            if union["fields"]["founded"] is None:
+                union["fields"]["founded"] = str(datetime.date(1970, 1, 1))
             union["fields"].pop("region", None)
             union["fields"].pop("REGION_CHOICES", None)
             _create_person_with_id(union["fields"]["chairman"])

members/migrations/0020_union_meeting_notes.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.2.9 on 2020-03-19 10:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0019_auto_20200211_1457"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="union",
+            name="meeting_notes",
+            field=models.URLField(
+                blank=True, verbose_name="Link til seneste referater"
+            ),
+        ),
+    ]

members/migrations/0021_auto_20200421_1313.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.2.9 on 2020-04-21 11:13
+
+from django.db import migrations, models
+import datetime
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0020_union_meeting_notes"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="union",
+            name="founded",
+            field=models.DateField(
+                default=datetime.datetime(1970, 1, 1), verbose_name="Stiftet"
+            ),
+            preserve_default=False,
+        ),
+    ]

members/migrations/0022_merge_20200526_1131.py

@@ -0,0 +1,13 @@
+# Generated by Django 2.2.9 on 2020-05-26 09:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0021_auto_20200309_1107"),
+        ("members", "0021_auto_20200421_1313"),
+    ]
+
+    operations = []

members/migrations/0023_merge_20200615_1116.py

@@ -0,0 +1,13 @@
+# Generated by Django 2.2.9 on 2020-06-15 09:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0022_merge_20200526_1131"),
+        ("members", "0022_merge_20200526_1130"),
+    ]
+
+    operations = []

members/migrations/0024_auto_20200615_1244.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.9 on 2020-06-15 10:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0023_merge_20200615_1116"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="union",
+            name="founded",
+            field=models.DateField(blank=True, null=True, verbose_name="Stiftet"),
+        ),
+    ]

members/migrations/0025_merge_20200907_1209.py

@@ -0,0 +1,13 @@
+# Generated by Django 3.0.8 on 2020-09-07 10:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0024_auto_20200615_1244"),
+        ("members", "0024_auto_20200902_1108"),
+    ]
+
+    operations = []

members/models/union.py

@@ -1,8 +1,15 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from django.db import models
+from .payment import Payment
+from .activity import Activity
+from .department import Department
+from .activityparticipant import ActivityParticipant
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
+from django.utils import timezone
+from django.utils.timezone import make_aware
+from datetime import timedelta
+from django.db.models import F
+import datetime
 
 
 class Union(models.Model):
@@ -12,6 +19,8 @@ class Meta:
         ordering = ["name"]
 
     name = models.CharField("Foreningens navn", max_length=200)
+    meeting_notes = models.URLField("Link til seneste referater", blank=True)
+    founded = models.DateField("Stiftet")
     chairman = models.ForeignKey(
         "Person",
         on_delete=models.PROTECT,
@@ -79,3 +88,67 @@ def clean(self):
             raise ValidationError(
                 "Vælg om foreningen har konto hos hovedforeningen. Hvis ikke skal bankkonto udfyldes."
             )
+
+    def members(self):
+        years = range(self.founded.year, (timezone.now().date()).year + 1)
+        members = {}
+        departments = Department.objects.filter(union=self.id)
+        union_activities_filter = Activity.objects.filter(
+            member_justified=True,
+        )
+        union_activities_1_filter = union_activities_filter.filter(
+            department__in=departments,
+            end_date__gt=F("start_date") + timedelta(days=2),
+        )
+        union_activities_2_filter = union_activities_filter.filter(
+            union_id=self.id,
+        )
+        payment_filter = Payment.objects.filter(
+            amount_ore__gte=7500,
+            refunded_dtm__isnull=True,
+        )
+        participant_filter = ActivityParticipant.objects.all().select_related(
+            "activity", "member__person"
+        )
+        for year in years:
+            temp_members = []
+            union_activities_1 = union_activities_1_filter.filter(
+                start_date__year=year,
+            )
+            union_activities_2 = union_activities_2_filter.filter(
+                start_date__year=year,
+            ).union(union_activities_1)
+            payment_filter_1 = payment_filter.filter(
+                confirmed_dtm__lte=make_aware(datetime.datetime(year, 9, 30)),
+            ).select_related("activity", "activityparticipant")
+            for activity in union_activities_2:
+                payment_filter_2 = payment_filter_1.filter(
+                    activity=activity,
+                )
+                for participant in participant_filter.filter(
+                    activity=activity
+                ).distinct():
+                    if (
+                        payment_filter_2.filter(
+                            person=participant.member.person,
+                        ).count()
+                        > 0
+                    ):
+                        temp_members.append(participant.member.person)
+            members[year] = temp_members
+        return members
+
+    def user_union_leader(self, user):
+        people_on_board = [person.user for person in self.board_members.all()]
+        board_posistions = [
+            self.chairman,
+            self.second_chair,
+            self.cashier,
+            self.secretary,
+        ]
+        board_posistions = [
+            position.user for position in board_posistions if position is not None
+        ]
+        return user is not None and (
+            user.is_superuser or user in people_on_board + board_posistions
+        )

members/static/members/js/tab.js

@@ -9,8 +9,12 @@ document.addEventListener("DOMContentLoaded", function(event) {
       Array.from(tabs.children).filter(element => element.tagName === "SECTION")
     );
 
-    // Default to first as active
-    toggleActive(sections, tabButtons, 0);
+    // Default to first as active, unless "reverse" class then set last as active
+    if(document.getElementsByClassName("tabs reverse").length != 0){
+      toggleActive(sections, tabButtons, tabButtons.length-1);
+    }else{
+      toggleActive(sections, tabButtons, 0);
+    }
 
     for (var button of tabButtons) {
       button.addEventListener("click", event =>
@@ -25,8 +29,8 @@ function toggleActive(sections, buttons, activeIndex) {
     button.classList.remove("tab-active");
   }
   for (var section of sections) {
-    section.hidden = true;
+    section.className = section.classList.remove("tab-section-active");
   }
   buttons[activeIndex].classList.add("tab-active");
-  sections[activeIndex].hidden = false;
+  sections[activeIndex].classList.add("tab-section-active");
 }

members/static/members/sass/main.scss

@@ -7,7 +7,9 @@
 @use "header";
 @use "login";
 @use "style";
+@use "union_members";
 @use "table";
 @use "tab";
+@use "union_overview";
 @use "department_list";
-@import url("https://fonts.googleapis.com/css?family=Bungee|Lato|Pirata+One&display=swap");
+@import url("https://fonts.googleapis.com/css?family=Bungee|Lato|Pirata+One&display=swap");

members/static/members/sass/tab.scss

@@ -31,4 +31,10 @@
             }
         }
     }
+    > section {
+        display: none;
+        &.tab-section-active {
+            display: block;
+        }
+    }
 }

members/static/members/sass/union_members.scss

@@ -0,0 +1,33 @@
+@use "_definitions";
+
+#union_info {
+    @extend %container;
+    margin-bottom: 40px;
+    > div {
+        > h4 {
+            display: flex;
+            justify-content: center;
+        }
+        > div {
+            border: 1px solid #dee2e6 !important;
+            font-size: 1.2em;
+            display: flex;
+            justify-content: space-around;
+            > div {
+                ul {
+                    list-style-type: none;
+                    margin: 10px 0;
+                }
+            }
+        }
+    }
+}
+
+#union_documents {
+    display: flex;
+    margin-bottom: 40px;
+    justify-content: space-around;
+    a {
+        @extend %button !optional;
+    }
+}

members/static/members/sass/union_overview.scss

@@ -0,0 +1,16 @@
+@use "_definitions";
+
+.union_list {
+  display: grid;
+  grid-template-rows: auto;
+  justify-content: stretch;
+  @include _definitions.for-desktop{
+      grid-template-columns: repeat(3, 1fr);
+  }
+  @include _definitions.for-phone{
+      grid-template-columns: repeat(1, 1fr);
+  }
+  > ul{
+    list-style: none;
+  }
+}