Kalendar

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
             args: [--fix=lf]
           - id: requirements-txt-fixer
     - repo: https://github.com/paulhfischer/pre-commit-hooks
-      rev: v1.2.39
+      rev: v1.2.40
       hooks:
           - id: format-general
           - id: format-web
@@ -28,11 +28,11 @@ repos:
       hooks:
           - id: isort
     - repo: https://github.com/asottile/add-trailing-comma
-      rev: v2.2.1
+      rev: v2.2.2
       hooks:
           - id: add-trailing-comma
     - repo: https://github.com/psf/black
-      rev: 22.1.0
+      rev: 22.3.0
       hooks:
           - id: black
             language_version: python3

bags/locale/de/LC_MESSAGES/django.po

@@ -140,6 +140,13 @@ msgstr "E-Mail erfolgreich gesendet"
 msgid "Promise"
 msgstr "Zusage"
 
+#: bags/models.py bags/templates/bags/bags_dashboard.html
+#: bags/templates/bags/company/list_companys.html
+#: bags/templates/bags/company/view_company.html
+#: bags/templates/bags/maintenance/mail/send_mail.html
+msgid "Contact again"
+msgstr "Erneut kontaktieren"
+
 #: bags/models.py bags/templates/bags/company/list_companys.html
 #: bags/templates/bags/company/view_company.html
 #: bags/templates/bags/maintenance/mail/del_mail.html
@@ -148,13 +155,6 @@ msgstr "Zusage"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: bags/models.py bags/templates/bags/bags_dashboard.html
-#: bags/templates/bags/company/list_companys.html
-#: bags/templates/bags/company/view_company.html
-#: bags/templates/bags/maintenance/mail/send_mail.html
-msgid "Contact again"
-msgstr "Erneut kontaktieren"
-
 #: bags/models.py
 msgid "Giveaway-groups' name"
 msgstr "Name der Giveaway-Gruppe"
@@ -185,10 +185,6 @@ msgstr "Jede {every_x_bags}te Tüte"
 msgid "{per_bag_count} every bag"
 msgstr "{per_bag_count} jede Tüte"
 
-#: bags/models.py
-msgid "Giveaway-description/comment"
-msgstr "Werbegeschenk-Beschreibung/Kommentar"
-
 #: bags/models.py bags/templates/bags/bags_dashboard.html
 #: bags/templates/bags/giveaways/giveaway/list/arrival/confirm_giveaways_arrivals.html
 #: bags/templates/bags/giveaways/giveaway/list/arrival/list_giveaways_arrivals.html
@@ -213,6 +209,10 @@ msgstr "Ankunftszeit"
 msgid "Arrived"
 msgstr "Angekommen"
 
+#: bags/models.py
+msgid "Giveaway-description/comment"
+msgstr "Werbegeschenk-Beschreibung/Kommentar"
+
 #: bags/templates/bags/bags_dashboard.html bags/templates/bags/base_bags.html
 msgid "Dashboard"
 msgstr "Dashboard"

bags/migrations/0004_auto_20160531_1312.py

@@ -16,10 +16,7 @@ class Migration(migrations.Migration):
                 "permissions": (("view_companies", "Can view and edit the companies"),),
             },
         ),
-        migrations.RemoveField(
-            model_name="company",
-            name="zusage",
-        ),
+        migrations.RemoveField(model_name="company", name="zusage"),
         migrations.AddField(
             model_name="company",
             name="promise",

bags/migrations/0008_auto_20160608_1212.py

@@ -10,10 +10,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="company",
-            name="contact",
-        ),
+        migrations.RemoveField(model_name="company", name="contact"),
         migrations.AddField(
             model_name="company",
             name="contact_firstname",

bags/migrations/0017_remove_mail_semester.py

@@ -18,8 +18,5 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(subject_includes_semester),
-        migrations.RemoveField(
-            model_name="mail",
-            name="semester",
-        ),
+        migrations.RemoveField(model_name="mail", name="semester"),
     ]

bags/migrations/0021_auto_20210326_1632.py

@@ -12,14 +12,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="giveaway",
-            name="every_x_bags",
-        ),
-        migrations.RemoveField(
-            model_name="giveaway",
-            name="per_bag_count",
-        ),
+        migrations.RemoveField(model_name="giveaway", name="every_x_bags"),
+        migrations.RemoveField(model_name="giveaway", name="per_bag_count"),
         migrations.AddField(
             model_name="giveaway",
             name="item_count",

bags/migrations/0023_auto_20210330_1154.py

@@ -33,8 +33,5 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.RunPython(keep_giveaway_data),
-        migrations.RemoveField(
-            model_name="giveaway",
-            name="name",
-        ),
+        migrations.RemoveField(model_name="giveaway", name="name"),
     ]

bags/migrations/0026_bagsettings_created_at_bagsettings_updated_at_and_more.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.0.3 on 2022-04-01 13:10
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bags", "0025_auto_20220321_1902"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="bagsettings",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="bagsettings",
+            name="updated_at",
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="updated_at",
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name="giveaway",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="giveaway",
+            name="updated_at",
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name="giveawaygroup",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="giveawaygroup",
+            name="updated_at",
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

bags/migrations/0027_alter_company_semester_alter_giveawaygroup_semester.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.0.3 on 2022-04-01 16:16
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("settool_common", "0018_alter_anonymisationlog_semester"),
+        ("bags", "0026_bagsettings_created_at_bagsettings_updated_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="company",
+            name="semester",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="settool_common.semester",
+                verbose_name="Semester",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="giveawaygroup",
+            name="semester",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="settool_common.semester",
+                verbose_name="Semester",
+            ),
+        ),
+    ]