Merge pull request #1056 from CodingPirates/1055-feature-mulighed-for…

…-at-skjule-aktiviteter-fra-forældrene

Nye felt for Aktiviteter : Fra hvilket tidspunkt kan aktiviteten være synlig ?

members/admin/activity_admin.py

@@ -276,6 +276,8 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
                         "end_date",
                     ),
                     "member_justified",
+                    "visible",
+                    "visible_from",
                 ),
             },
         ),

members/migrations/0053_activity_visible_activity_visible_from.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.11 on 2024-06-17 19:46
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0052_alter_activity_address"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="activity",
+            name="visible",
+            field=models.BooleanField(
+                default=True,
+                help_text="Vises i denne aktivtet. Kan bruges sammen med feltet 'Aktiviteten er synlig fra'",
+                verbose_name="Vises denne aktivitet",
+            ),
+        ),
+        migrations.AddField(
+            model_name="activity",
+            name="visible_from",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                verbose_name="Aktiviteten er synlig fra",
+            ),
+        ),
+    ]

members/migrations/0054_merge_20240617_2150.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.11 on 2024-06-17 19:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0053_activity_visible_activity_visible_from"),
+        ("members", "0053_alter_emailitem_options"),
+    ]
+
+    operations = []

members/models/activity.py

@@ -74,6 +74,16 @@ class Meta:
     address = models.ForeignKey(
         "Address", on_delete=models.PROTECT, verbose_name="Adresse", null=False
     )
+    visible_from = models.DateTimeField(
+        "Aktiviteten er synlig fra", null=False, blank=False, default=timezone.now
+    )
+    visible = models.BooleanField(
+        "Vises denne aktivitet",
+        null=False,
+        blank=False,
+        default=True,
+        help_text="Vises i denne aktivtet. Kan bruges sammen med feltet 'Aktiviteten er synlig fra'",
+    )
 
     def is_historic(self):
         return self.end_date < timezone.now()

members/views/Activities.py

@@ -19,6 +19,8 @@ def Activities(request):
         signup_closing__gte=timezone.now(),
         end_date__gte=timezone.now(),
         activitytype__in=["FORLØB", "ARRANGEMENT"],
+        visible=True,
+        visible_from__lte=timezone.now(),
     ).order_by("address__region", "name", "start_date")
 
     family = None