From 96a608f3a40a69275f26b22b2981438e6732e4dc Mon Sep 17 00:00:00 2001
From: Nadja Geisler <ngeisler@fachschaft.informatik.tu-darmstadt.de>
Date: Fri, 29 Oct 2021 12:06:29 +0200
Subject: [PATCH] add interest window
adds datetimefield for start to Event model
adds datetimefield for start to Event model
adds translations
adds migration
---
.../locale/de_DE/LC_MESSAGES/django.po | 4 +-
AKModel/locale/de_DE/LC_MESSAGES/django.po | 310 +++++++++---------
AKModel/migrations/0049_interest_window.py | 24 ++
AKModel/models.py | 11 +-
AKPlan/locale/de_DE/LC_MESSAGES/django.po | 30 +-
AKPlanning/locale/de_DE/LC_MESSAGES/django.po | 6 +-
.../locale/de_DE/LC_MESSAGES/django.po | 6 +-
.../locale/de_DE/LC_MESSAGES/django.po | 48 ++-
locale/de_DE/LC_MESSAGES/django.po | 2 +-
9 files changed, 243 insertions(+), 198 deletions(-)
create mode 100644 AKModel/migrations/0049_interest_window.py
diff --git a/AKDashboard/locale/de_DE/LC_MESSAGES/django.po b/AKDashboard/locale/de_DE/LC_MESSAGES/django.po
index 0e9393ff..fef5cc12 100644
--- a/AKDashboard/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKDashboard/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 22:48+0000\n"
+"POT-Creation-Date: 2021-10-29 09:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,7 +116,7 @@ msgstr "AK \"%(ak)s\" bearbeitet."
msgid "AK \"%(ak)s\" deleted."
msgstr "AK \"%(ak)s\" gelöscht."
-#: AKDashboard/views.py:58
+#: AKDashboard/views.py:61
#, python-format
msgid "AK \"%(ak)s\" (re-)scheduled."
msgstr "AK \"%(ak)s\" (um-)geplant."
diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po
index 740582d5..713074cd 100644
--- a/AKModel/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-28 20:45+0000\n"
+"POT-Creation-Date: 2021-10-29 09:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,17 +65,17 @@ msgstr "Die eingegebene Verfügbarkeit enthält ein ungültiges Datum."
msgid "Please fill in your availabilities!"
msgstr "Bitte Verfügbarkeiten eintragen!"
-#: AKModel/availability/models.py:38 AKModel/models.py:47 AKModel/models.py:111
-#: AKModel/models.py:165 AKModel/models.py:184 AKModel/models.py:216
-#: AKModel/models.py:270 AKModel/models.py:335 AKModel/models.py:368
-#: AKModel/models.py:478
+#: AKModel/availability/models.py:38 AKModel/models.py:52 AKModel/models.py:116
+#: AKModel/models.py:171 AKModel/models.py:190 AKModel/models.py:222
+#: AKModel/models.py:276 AKModel/models.py:342 AKModel/models.py:375
+#: AKModel/models.py:485
msgid "Event"
msgstr "Event"
-#: AKModel/availability/models.py:39 AKModel/models.py:112
-#: AKModel/models.py:166 AKModel/models.py:185 AKModel/models.py:217
-#: AKModel/models.py:271 AKModel/models.py:336 AKModel/models.py:369
-#: AKModel/models.py:479
+#: AKModel/availability/models.py:39 AKModel/models.py:117
+#: AKModel/models.py:172 AKModel/models.py:191 AKModel/models.py:223
+#: AKModel/models.py:277 AKModel/models.py:343 AKModel/models.py:376
+#: AKModel/models.py:486
msgid "Associated event"
msgstr "Zugehöriges Event"
@@ -87,8 +87,8 @@ msgstr "Person"
msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird"
-#: AKModel/availability/models.py:56 AKModel/models.py:339
-#: AKModel/models.py:358 AKModel/models.py:487
+#: AKModel/availability/models.py:56 AKModel/models.py:346
+#: AKModel/models.py:365 AKModel/models.py:494
msgid "Room"
msgstr "Raum"
@@ -96,8 +96,8 @@ msgstr "Raum"
msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
-#: AKModel/availability/models.py:65 AKModel/models.py:276
-#: AKModel/models.py:357 AKModel/models.py:434
+#: AKModel/availability/models.py:65 AKModel/models.py:282
+#: AKModel/models.py:364 AKModel/models.py:441
msgid "AK"
msgstr "AK"
@@ -105,8 +105,8 @@ msgstr "AK"
msgid "AK whose availability this is"
msgstr "Verfügbarkeiten"
-#: AKModel/availability/models.py:74 AKModel/models.py:169
-#: AKModel/models.py:493
+#: AKModel/availability/models.py:74 AKModel/models.py:175
+#: AKModel/models.py:500
msgid "AK Category"
msgstr "AK-Kategorie"
@@ -135,9 +135,9 @@ msgstr "AK-Kategorien kopieren"
msgid "Copy ak requirements"
msgstr "AK-Anforderungen kopieren"
-#: AKModel/models.py:16 AKModel/models.py:158 AKModel/models.py:181
-#: AKModel/models.py:200 AKModel/models.py:214 AKModel/models.py:232
-#: AKModel/models.py:328
+#: AKModel/models.py:16 AKModel/models.py:163 AKModel/models.py:187
+#: AKModel/models.py:206 AKModel/models.py:220 AKModel/models.py:238
+#: AKModel/models.py:334
msgid "Name"
msgstr "Name"
@@ -196,54 +196,70 @@ msgid "When should AKs with intention to submit a resolution be done?"
msgstr "Wann sollen AKs mit Resolutionsabsicht stattgefunden haben?"
#: AKModel/models.py:30
+msgid "Interest Window Start"
+msgstr "Beginn Interessensbekundung"
+
+#: AKModel/models.py:31
+msgid "Opening time for expression of interest."
+msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs."
+
+#: AKModel/models.py:32
+msgid "Interest Window End"
+msgstr "Ende Interessensbekundung"
+
+#: AKModel/models.py:33
+msgid "Closing time for expression of interest."
+msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs."
+
+#: AKModel/models.py:35
msgid "Public event"
msgstr "Öffentliches Event"
-#: AKModel/models.py:31
+#: AKModel/models.py:36
msgid "Show this event on overview page."
msgstr "Zeige dieses Event auf der Ãœbersichtseite an"
-#: AKModel/models.py:33
+#: AKModel/models.py:38
msgid "Active State"
msgstr "Aktiver Status"
-#: AKModel/models.py:33
+#: AKModel/models.py:38
msgid "Marks currently active events"
msgstr "Markiert aktuell aktive Events"
-#: AKModel/models.py:34
+#: AKModel/models.py:39
msgid "Plan Hidden"
msgstr "Plan verborgen"
-#: AKModel/models.py:34
+#: AKModel/models.py:39
msgid "Hides plan for non-staff users"
msgstr "Verbirgt den Plan für Nutzer*innen ohne erweiterte Rechte"
-#: AKModel/models.py:37
+#: AKModel/models.py:42
msgid "Base URL"
msgstr "URL-Prefix"
-#: AKModel/models.py:37
+#: AKModel/models.py:42
msgid "Prefix for wiki link construction"
msgstr "Prefix für die automatische Generierung von Wiki-Links"
-#: AKModel/models.py:38
+#: AKModel/models.py:43
msgid "Wiki Export Template Name"
msgstr "Wiki-Export Templatename"
-#: AKModel/models.py:39
+#: AKModel/models.py:44
msgid "Default Slot Length"
msgstr "Standardslotlänge"
-#: AKModel/models.py:40
+#: AKModel/models.py:45
msgid "Default length in hours that is assumed for AKs in this event."
msgstr "Standardlänge von Slots (in Stunden) für dieses Event"
-#: AKModel/models.py:42
+#: AKModel/models.py:47
msgid "Contact email address"
msgstr "E-Mail Kontaktadresse"
-#: AKModel/models.py:44
+#: AKModel/models.py:49
msgid ""
"An email address that is displayed on every page and can be used for all "
"kinds of questions"
@@ -251,75 +267,75 @@ msgstr ""
"Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von "
"Fragen genutzt werden kann"
-#: AKModel/models.py:48
+#: AKModel/models.py:53
msgid "Events"
msgstr "Events"
-#: AKModel/models.py:106
+#: AKModel/models.py:111
msgid "Nickname"
msgstr "Spitzname"
-#: AKModel/models.py:106
+#: AKModel/models.py:111
msgid "Name to identify an AK owner by"
msgstr "Name, durch den eine AK-Leitung identifiziert wird"
-#: AKModel/models.py:107
+#: AKModel/models.py:112
msgid "Slug"
msgstr "Slug"
-#: AKModel/models.py:107
+#: AKModel/models.py:112
msgid "Slug for URL generation"
msgstr "Slug für URL-Generierung"
-#: AKModel/models.py:108
+#: AKModel/models.py:113
msgid "Institution"
msgstr "Instutution"
-#: AKModel/models.py:108
+#: AKModel/models.py:113
msgid "Uni etc."
msgstr "Universität o.ä."
-#: AKModel/models.py:109 AKModel/models.py:241
+#: AKModel/models.py:114 AKModel/models.py:247
msgid "Web Link"
msgstr "Internet Link"
-#: AKModel/models.py:109
+#: AKModel/models.py:114
msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite"
-#: AKModel/models.py:115 AKModel/models.py:486
+#: AKModel/models.py:120 AKModel/models.py:493
msgid "AK Owner"
msgstr "AK-Leitung"
-#: AKModel/models.py:116
+#: AKModel/models.py:121
msgid "AK Owners"
msgstr "AK-Leitungen"
-#: AKModel/models.py:158
+#: AKModel/models.py:163
msgid "Name of the AK Category"
msgstr "Name der AK-Kategorie"
-#: AKModel/models.py:159 AKModel/models.py:182
+#: AKModel/models.py:164 AKModel/models.py:188
msgid "Color"
msgstr "Farbe"
-#: AKModel/models.py:159 AKModel/models.py:182
+#: AKModel/models.py:164 AKModel/models.py:188
msgid "Color for displaying"
msgstr "Farbe für die Anzeige"
-#: AKModel/models.py:160 AKModel/models.py:235
+#: AKModel/models.py:165 AKModel/models.py:241
msgid "Description"
msgstr "Beschreibung"
-#: AKModel/models.py:161
+#: AKModel/models.py:166
msgid "Short description of this AK Category"
msgstr "Beschreibung der AK-Kategorie"
-#: AKModel/models.py:162
+#: AKModel/models.py:167
msgid "Present by default"
msgstr ""
-#: AKModel/models.py:163
+#: AKModel/models.py:169
msgid ""
"Present AKs of this category by default if AK owner did not specify whether "
"this AK should be presented?"
@@ -327,152 +343,152 @@ msgstr ""
"AKs dieser Kategorie standardmäßig vorstellen, wenn die Leitungen das für "
"ihren AK nicht explizit spezifiziert haben?"
-#: AKModel/models.py:170
+#: AKModel/models.py:176
msgid "AK Categories"
msgstr "AK-Kategorien"
-#: AKModel/models.py:181
+#: AKModel/models.py:187
msgid "Name of the AK Track"
msgstr "Name des AK-Tracks"
-#: AKModel/models.py:188
+#: AKModel/models.py:194
msgid "AK Track"
msgstr "AK-Track"
-#: AKModel/models.py:189
+#: AKModel/models.py:195
msgid "AK Tracks"
msgstr "AK-Tracks"
-#: AKModel/models.py:200
+#: AKModel/models.py:206
msgid "Name of the AK Tag"
msgstr "Name das AK-Tags"
-#: AKModel/models.py:203
+#: AKModel/models.py:209
msgid "AK Tag"
msgstr "AK-Tag"
-#: AKModel/models.py:204
+#: AKModel/models.py:210
msgid "AK Tags"
msgstr "AK-Tags"
-#: AKModel/models.py:214
+#: AKModel/models.py:220
msgid "Name of the Requirement"
msgstr "Name der Anforderung"
-#: AKModel/models.py:220 AKModel/models.py:490
+#: AKModel/models.py:226 AKModel/models.py:497
msgid "AK Requirement"
msgstr "AK-Anforderung"
-#: AKModel/models.py:221
+#: AKModel/models.py:227
msgid "AK Requirements"
msgstr "AK-Anforderungen"
-#: AKModel/models.py:232
+#: AKModel/models.py:238
msgid "Name of the AK"
msgstr "Name des AKs"
-#: AKModel/models.py:233
+#: AKModel/models.py:239
msgid "Short Name"
msgstr "Kurzer Name"
-#: AKModel/models.py:234
+#: AKModel/models.py:240
msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK-Plan"
-#: AKModel/models.py:235
+#: AKModel/models.py:241
msgid "Description of the AK"
msgstr "Beschreibung des AKs"
-#: AKModel/models.py:237
+#: AKModel/models.py:243
msgid "Owners"
msgstr "Leitungen"
-#: AKModel/models.py:238
+#: AKModel/models.py:244
msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten"
-#: AKModel/models.py:241
+#: AKModel/models.py:247
msgid "Link to wiki page"
msgstr "Link zur Wiki Seite"
-#: AKModel/models.py:242
+#: AKModel/models.py:248
msgid "Protocol Link"
msgstr "Protokolllink"
-#: AKModel/models.py:242
+#: AKModel/models.py:248
msgid "Link to protocol"
msgstr "Link zum Protokoll"
-#: AKModel/models.py:244
+#: AKModel/models.py:250
msgid "Category"
msgstr "Kategorie"
-#: AKModel/models.py:245
+#: AKModel/models.py:251
msgid "Category of the AK"
msgstr "Kategorie des AKs"
-#: AKModel/models.py:246
+#: AKModel/models.py:252
msgid "Tags"
msgstr "Tags"
-#: AKModel/models.py:246
+#: AKModel/models.py:252
msgid "Tags provided by owners"
msgstr "Tags, die durch die AK-Leitung vergeben wurden"
-#: AKModel/models.py:247
+#: AKModel/models.py:253
msgid "Track"
msgstr "Track"
-#: AKModel/models.py:248
+#: AKModel/models.py:254
msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört"
-#: AKModel/models.py:250
+#: AKModel/models.py:256
msgid "Resolution Intention"
msgstr "Resolutionsabsicht"
-#: AKModel/models.py:251
+#: AKModel/models.py:257
msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen"
-#: AKModel/models.py:252
+#: AKModel/models.py:258
msgid "Present this AK"
msgstr "AK präsentieren"
-#: AKModel/models.py:253
+#: AKModel/models.py:259
msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen"
-#: AKModel/models.py:255 AKModel/templates/admin/AKModel/status.html:91
+#: AKModel/models.py:261 AKModel/templates/admin/AKModel/status.html:91
msgid "Requirements"
msgstr "Anforderungen"
-#: AKModel/models.py:256
+#: AKModel/models.py:262
msgid "AK's Requirements"
msgstr "Anforderungen des AKs"
-#: AKModel/models.py:258
+#: AKModel/models.py:264
msgid "Conflicting AKs"
msgstr "AK-Konflikte"
-#: AKModel/models.py:259
+#: AKModel/models.py:265
msgid "AKs that conflict and thus must not take place at the same time"
msgstr ""
"AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
-#: AKModel/models.py:260
+#: AKModel/models.py:266
msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs"
-#: AKModel/models.py:261
+#: AKModel/models.py:267
msgid "AKs that should precede this AK in the schedule"
msgstr "AKs die im AK-Plan vor diesem AK stattfinden müssen"
-#: AKModel/models.py:263
+#: AKModel/models.py:269
msgid "Organizational Notes"
msgstr "Notizen zur Organisation"
-#: AKModel/models.py:264
+#: AKModel/models.py:270
msgid ""
"Notes to organizers. These are public. For private notes, please send an e-"
"mail."
@@ -480,258 +496,258 @@ msgstr ""
"Notizen an die Organisator*innen. Diese sind öffentlich, für private "
"Anmerkungen bitte eine E-Mail schicken."
-#: AKModel/models.py:266
+#: AKModel/models.py:272
msgid "Interest"
msgstr "Interesse"
-#: AKModel/models.py:266
+#: AKModel/models.py:272
msgid "Expected number of people"
msgstr "Erwartete Personenzahl"
-#: AKModel/models.py:267
+#: AKModel/models.py:273
msgid "Interest Counter"
msgstr "Interessenszähler"
-#: AKModel/models.py:268
+#: AKModel/models.py:274
msgid "People who have indicated interest online"
msgstr "Anzahl Personen, die online Interesse bekundet haben"
-#: AKModel/models.py:277 AKModel/models.py:481
+#: AKModel/models.py:283 AKModel/models.py:488
#: AKModel/templates/admin/AKModel/status.html:49
#: AKModel/templates/admin/AKModel/status.html:56 AKModel/views.py:335
msgid "AKs"
msgstr "AKs"
-#: AKModel/models.py:328
+#: AKModel/models.py:334
msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums"
-#: AKModel/models.py:329
+#: AKModel/models.py:335
msgid "Location"
msgstr "Ort"
-#: AKModel/models.py:330
+#: AKModel/models.py:336
msgid "Name or number of the location"
msgstr "Name oder Nummer des Ortes"
-#: AKModel/models.py:331
+#: AKModel/models.py:337
msgid "Capacity"
msgstr "Kapazität"
-#: AKModel/models.py:331
+#: AKModel/models.py:338
msgid "Maximum number of people (-1 for unlimited)."
msgstr "Maximale Personenzahl (-1 wenn unbeschränkt)."
-#: AKModel/models.py:332
+#: AKModel/models.py:339
msgid "Properties"
msgstr "Eigenschaften"
-#: AKModel/models.py:333
+#: AKModel/models.py:340
msgid "AK requirements fulfilled by the room"
msgstr "AK-Anforderungen, die dieser Raum erfüllt"
-#: AKModel/models.py:340 AKModel/templates/admin/AKModel/status.html:33
+#: AKModel/models.py:347 AKModel/templates/admin/AKModel/status.html:33
msgid "Rooms"
msgstr "Räume"
-#: AKModel/models.py:357
+#: AKModel/models.py:364
msgid "AK being mapped"
msgstr "AK, der zugeordnet wird"
-#: AKModel/models.py:359
+#: AKModel/models.py:366
msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet"
-#: AKModel/models.py:360
+#: AKModel/models.py:367
msgid "Slot Begin"
msgstr "Beginn des Slots"
-#: AKModel/models.py:360
+#: AKModel/models.py:367
msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt"
-#: AKModel/models.py:362
+#: AKModel/models.py:369
msgid "Duration"
msgstr "Dauer"
-#: AKModel/models.py:363
+#: AKModel/models.py:370
msgid "Length in hours"
msgstr "Länge in Stunden"
-#: AKModel/models.py:365
+#: AKModel/models.py:372
msgid "Scheduling fixed"
msgstr "Planung fix"
-#: AKModel/models.py:366
+#: AKModel/models.py:373
msgid "Length and time of this AK should not be changed"
msgstr "Dauer und Zeit dieses AKs sollten nicht verändert werden"
-#: AKModel/models.py:371
+#: AKModel/models.py:378
msgid "Last update"
msgstr "Letzte Aktualisierung"
-#: AKModel/models.py:374
+#: AKModel/models.py:381
msgid "AK Slot"
msgstr "AK-Slot"
-#: AKModel/models.py:375 AKModel/models.py:483
+#: AKModel/models.py:382 AKModel/models.py:490
msgid "AK Slots"
msgstr "AK-Slot"
-#: AKModel/models.py:397 AKModel/models.py:406
+#: AKModel/models.py:404 AKModel/models.py:413
msgid "Not scheduled yet"
msgstr "Noch nicht geplant"
-#: AKModel/models.py:435
+#: AKModel/models.py:442
msgid "AK this message belongs to"
msgstr "AK zu dem die Nachricht gehört"
-#: AKModel/models.py:436
+#: AKModel/models.py:443
msgid "Message text"
msgstr "Nachrichtentext"
-#: AKModel/models.py:437
+#: AKModel/models.py:444
msgid "Message to the organizers. This is not publicly visible."
msgstr ""
"Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar."
-#: AKModel/models.py:441
+#: AKModel/models.py:448
msgid "AK Orga Message"
msgstr "AK-Organachricht"
-#: AKModel/models.py:442
+#: AKModel/models.py:449
msgid "AK Orga Messages"
msgstr "AK-Organachrichten"
-#: AKModel/models.py:451
+#: AKModel/models.py:458
msgid "Constraint Violation"
msgstr "Constraintverletzung"
-#: AKModel/models.py:452 AKModel/templates/admin/AKModel/status.html:79
+#: AKModel/models.py:459 AKModel/templates/admin/AKModel/status.html:79
msgid "Constraint Violations"
msgstr "Constraintverletzungen"
-#: AKModel/models.py:456
+#: AKModel/models.py:463
msgid "Owner has two parallel slots"
msgstr "Leitung hat zwei Slots parallel"
-#: AKModel/models.py:457
+#: AKModel/models.py:464
msgid "AK Slot was scheduled outside the AK's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des AKs platziert"
-#: AKModel/models.py:458
+#: AKModel/models.py:465
msgid "Room has two AK slots scheduled at the same time"
msgstr "Raum hat zwei AK Slots gleichzeitig"
-#: AKModel/models.py:459
+#: AKModel/models.py:466
msgid "Room does not satisfy the requirement of the scheduled AK"
msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht"
-#: AKModel/models.py:460
+#: AKModel/models.py:467
msgid "AK Slot is scheduled at the same time as an AK listed as a conflict"
msgstr ""
"AK Slot wurde wurde zur gleichen Zeit wie ein Konflikt des AKs platziert"
-#: AKModel/models.py:461
+#: AKModel/models.py:468
msgid "AK Slot is scheduled before an AK listed as a prerequisite"
msgstr "AK Slot wurde vor einem als Voraussetzung gelisteten AK platziert"
-#: AKModel/models.py:463
+#: AKModel/models.py:470
msgid ""
"AK Slot for AK with intention to submit a resolution is scheduled after "
"resolution deadline"
msgstr ""
"AK Slot eines AKs mit Resoabsicht wurde nach der Resodeadline platziert"
-#: AKModel/models.py:464
+#: AKModel/models.py:471
msgid "AK Slot in a category is outside that categories availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeiten seiner Kategorie"
-#: AKModel/models.py:465
+#: AKModel/models.py:472
msgid "Two AK Slots for the same AK scheduled at the same time"
msgstr "Zwei AK Slots eines AKs wurden zur selben Zeit platziert"
-#: AKModel/models.py:466
+#: AKModel/models.py:473
msgid "Room does not have enough space for interest in scheduled AK Slot"
msgstr "Room hat nicht genug Platz für das Interesse am geplanten AK-Slot"
-#: AKModel/models.py:467
+#: AKModel/models.py:474
msgid "AK Slot is scheduled outside the event's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des Events platziert"
-#: AKModel/models.py:470
+#: AKModel/models.py:477
msgid "Warning"
msgstr "Warnung"
-#: AKModel/models.py:471
+#: AKModel/models.py:478
msgid "Violation"
msgstr "Verletzung"
-#: AKModel/models.py:473
+#: AKModel/models.py:480
msgid "Type"
msgstr "Art"
-#: AKModel/models.py:474
+#: AKModel/models.py:481
msgid "Type of violation, i.e. what kind of constraint was violated"
msgstr "Art der Verletzung, gibt an welche Art Constraint verletzt wurde"
-#: AKModel/models.py:475
+#: AKModel/models.py:482
msgid "Level"
msgstr "Level"
-#: AKModel/models.py:476
+#: AKModel/models.py:483
msgid "Severity level of the violation"
msgstr "Schweregrad der Verletzung"
-#: AKModel/models.py:482
+#: AKModel/models.py:489
msgid "AK(s) belonging to this constraint"
msgstr "AK(s), die zu diesem Constraint gehören"
-#: AKModel/models.py:484
+#: AKModel/models.py:491
msgid "AK Slot(s) belonging to this constraint"
msgstr "AK Slot(s), die zu diesem Constraint gehören"
-#: AKModel/models.py:486
+#: AKModel/models.py:493
msgid "AK Owner belonging to this constraint"
msgstr "AK Leitung(en), die zu diesem Constraint gehören"
-#: AKModel/models.py:488
+#: AKModel/models.py:495
msgid "Room belonging to this constraint"
msgstr "Raum, der zu diesem Constraint gehört"
-#: AKModel/models.py:491
+#: AKModel/models.py:498
msgid "AK Requirement belonging to this constraint"
msgstr "AK Anforderung, die zu diesem Constraint gehört"
-#: AKModel/models.py:493
+#: AKModel/models.py:500
msgid "AK Category belonging to this constraint"
msgstr "AK Kategorie, di zu diesem Constraint gehört"
-#: AKModel/models.py:495
+#: AKModel/models.py:502
msgid "Comment"
msgstr "Kommentar"
-#: AKModel/models.py:495
+#: AKModel/models.py:502
msgid "Comment or further details for this violation"
msgstr "Kommentar oder weitere Details zu dieser Vereletzung"
-#: AKModel/models.py:498
+#: AKModel/models.py:505
msgid "Timestamp"
msgstr "Timestamp"
-#: AKModel/models.py:498
+#: AKModel/models.py:505
msgid "Time of creation"
msgstr "Zeitpunkt der ERstellung"
-#: AKModel/models.py:499
+#: AKModel/models.py:506
msgid "Manually Resolved"
msgstr "Manuell behoben"
-#: AKModel/models.py:500
+#: AKModel/models.py:507
msgid "Mark this violation manually as resolved"
msgstr "Markiere diese Verletzung manuell als behoben"
-#: AKModel/models.py:527
+#: AKModel/models.py:534
#: AKModel/templates/admin/AKModel/requirements_overview.html:27
msgid "Details"
msgstr "Details"
diff --git a/AKModel/migrations/0049_interest_window.py b/AKModel/migrations/0049_interest_window.py
new file mode 100644
index 00000000..07448c54
--- /dev/null
+++ b/AKModel/migrations/0049_interest_window.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.1.8 on 2021-10-29 10:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('AKModel', '0048_constraint_violation_text'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='event',
+ name='interest_end',
+ field=models.DateTimeField(blank=True, help_text='Closing time for expression of interest.', null=True,
+ verbose_name='Interest Window End'),
+ ),
+ migrations.AddField(
+ model_name='event',
+ name='interest_start',
+ field=models.DateTimeField(blank=True, help_text='Opening time for expression of interest.', null=True,
+ verbose_name='Interest Window Start'),
+ ),
+ ]
diff --git a/AKModel/models.py b/AKModel/models.py
index 98dad770..2767effb 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -27,6 +27,11 @@ class Event(models.Model):
reso_deadline = models.DateTimeField(verbose_name=_('Resolution Deadline'), blank=True, null=True,
help_text=_('When should AKs with intention to submit a resolution be done?'))
+ interest_start = models.DateTimeField(verbose_name=_('Interest Window Start'), blank=True, null=True,
+ help_text=_('Opening time for expression of interest.'))
+ interest_end = models.DateTimeField(verbose_name=_('Interest Window End'), blank=True, null=True,
+ help_text=_('Closing time for expression of interest.'))
+
public = models.BooleanField(verbose_name=_('Public event'), default=True,
help_text=_('Show this event on overview page.'))
@@ -160,7 +165,8 @@ class AKCategory(models.Model):
description = models.TextField(blank=True, verbose_name=_("Description"),
help_text=_("Short description of this AK Category"))
present_by_default = models.BooleanField(blank=True, default=True, verbose_name=_("Present by default"),
- help_text=_("Present AKs of this category by default if AK owner did not specify whether this AK should be presented?"))
+ help_text=_(
+ "Present AKs of this category by default if AK owner did not specify whether this AK should be presented?"))
event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'),
help_text=_('Associated event'))
@@ -328,7 +334,8 @@ class Room(models.Model):
name = models.CharField(max_length=64, verbose_name=_('Name'), help_text=_('Name or number of the room'))
location = models.CharField(max_length=256, blank=True, verbose_name=_('Location'),
help_text=_('Name or number of the location'))
- capacity = models.IntegerField(verbose_name=_('Capacity'), help_text=_('Maximum number of people (-1 for unlimited).'))
+ capacity = models.IntegerField(verbose_name=_('Capacity'),
+ help_text=_('Maximum number of people (-1 for unlimited).'))
properties = models.ManyToManyField(to=AKRequirement, blank=True, verbose_name=_('Properties'),
help_text=_('AK requirements fulfilled by the room'))
diff --git a/AKPlan/locale/de_DE/LC_MESSAGES/django.po b/AKPlan/locale/de_DE/LC_MESSAGES/django.po
index 120f98ec..9000d9d8 100644
--- a/AKPlan/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKPlan/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 22:48+0000\n"
+"POT-Creation-Date: 2021-10-29 09:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,56 +27,56 @@ msgstr "Plan"
msgid "Write to organizers of this event for questions and comments"
msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail"
-#: AKPlan/templates/AKPlan/plan_index.html:31
+#: AKPlan/templates/AKPlan/plan_index.html:32
msgid "Day"
msgstr "Tag"
-#: AKPlan/templates/AKPlan/plan_index.html:41
+#: AKPlan/templates/AKPlan/plan_index.html:42
msgid "Event"
msgstr "Veranstaltung"
-#: AKPlan/templates/AKPlan/plan_index.html:53
+#: AKPlan/templates/AKPlan/plan_index.html:55
#: AKPlan/templates/AKPlan/plan_room.html:13
#: AKPlan/templates/AKPlan/plan_room.html:59
-#: AKPlan/templates/AKPlan/plan_wall.html:50
+#: AKPlan/templates/AKPlan/plan_wall.html:52
msgid "Room"
msgstr "Raum"
-#: AKPlan/templates/AKPlan/plan_index.html:74
+#: AKPlan/templates/AKPlan/plan_index.html:76
#: AKPlan/templates/AKPlan/plan_room.html:11
#: AKPlan/templates/AKPlan/plan_track.html:9
msgid "AK Plan"
msgstr "AK-Plan"
-#: AKPlan/templates/AKPlan/plan_index.html:86
+#: AKPlan/templates/AKPlan/plan_index.html:88
#: AKPlan/templates/AKPlan/plan_room.html:49
msgid "Rooms"
msgstr "Räume"
-#: AKPlan/templates/AKPlan/plan_index.html:99
+#: AKPlan/templates/AKPlan/plan_index.html:101
#: AKPlan/templates/AKPlan/plan_track.html:36
msgid "Tracks"
msgstr "Tracks"
-#: AKPlan/templates/AKPlan/plan_index.html:111
+#: AKPlan/templates/AKPlan/plan_index.html:113
msgid "AK Wall"
msgstr "AK-Wall"
-#: AKPlan/templates/AKPlan/plan_index.html:124
-#: AKPlan/templates/AKPlan/plan_wall.html:79
+#: AKPlan/templates/AKPlan/plan_index.html:126
+#: AKPlan/templates/AKPlan/plan_wall.html:81
msgid "Current AKs"
msgstr "Aktuelle AKs"
-#: AKPlan/templates/AKPlan/plan_index.html:131
-#: AKPlan/templates/AKPlan/plan_wall.html:84
+#: AKPlan/templates/AKPlan/plan_index.html:133
+#: AKPlan/templates/AKPlan/plan_wall.html:86
msgid "Next AKs"
msgstr "Nächste AKs"
-#: AKPlan/templates/AKPlan/plan_index.html:139
+#: AKPlan/templates/AKPlan/plan_index.html:141
msgid "This event is not active."
msgstr "Dieses Event ist nicht aktiv."
-#: AKPlan/templates/AKPlan/plan_index.html:152
+#: AKPlan/templates/AKPlan/plan_index.html:154
#: AKPlan/templates/AKPlan/plan_room.html:77
#: AKPlan/templates/AKPlan/plan_track.html:58
msgid "Plan is not visible (yet)."
diff --git a/AKPlanning/locale/de_DE/LC_MESSAGES/django.po b/AKPlanning/locale/de_DE/LC_MESSAGES/django.po
index 7338ca7c..7e4b2703 100644
--- a/AKPlanning/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKPlanning/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 22:48+0000\n"
+"POT-Creation-Date: 2021-10-29 09:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: AKPlanning/settings.py:134
+#: AKPlanning/settings.py:144
msgid "German"
msgstr "Deutsch"
-#: AKPlanning/settings.py:135
+#: AKPlanning/settings.py:145
msgid "English"
msgstr "Englisch"
diff --git a/AKScheduling/locale/de_DE/LC_MESSAGES/django.po b/AKScheduling/locale/de_DE/LC_MESSAGES/django.po
index dbf3a8a6..071f4f87 100644
--- a/AKScheduling/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKScheduling/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-28 20:45+0000\n"
+"POT-Creation-Date: 2021-10-29 09:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: AKScheduling/models.py:507
+#: AKScheduling/models.py:80
#, python-format
msgid ""
"Not enough space for AK interest (Interest: %(interest)d, Capacity: "
@@ -26,7 +26,7 @@ msgstr ""
"Nicht genug Platz für AK-Interesse (Interesse: %(interest)d, Kapazität: "
"%(capacity)d)"
-#: AKScheduling/models.py:519
+#: AKScheduling/models.py:92
#, python-format
msgid ""
"Space is too close to AK interest (Interest: %(interest)d, Capacity: "
diff --git a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
index 92f1633b..7441d587 100644
--- a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-15 14:34+0000\n"
+"POT-Creation-Date: 2021-10-29 09:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,30 +38,6 @@ msgstr ""
"Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere "
"Slots haben soll, mehrere Zeilen verwenden"
-#: AKSubmission/templates/AKSubmission/ak_detail.html:11
-#: AKSubmission/templates/AKSubmission/ak_edit.html:8
-#: AKSubmission/templates/AKSubmission/ak_history.html:11
-#: AKSubmission/templates/AKSubmission/ak_overview.html:8
-#: AKSubmission/templates/AKSubmission/ak_overview.html:12
-#: AKSubmission/templates/AKSubmission/ak_overview.html:38
-#: AKSubmission/templates/AKSubmission/akmessage_add.html:7
-#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
-#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:7
-#: AKSubmission/templates/AKSubmission/submission_not_configured.html:7
-#: AKSubmission/templates/AKSubmission/submission_overview.html:7
-#: AKSubmission/templates/AKSubmission/submission_overview.html:43
-#: AKSubmission/templates/AKSubmission/submit_new.html:8
-#: AKSubmission/templates/AKSubmission/submit_new_wish.html:7
-msgid "AKs"
-msgstr "AKs"
-
-#: AKSubmission/templates/AKSubmission/ak_detail.html:11
-#: AKSubmission/templates/AKSubmission/ak_history.html:11
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:31
-msgid "AK"
-msgstr "AK"
-
#: AKSubmission/templates/AKSubmission/ak_detail.html:22
#: AKSubmission/templates/AKSubmission/ak_edit.html:13
#: AKSubmission/templates/AKSubmission/ak_history.html:16
@@ -244,11 +220,33 @@ msgstr "Start"
msgid "End"
msgstr "Ende"
+#: AKSubmission/templates/AKSubmission/ak_edit.html:8
+#: AKSubmission/templates/AKSubmission/ak_history.html:11
+#: AKSubmission/templates/AKSubmission/ak_overview.html:8
+#: AKSubmission/templates/AKSubmission/ak_overview.html:12
+#: AKSubmission/templates/AKSubmission/ak_overview.html:38
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:7
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:7
+#: AKSubmission/templates/AKSubmission/submission_not_configured.html:7
+#: AKSubmission/templates/AKSubmission/submission_overview.html:7
+#: AKSubmission/templates/AKSubmission/submission_overview.html:43
+#: AKSubmission/templates/AKSubmission/submit_new.html:8
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:7
+msgid "AKs"
+msgstr "AKs"
+
#: AKSubmission/templates/AKSubmission/ak_edit.html:8
#: AKSubmission/templates/AKSubmission/ak_edit.html:21
msgid "Edit AK"
msgstr "AK bearbeiten"
+#: AKSubmission/templates/AKSubmission/ak_history.html:11
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:31
+msgid "AK"
+msgstr "AK"
+
#: AKSubmission/templates/AKSubmission/ak_history.html:27
msgid "Back"
msgstr "Zurück"
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 08f762b7..84e04f5f 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 22:48+0000\n"
+"POT-Creation-Date: 2021-10-29 09:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
--
GitLab