Merge branch 'feature-present-default' into 'main'

Introduce and use a present_by_default attribute for AKCategory

See merge request !107

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-05-08 18:07+0000\n"
+"POT-Creation-Date: 2021-05-15 14:34+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"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AKModel/admin.py:69 AKModel/admin.py:70
+#: AKModel/admin.py:46 AKModel/admin.py:48
 #: AKModel/templates/admin/AKModel/event_wizard/activate.html:32
 #: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:48
 #: AKModel/templates/admin/AKModel/event_wizard/finish.html:21
@@ -21,23 +21,23 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: AKModel/admin.py:156
+#: AKModel/admin.py:122
 msgid "Wish"
 msgstr "AK-Wunsch"
 
-#: AKModel/admin.py:162
+#: AKModel/admin.py:128
 msgid "Is wish"
 msgstr "Ist ein Wunsch"
 
-#: AKModel/admin.py:163
+#: AKModel/admin.py:129
 msgid "Is not a wish"
 msgstr "Ist kein Wunsch"
 
-#: AKModel/admin.py:209
+#: AKModel/admin.py:175
 msgid "Export to wiki syntax"
 msgstr "In Wiki-Syntax exportieren"
 
-#: AKModel/admin.py:317
+#: AKModel/admin.py:269
 msgid "AK Details"
 msgstr "AK-Details"
 
@@ -65,16 +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:76
-#: AKModel/models.py:128 AKModel/models.py:147 AKModel/models.py:179
-#: AKModel/models.py:233 AKModel/models.py:298 AKModel/models.py:330
-#: AKModel/models.py:437
+#: 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
 msgid "Event"
 msgstr "Event"
 
-#: AKModel/availability/models.py:39 AKModel/models.py:77 AKModel/models.py:129
-#: AKModel/models.py:148 AKModel/models.py:180 AKModel/models.py:234
-#: AKModel/models.py:299 AKModel/models.py:331 AKModel/models.py:438
+#: 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
 msgid "Associated event"
 msgstr "Zugehöriges Event"
 
@@ -86,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:302
-#: AKModel/models.py:321 AKModel/models.py:446
+#: AKModel/availability/models.py:56 AKModel/models.py:339
+#: AKModel/models.py:358 AKModel/models.py:487
 msgid "Room"
 msgstr "Raum"
 
@@ -95,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:239
-#: AKModel/models.py:320 AKModel/models.py:393
+#: AKModel/availability/models.py:65 AKModel/models.py:276
+#: AKModel/models.py:357 AKModel/models.py:434
 msgid "AK"
 msgstr "AK"
 
@@ -104,8 +105,8 @@ msgstr "AK"
 msgid "AK whose availability this is"
 msgstr "Verfügbarkeiten"
 
-#: AKModel/availability/models.py:74 AKModel/models.py:132
-#: AKModel/models.py:452
+#: AKModel/availability/models.py:74 AKModel/models.py:169
+#: AKModel/models.py:493
 msgid "AK Category"
 msgstr "AK-Kategorie"
 
@@ -134,9 +135,9 @@ msgstr "AK-Kategorien kopieren"
 msgid "Copy ak requirements"
 msgstr "AK-Anforderungen kopieren"
 
-#: AKModel/models.py:16 AKModel/models.py:123 AKModel/models.py:144
-#: AKModel/models.py:163 AKModel/models.py:177 AKModel/models.py:195
-#: AKModel/models.py:291
+#: 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
 msgid "Name"
 msgstr "Name"
 
@@ -170,7 +171,7 @@ msgstr "Zeitzone"
 msgid "Time Zone where this event takes place in"
 msgstr "Zeitzone in der das Event stattfindet"
 
-#: AKModel/models.py:25 AKModel/views.py:209
+#: AKModel/models.py:25 AKModel/views.py:219
 msgid "Start"
 msgstr "Start"
 
@@ -254,212 +255,224 @@ msgstr ""
 msgid "Events"
 msgstr "Events"
 
-#: AKModel/models.py:71
+#: AKModel/models.py:106
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: AKModel/models.py:71
+#: AKModel/models.py:106
 msgid "Name to identify an AK owner by"
 msgstr "Name, durch den eine AK-Leitung identifiziert wird"
 
-#: AKModel/models.py:72
+#: AKModel/models.py:107
 msgid "Slug"
 msgstr "Slug"
 
-#: AKModel/models.py:72
+#: AKModel/models.py:107
 msgid "Slug for URL generation"
 msgstr "Slug für URL-Generierung"
 
-#: AKModel/models.py:73
+#: AKModel/models.py:108
 msgid "Institution"
 msgstr "Instutution"
 
-#: AKModel/models.py:73
+#: AKModel/models.py:108
 msgid "Uni etc."
 msgstr "Universität o.ä."
 
-#: AKModel/models.py:74 AKModel/models.py:204
+#: AKModel/models.py:109 AKModel/models.py:241
 msgid "Web Link"
 msgstr "Internet Link"
 
-#: AKModel/models.py:74
+#: AKModel/models.py:109
 msgid "Link to Homepage"
 msgstr "Link zu Homepage oder Webseite"
 
-#: AKModel/models.py:80 AKModel/models.py:445
+#: AKModel/models.py:115 AKModel/models.py:486
 msgid "AK Owner"
 msgstr "AK-Leitung"
 
-#: AKModel/models.py:81
+#: AKModel/models.py:116
 msgid "AK Owners"
 msgstr "AK-Leitungen"
 
-#: AKModel/models.py:123
+#: AKModel/models.py:158
 msgid "Name of the AK Category"
 msgstr "Name der AK-Kategorie"
 
-#: AKModel/models.py:124 AKModel/models.py:145
+#: AKModel/models.py:159 AKModel/models.py:182
 msgid "Color"
 msgstr "Farbe"
 
-#: AKModel/models.py:124 AKModel/models.py:145
+#: AKModel/models.py:159 AKModel/models.py:182
 msgid "Color for displaying"
 msgstr "Farbe für die Anzeige"
 
-#: AKModel/models.py:125 AKModel/models.py:198
+#: AKModel/models.py:160 AKModel/models.py:235
 msgid "Description"
 msgstr "Beschreibung"
 
-#: AKModel/models.py:126
+#: AKModel/models.py:161
 msgid "Short description of this AK Category"
 msgstr "Beschreibung der AK-Kategorie"
 
-#: AKModel/models.py:133
+#: AKModel/models.py:162
+msgid "Present by default"
+msgstr ""
+
+#: AKModel/models.py:163
+msgid ""
+"Present AKs of this category by default if AK owner did not specify whether "
+"this AK should be presented?"
+msgstr ""
+"AKs dieser Kategorie standardmäßig vorstellen, wenn die Leitungen das für "
+"ihren AK nicht explizit spezifiziert haben?"
+
+#: AKModel/models.py:170
 msgid "AK Categories"
 msgstr "AK-Kategorien"
 
-#: AKModel/models.py:144
+#: AKModel/models.py:181
 msgid "Name of the AK Track"
 msgstr "Name des AK-Tracks"
 
-#: AKModel/models.py:151
+#: AKModel/models.py:188
 msgid "AK Track"
 msgstr "AK-Track"
 
-#: AKModel/models.py:152
+#: AKModel/models.py:189
 msgid "AK Tracks"
 msgstr "AK-Tracks"
 
-#: AKModel/models.py:163
+#: AKModel/models.py:200
 msgid "Name of the AK Tag"
 msgstr "Name das AK-Tags"
 
-#: AKModel/models.py:166
+#: AKModel/models.py:203
 msgid "AK Tag"
 msgstr "AK-Tag"
 
-#: AKModel/models.py:167
+#: AKModel/models.py:204
 msgid "AK Tags"
 msgstr "AK-Tags"
 
-#: AKModel/models.py:177
+#: AKModel/models.py:214
 msgid "Name of the Requirement"
 msgstr "Name der Anforderung"
 
-#: AKModel/models.py:183 AKModel/models.py:449
+#: AKModel/models.py:220 AKModel/models.py:490
 msgid "AK Requirement"
 msgstr "AK-Anforderung"
 
-#: AKModel/models.py:184
+#: AKModel/models.py:221
 msgid "AK Requirements"
 msgstr "AK-Anforderungen"
 
-#: AKModel/models.py:195
+#: AKModel/models.py:232
 msgid "Name of the AK"
 msgstr "Name des AKs"
 
-#: AKModel/models.py:196
+#: AKModel/models.py:233
 msgid "Short Name"
 msgstr "Kurzer Name"
 
-#: AKModel/models.py:197
+#: AKModel/models.py:234
 msgid "Name displayed in the schedule"
 msgstr "Name zur Anzeige im AK-Plan"
 
-#: AKModel/models.py:198
+#: AKModel/models.py:235
 msgid "Description of the AK"
 msgstr "Beschreibung des AKs"
 
-#: AKModel/models.py:200
+#: AKModel/models.py:237
 msgid "Owners"
 msgstr "Leitungen"
 
-#: AKModel/models.py:201
+#: AKModel/models.py:238
 msgid "Those organizing the AK"
 msgstr "Menschen, die den AK organisieren und halten"
 
-#: AKModel/models.py:204
+#: AKModel/models.py:241
 msgid "Link to wiki page"
 msgstr "Link zur Wiki Seite"
 
-#: AKModel/models.py:205
+#: AKModel/models.py:242
 msgid "Protocol Link"
 msgstr "Protokolllink"
 
-#: AKModel/models.py:205
+#: AKModel/models.py:242
 msgid "Link to protocol"
 msgstr "Link zum Protokoll"
 
-#: AKModel/models.py:207
+#: AKModel/models.py:244
 msgid "Category"
 msgstr "Kategorie"
 
-#: AKModel/models.py:208
+#: AKModel/models.py:245
 msgid "Category of the AK"
 msgstr "Kategorie des AKs"
 
-#: AKModel/models.py:209
+#: AKModel/models.py:246
 msgid "Tags"
 msgstr "Tags"
 
-#: AKModel/models.py:209
+#: AKModel/models.py:246
 msgid "Tags provided by owners"
 msgstr "Tags, die durch die AK-Leitung vergeben wurden"
 
-#: AKModel/models.py:210
+#: AKModel/models.py:247
 msgid "Track"
 msgstr "Track"
 
-#: AKModel/models.py:211
+#: AKModel/models.py:248
 msgid "Track the AK belongs to"
 msgstr "Track zu dem der AK gehört"
 
-#: AKModel/models.py:213
+#: AKModel/models.py:250
 msgid "Resolution Intention"
 msgstr "Resolutionsabsicht"
 
-#: AKModel/models.py:214
+#: AKModel/models.py:251
 msgid "Intends to submit a resolution"
 msgstr "Beabsichtigt eine Resolution einzureichen"
 
-#: AKModel/models.py:215
+#: AKModel/models.py:252
 msgid "Present this AK"
 msgstr "AK präsentieren"
 
-#: AKModel/models.py:216
+#: AKModel/models.py:253
 msgid "Present results of this AK"
 msgstr "Die Ergebnisse dieses AKs vorstellen"
 
-#: AKModel/models.py:218 AKModel/templates/admin/AKModel/status.html:87
+#: AKModel/models.py:255 AKModel/templates/admin/AKModel/status.html:91
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: AKModel/models.py:219
+#: AKModel/models.py:256
 msgid "AK's Requirements"
 msgstr "Anforderungen des AKs"
 
-#: AKModel/models.py:221
+#: AKModel/models.py:258
 msgid "Conflicting AKs"
 msgstr "AK-Konflikte"
 
-#: AKModel/models.py:222
+#: AKModel/models.py:259
 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:223
+#: AKModel/models.py:260
 msgid "Prerequisite AKs"
 msgstr "Vorausgesetzte AKs"
 
-#: AKModel/models.py:224
+#: AKModel/models.py:261
 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:226
+#: AKModel/models.py:263
 msgid "Organizational Notes"
 msgstr "Notizen zur Organisation"
 
-#: AKModel/models.py:227
+#: AKModel/models.py:264
 msgid ""
 "Notes to organizers. These are public. For private notes, please send an e-"
 "mail."
@@ -467,260 +480,260 @@ msgstr ""
 "Notizen an die Organisator*innen. Diese sind öffentlich, für private "
 "Anmerkungen bitte eine E-Mail schicken."
 
-#: AKModel/models.py:229
+#: AKModel/models.py:266
 msgid "Interest"
 msgstr "Interesse"
 
-#: AKModel/models.py:229
+#: AKModel/models.py:266
 msgid "Expected number of people"
 msgstr "Erwartete Personenzahl"
 
-#: AKModel/models.py:230
+#: AKModel/models.py:267
 msgid "Interest Counter"
 msgstr "Interessenszähler"
 
-#: AKModel/models.py:231
+#: AKModel/models.py:268
 msgid "People who have indicated interest online"
 msgstr "Anzahl Personen, die online Interesse bekundet haben"
 
-#: AKModel/models.py:240 AKModel/models.py:440
+#: AKModel/models.py:277 AKModel/models.py:481
 #: AKModel/templates/admin/AKModel/status.html:49
-#: AKModel/templates/admin/AKModel/status.html:56 AKModel/views.py:310
+#: AKModel/templates/admin/AKModel/status.html:56 AKModel/views.py:335
 msgid "AKs"
 msgstr "AKs"
 
-#: AKModel/models.py:291
+#: AKModel/models.py:328
 msgid "Name or number of the room"
 msgstr "Name oder Nummer des Raums"
 
-#: AKModel/models.py:292
+#: AKModel/models.py:329
 msgid "Location"
 msgstr "Ort"
 
-#: AKModel/models.py:293
+#: AKModel/models.py:330
 msgid "Name or number of the location"
 msgstr "Name oder Nummer des Ortes"
 
-#: AKModel/models.py:294
+#: AKModel/models.py:331
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: AKModel/models.py:294
+#: AKModel/models.py:331
 msgid "Maximum number of people"
 msgstr "Maximale Personenzahl"
 
-#: AKModel/models.py:295
+#: AKModel/models.py:332
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: AKModel/models.py:296
+#: AKModel/models.py:333
 msgid "AK requirements fulfilled by the room"
 msgstr "AK-Anforderungen, die dieser Raum erfüllt"
 
-#: AKModel/models.py:303 AKModel/templates/admin/AKModel/status.html:33
+#: AKModel/models.py:340 AKModel/templates/admin/AKModel/status.html:33
 msgid "Rooms"
 msgstr "Räume"
 
-#: AKModel/models.py:320
+#: AKModel/models.py:357
 msgid "AK being mapped"
 msgstr "AK, der zugeordnet wird"
 
-#: AKModel/models.py:322
+#: AKModel/models.py:359
 msgid "Room the AK will take place in"
 msgstr "Raum in dem der AK stattfindet"
 
-#: AKModel/models.py:323
+#: AKModel/models.py:360
 msgid "Slot Begin"
 msgstr "Beginn des Slots"
 
-#: AKModel/models.py:323
+#: AKModel/models.py:360
 msgid "Time and date the slot begins"
 msgstr "Zeit und Datum zu der der AK beginnt"
 
-#: AKModel/models.py:325
+#: AKModel/models.py:362
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKModel/models.py:326
+#: AKModel/models.py:363
 msgid "Length in hours"
 msgstr "Länge in Stunden"
 
-#: AKModel/models.py:328
+#: AKModel/models.py:365
 msgid "Scheduling fixed"
 msgstr "Planung fix"
 
-#: AKModel/models.py:328
+#: AKModel/models.py:366
 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:333
+#: AKModel/models.py:371
 msgid "Last update"
 msgstr "Letzte Aktualisierung"
 
-#: AKModel/models.py:336
+#: AKModel/models.py:374
 msgid "AK Slot"
 msgstr "AK-Slot"
 
-#: AKModel/models.py:337 AKModel/models.py:442
+#: AKModel/models.py:375 AKModel/models.py:483
 msgid "AK Slots"
 msgstr "AK-Slot"
 
-#: AKModel/models.py:359 AKModel/models.py:368
+#: AKModel/models.py:397 AKModel/models.py:406
 msgid "Not scheduled yet"
 msgstr "Noch nicht geplant"
 
-#: AKModel/models.py:394
+#: AKModel/models.py:435
 msgid "AK this message belongs to"
 msgstr "AK zu dem die Nachricht gehört"
 
-#: AKModel/models.py:395
+#: AKModel/models.py:436
 msgid "Message text"
 msgstr "Nachrichtentext"
 
-#: AKModel/models.py:396
+#: AKModel/models.py:437
 msgid "Message to the organizers. This is not publicly visible."
 msgstr ""
 "Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar."
 
-#: AKModel/models.py:400
+#: AKModel/models.py:441
 msgid "AK Orga Message"
 msgstr "AK-Organachricht"
 
-#: AKModel/models.py:401
+#: AKModel/models.py:442
 msgid "AK Orga Messages"
 msgstr "AK-Organachrichten"
 
-#: AKModel/models.py:410
+#: AKModel/models.py:451
 msgid "Constraint Violation"
 msgstr "Constraintverletzung"
 
-#: AKModel/models.py:411
+#: AKModel/models.py:452 AKModel/templates/admin/AKModel/status.html:79
 msgid "Constraint Violations"
 msgstr "Constraintverletzungen"
 
-#: AKModel/models.py:415
+#: AKModel/models.py:456
 msgid "Owner has two parallel slots"
 msgstr "Leitung hat zwei Slots parallel"
 
-#: AKModel/models.py:416
+#: AKModel/models.py:457
 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:417
+#: AKModel/models.py:458
 msgid "Room has two AK slots scheduled at the same time"
 msgstr "Raum hat zwei AK Slots gleichzeitig"
 
-#: AKModel/models.py:418
+#: AKModel/models.py:459
 msgid "Room does not satisfy the requirement of the scheduled AK"
 msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht"
 
-#: AKModel/models.py:419
+#: AKModel/models.py:460
 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:420
+#: AKModel/models.py:461
 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:422
+#: AKModel/models.py:463
 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:423
+#: AKModel/models.py:464
 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:424
+#: AKModel/models.py:465
 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:425
+#: AKModel/models.py:466
 msgid "AK Slot is scheduled in a room with less space than interest"
 msgstr ""
 "AK Slot wurde in einem Raum mit weniger Plätzen als am AK Interessierten "
 "platziert"
 
-#: AKModel/models.py:426
+#: AKModel/models.py:467
 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:429
+#: AKModel/models.py:470
 msgid "Warning"
 msgstr "Warnung"
 
-#: AKModel/models.py:430
+#: AKModel/models.py:471
 msgid "Violation"
 msgstr "Verletzung"
 
-#: AKModel/models.py:432
+#: AKModel/models.py:473
 msgid "Type"
 msgstr "Art"
 
-#: AKModel/models.py:433
+#: AKModel/models.py:474
 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:434
+#: AKModel/models.py:475
 msgid "Level"
 msgstr "Level"
 
-#: AKModel/models.py:435
+#: AKModel/models.py:476
 msgid "Severity level of the violation"
 msgstr "Schweregrad der Verletzung"
 
-#: AKModel/models.py:441
+#: AKModel/models.py:482
 msgid "AK(s) belonging to this constraint"
 msgstr "AK(s), die zu diesem Constraint gehören"
 
-#: AKModel/models.py:443
+#: AKModel/models.py:484
 msgid "AK Slot(s) belonging to this constraint"
 msgstr "AK Slot(s), die zu diesem Constraint gehören"
 
-#: AKModel/models.py:445
+#: AKModel/models.py:486
 msgid "AK Owner belonging to this constraint"
 msgstr "AK Leitung(en), die zu diesem Constraint gehören"
 
-#: AKModel/models.py:447
+#: AKModel/models.py:488
 msgid "Room belonging to this constraint"
 msgstr "Raum, der zu diesem Constraint gehört"
 
-#: AKModel/models.py:450
+#: AKModel/models.py:491
 msgid "AK Requirement belonging to this constraint"
 msgstr "AK Anforderung, die zu diesem Constraint gehört"
 
-#: AKModel/models.py:452
+#: AKModel/models.py:493
 msgid "AK Category belonging to this constraint"
 msgstr "AK Kategorie, di zu diesem Constraint gehört"
 
-#: AKModel/models.py:454
+#: AKModel/models.py:495
 msgid "Comment"
 msgstr "Kommentar"
 
-#: AKModel/models.py:454
+#: AKModel/models.py:495
 msgid "Comment or further details for this violation"
 msgstr "Kommentar oder weitere Details zu dieser Vereletzung"
 
-#: AKModel/models.py:457
+#: AKModel/models.py:498
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: AKModel/models.py:457
+#: AKModel/models.py:498
 msgid "Time of creation"
 msgstr "Zeitpunkt der ERstellung"
 
-#: AKModel/models.py:458
+#: AKModel/models.py:499
 msgid "Manually Resolved"
 msgstr "Manuell behoben"
 
-#: AKModel/models.py:459
+#: AKModel/models.py:500
 msgid "Mark this violation manually as resolved"
 msgstr "Markiere diese Verletzung manuell als behoben"
 
-#: AKModel/models.py:481
+#: AKModel/models.py:527
 #: AKModel/templates/admin/AKModel/requirements_overview.html:27
 msgid "Details"
 msgstr "Details"
@@ -761,7 +774,7 @@ msgid "Successfully imported.<br><br>Do you want to activate your event now?"
 msgstr "Erfolgreich importiert.<br><br>Soll das Event jetzt aktiviert werden?"
 
 #: AKModel/templates/admin/AKModel/event_wizard/activate.html:27
-#: AKModel/views.py:214
+#: AKModel/views.py:224
 msgid "Finish"
 msgstr "Abschluss"
 
@@ -845,7 +858,7 @@ msgid "No AKs with this requirement"
 msgstr "Kein AK mit dieser Anforderung"
 
 #: AKModel/templates/admin/AKModel/requirements_overview.html:45
-#: AKModel/templates/admin/AKModel/status.html:103
+#: AKModel/templates/admin/AKModel/status.html:107
 msgid "Add Requirement"
 msgstr "Anforderung hinzufügen"
 
@@ -886,35 +899,35 @@ msgstr "Ungeplante Slots"
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: AKModel/templates/admin/AKModel/status.html:78
+#: AKModel/templates/admin/AKModel/status.html:82
 msgid "Manage ak tracks"
 msgstr "AK-Tracks verwalten"
 
-#: AKModel/templates/admin/AKModel/status.html:80
+#: AKModel/templates/admin/AKModel/status.html:84
 msgid "Export AKs as CSV"
 msgstr "AKs als CSV exportieren"
 
-#: AKModel/templates/admin/AKModel/status.html:82
+#: AKModel/templates/admin/AKModel/status.html:86
 msgid "Export AKs for Wiki"
 msgstr "AKs im Wiki-Format exportieren"
 
-#: AKModel/templates/admin/AKModel/status.html:84
+#: AKModel/templates/admin/AKModel/status.html:88
 msgid "Export AK Slides"
 msgstr "AK-Folien exportieren"
 
-#: AKModel/templates/admin/AKModel/status.html:89
+#: AKModel/templates/admin/AKModel/status.html:93
 msgid "No requirements yet"
 msgstr "Bisher keine Anforderungen"
 
-#: AKModel/templates/admin/AKModel/status.html:102
+#: AKModel/templates/admin/AKModel/status.html:106
 msgid "Show AKs for requirements"
 msgstr "Zu Anforderungen gehörige AKs anzeigen"
 
-#: AKModel/templates/admin/AKModel/status.html:106
+#: AKModel/templates/admin/AKModel/status.html:110
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: AKModel/templates/admin/AKModel/status.html:108
+#: AKModel/templates/admin/AKModel/status.html:112
 msgid "Delete all messages"
 msgstr "Alle Nachrichten löschen"
 
@@ -922,78 +935,78 @@ msgstr "Alle Nachrichten löschen"
 msgid "Active Events"
 msgstr "Aktive Events"
 
-#: AKModel/views.py:139
+#: AKModel/views.py:142
 msgid "Event Status"
 msgstr "Eventstatus"
 
-#: AKModel/views.py:152
+#: AKModel/views.py:155
 msgid "Requirements for Event"
 msgstr "Anforderungen für das Event"
 
-#: AKModel/views.py:166
+#: AKModel/views.py:169
 msgid "AK CSV Export"
 msgstr "AK-CSV-Export"
 
-#: AKModel/views.py:180
+#: AKModel/views.py:183
 msgid "AK Wiki Export"
 msgstr "AK-Wiki-Export"
 
-#: AKModel/views.py:200
+#: AKModel/views.py:191 AKModel/views.py:321
+msgid "Wishes"
+msgstr "Wünsche"
+
+#: AKModel/views.py:210
 msgid "AK Orga Messages successfully deleted"
 msgstr "AK-Organachrichten erfolgreich gelöscht"
 
-#: AKModel/views.py:210
+#: AKModel/views.py:220
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: AKModel/views.py:211
+#: AKModel/views.py:221
 msgid "Event created, Prepare Import"
 msgstr "Event angelegt, Import vorbereiten"
 
-#: AKModel/views.py:212
+#: AKModel/views.py:222
 msgid "Import categories & requirements"
 msgstr "Kategorien & Anforderungen kopieren"
 
-#: AKModel/views.py:213
+#: AKModel/views.py:223
 #, fuzzy
 #| msgid "Active State"
 msgid "Activate?"
 msgstr "Aktivieren?"
 
-#: AKModel/views.py:271
+#: AKModel/views.py:282
 #, python-format
 msgid "Copied '%(obj)s'"
 msgstr "'%(obj)s' kopiert"
 
-#: AKModel/views.py:273
+#: AKModel/views.py:285
 #, python-format
 msgid "Could not copy '%(obj)s' (%(error)s)"
 msgstr "'%(obj)s' konnte nicht kopiert werden (%(error)s)"
 
-#: AKModel/views.py:300
+#: AKModel/views.py:316
 msgid "Symbols"
 msgstr "Symbole"
 
-#: AKModel/views.py:301
+#: AKModel/views.py:317
 msgid "Who?"
 msgstr "Wer?"
 
-#: AKModel/views.py:302
+#: AKModel/views.py:318
 msgid "Duration(s)"
 msgstr "Dauer(n)"
 
-#: AKModel/views.py:303
+#: AKModel/views.py:319
 msgid "Reso intention?"
 msgstr "Resolutionsabsicht?"
 
-#: AKModel/views.py:304
+#: AKModel/views.py:320
 msgid "Category (for Wishes)"
 msgstr "Kategorie (für Wünsche)"
 
-#: AKModel/views.py:311
-msgid "Wishes"
-msgstr "Wünsche"
-
 #~ msgid "Confirm"
 #~ msgstr "Bestätigen"
 

AKModel/migrations/0024_event_dependencies.py

@@ -7,12 +7,12 @@ from AKModel.models import AKCategory, Event, AKTrack
 
 
 def migrate_data_forward(apps, schema_editor):
-    for instance in AKCategory.objects.all():
+    for instance in AKCategory.objects.only('event').all():
         if not instance.event:
             instance.event = Event.objects.filter(active=True).last()
         instance.save()
 
-    for instance in AKTrack.objects.all():
+    for instance in AKTrack.objects.only('event').all():
         if not instance.event:
             instance.event = Event.objects.filter(active=True).last()
         instance.save()

AKModel/migrations/0046_present_by_default.py

+# Generated by Django 3.1.8 on 2021-05-15 14:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('AKModel', '0045_event_tz_pytz_update'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='akcategory',
+            name='present_by_default',
+            field=models.BooleanField(blank=True, default=True, help_text='Present AKs of this category by default if AK owner did not specify whether this AK should be presented?', verbose_name='Present by default'),
+        ),
+    ]

AKModel/models.py

@@ -159,6 +159,8 @@ class AKCategory(models.Model):
     color = models.CharField(max_length=7, blank=True, verbose_name=_('Color'), help_text=_('Color for displaying'))
     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?"))
 
     event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'),
                               help_text=_('Associated event'))

AKModel/views.py

@@ -326,7 +326,7 @@ def export_slides(request, event_slug):
         return [(ak, next_aks) for ak, next_aks in zip_longest(ak_list, next_aks_list, fillvalue=list())]
 
     categories_with_aks, ak_wishes = event.get_categories_with_aks(wishes_seperately=True, filter=lambda
-        ak: not RESULT_PRESENTATION_MODE or ak.present)
+        ak: not RESULT_PRESENTATION_MODE or (ak.present or (ak.present is None and ak.category.present_by_default)))
 
     context = {
         'title': event.name,

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-04-29 22:48+0000\n"
+"POT-Creation-Date: 2021-05-15 14:34+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"
@@ -112,7 +112,7 @@ msgid "Add confidential message to organizers"
 msgstr "Sende eine private Nachricht an das Organisationsteam"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:62
-#: AKSubmission/templates/AKSubmission/ak_detail.html:210
+#: AKSubmission/templates/AKSubmission/ak_detail.html:213
 #: AKSubmission/templates/AKSubmission/ak_edit.html:16
 #: AKSubmission/templates/AKSubmission/ak_table.html:53
 msgid "Edit"
@@ -152,7 +152,7 @@ msgstr ""
 "                    "
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:87
-#: AKSubmission/templates/AKSubmission/ak_detail.html:218
+#: AKSubmission/templates/AKSubmission/ak_detail.html:221
 msgid "Go to virtual room"
 msgstr "Zum virtuellen Raum"
 
@@ -172,71 +172,75 @@ msgstr "Kategorie"
 msgid "Track"
 msgstr "Track"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:114
+#: AKSubmission/templates/AKSubmission/ak_detail.html:115
 #, fuzzy
 #| msgid "Present results of this AK"
 msgid "Present this AK"
 msgstr "Die Ergebnisse dieses AKs vorstellen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:118
+#: AKSubmission/templates/AKSubmission/ak_detail.html:120
+msgid "(Category Default)"
+msgstr "(Kategorievoreinstellung)"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:126
 #: AKSubmission/templates/AKSubmission/ak_table.html:12
 msgid "Tags"
 msgstr "Tags"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:124
+#: AKSubmission/templates/AKSubmission/ak_detail.html:132
 msgid "Reso intention?"
 msgstr "Resoabsicht?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:131
+#: AKSubmission/templates/AKSubmission/ak_detail.html:139
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:144
+#: AKSubmission/templates/AKSubmission/ak_detail.html:152
 msgid "Conflicting AKs"
 msgstr "AK-Konflikte"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:152
+#: AKSubmission/templates/AKSubmission/ak_detail.html:160
 msgid "Prerequisite AKs"
 msgstr "Vorausgesetzte AKs"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:160
+#: AKSubmission/templates/AKSubmission/ak_detail.html:168
 msgid "Notes"
 msgstr "Notizen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:178
+#: AKSubmission/templates/AKSubmission/ak_detail.html:181
 msgid "When?"
 msgstr "Wann?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:180
+#: AKSubmission/templates/AKSubmission/ak_detail.html:183
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:35
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:182
+#: AKSubmission/templates/AKSubmission/ak_detail.html:185
 msgid "Room"
 msgstr "Raum"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:213
+#: AKSubmission/templates/AKSubmission/ak_detail.html:216
 msgid "Delete"
 msgstr "Löschen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:224
+#: AKSubmission/templates/AKSubmission/ak_detail.html:227
 msgid "Schedule"
 msgstr "Schedule"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:236
+#: AKSubmission/templates/AKSubmission/ak_detail.html:239
 msgid "Add another slot"
 msgstr "Einen neuen AK-Slot hinzufügen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:240
+#: AKSubmission/templates/AKSubmission/ak_detail.html:249
 msgid "Possible Times"
 msgstr "Mögliche Zeiten"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:244
+#: AKSubmission/templates/AKSubmission/ak_detail.html:253
 msgid "Start"
 msgstr "Start"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:245
+#: AKSubmission/templates/AKSubmission/ak_detail.html:254
 msgid "End"
 msgstr "Ende"
 

AKSubmission/templates/AKSubmission/ak_detail.html

@@ -110,10 +110,18 @@
                 <td>{{ ak.track }}</td>
             </tr>
         {% endif %}
+        {% if not ak.wish %}
             <tr>
                 <td>{% trans "Present this AK" %}</td>
-            <td>{{ ak.present | bool_symbol }}</td>
+                <td>
+                    {% if ak.present != None %}
+                        {{ ak.present | bool_symbol }}
+                    {% else %}
+                        {{ ak.category.present_by_default | bool_symbol }} <span class="text-muted">{% trans "(Category Default)" %}</span>
+                    {% endif %}
+                </td>
             </tr>
+        {% endif %}
         <tr>
             <td>{% trans "Tags" %}</td>
             <td>