Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 520-akowner
  • 520-fix-event-wizard-datepicker
  • 520-fix-scheduling
  • 520-improve-scheduling
  • 520-improve-scheduling-2
  • 520-improve-submission
  • 520-improve-trackmanager
  • 520-improve-wall
  • 520-message-resolved
  • 520-status
  • 520-upgrades
  • add_express_interest_to_ak_overview
  • admin-production-color
  • bugfixes
  • csp
  • featire-ical-export
  • feature-ak-requirement-lists
  • feature-akslide-export-better-filename
  • feature-akslides
  • feature-better-admin
  • feature-better-cv-list
  • feature-colors
  • feature-constraint-checking
  • feature-constraint-checking-wip
  • feature-dashboard-history-button
  • feature-event-status
  • feature-event-wizard
  • feature-export-flag
  • feature-improve-admin
  • feature-improve-filters
  • feature-improved-user-creation-workflow
  • feature-interest-view
  • feature-mails
  • feature-modular-status
  • feature-plan-autoreload
  • feature-present-default
  • feature-register-link
  • feature-remaining-constraint-validation
  • feature-room-import
  • feature-scheduler-improve
  • feature-scheduling-2.0
  • feature-special-attention
  • feature-time-input
  • feature-tracker
  • feature-wiki-wishes
  • feature-wish-slots
  • feature-wizard-buttons
  • features-availabilities
  • fix-ak-times-above-folg
  • fix-api
  • fix-constraint-violation-string
  • fix-cv-checking
  • fix-default-slot-length
  • fix-default-slot-localization
  • fix-doc-minor
  • fix-duration-display
  • fix-event-tz-pytz-update
  • fix-history-interest
  • fix-interest-view
  • fix-js
  • fix-pipeline
  • fix-plan-timezone-now
  • fix-room-add
  • fix-scheduling-drag
  • fix-slot-defaultlength
  • fix-timezone
  • fix-translation-scheduling
  • fix-virtual-room-admin
  • fix-wizard-csp
  • font-locally
  • improve-admin
  • improve-online
  • improve-slides
  • improve-submission-coupling
  • interest_restriction
  • main
  • master
  • meta-debug-toolbar
  • meta-export
  • meta-makemessages
  • meta-performance
  • meta-tests
  • meta-tests-gitlab-test
  • meta-upgrades
  • mollux-master-patch-02906
  • port-availabilites-fullcalendar
  • qs
  • remove-tags
  • renovate/configure
  • renovate/django-4.x
  • renovate/django-5.x
  • renovate/django-bootstrap-datepicker-plus-5.x
  • renovate/django-bootstrap5-23.x
  • renovate/django-bootstrap5-24.x
  • renovate/django-compressor-4.x
  • renovate/django-debug-toolbar-4.x
  • renovate/django-registration-redux-2.x
  • renovate/django-simple-history-3.x
  • renovate/django-split-settings-1.x
  • renovate/django-timezone-field-5.x
100 results

Target

Select target project
  • konstantin/akplanning
  • matedealer/akplanning
  • kif/akplanning
  • mirco/akplanning
  • lordofthevoid/akplanning
  • voidptr/akplanning
  • xayomer/akplanning-fork
  • mollux/akplanning
  • neumantm/akplanning
  • mmarx/akplanning
  • nerf/akplanning
  • felix_bonn/akplanning
  • sebastian.uschmann/akplanning
13 results
Select Git revision
  • komasolver
  • main
  • renovate/django_csp-4.x
3 results
Show changes
Commits on Source (7)
Hide whitespace changes
Inline Side-by-side
Showing
with 535 additions and 340 deletions
AKModel/forms.py
View file @ b6d4bdde
...@@ -68,3 +68,7 @@ class NewEventWizardActivateForm(forms.ModelForm): ...@@ -68,3 +68,7 @@ class NewEventWizardActivateForm(forms.ModelForm):
class Meta: class Meta:
fields = ["active"] fields = ["active"]
model = Event model = Event
class AdminIntermediateForm(forms.Form):
pass
AKModel/locale/de_DE/LC_MESSAGES/django.po
View file @ b6d4bdde
...@@ -2,7 +2,7 @@ msgid "" ...@@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-17 22:41+0200\n" "POT-Creation-Date: 2022-09-27 14:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -65,17 +65,17 @@ msgstr "Die eingegebene Verfügbarkeit enthält ein ungültiges Datum." ...@@ -65,17 +65,17 @@ msgstr "Die eingegebene Verfügbarkeit enthält ein ungültiges Datum."
msgid "Please fill in your availabilities!" msgid "Please fill in your availabilities!"
msgstr "Bitte Verfügbarkeiten eintragen!" msgstr "Bitte Verfügbarkeiten eintragen!"
#: .\AKModel\availability\models.py:38 .\AKModel\models.py:53 #: .\AKModel\availability\models.py:38 .\AKModel\models.py:54
#: .\AKModel\models.py:117 .\AKModel\models.py:172 .\AKModel\models.py:191 #: .\AKModel\models.py:120 .\AKModel\models.py:175 .\AKModel\models.py:194
#: .\AKModel\models.py:223 .\AKModel\models.py:277 .\AKModel\models.py:343 #: .\AKModel\models.py:226 .\AKModel\models.py:280 .\AKModel\models.py:354
#: .\AKModel\models.py:376 .\AKModel\models.py:447 .\AKModel\models.py:488 #: .\AKModel\models.py:387 .\AKModel\models.py:458 .\AKModel\models.py:499
msgid "Event" msgid "Event"
msgstr "Event" msgstr "Event"
#: .\AKModel\availability\models.py:39 .\AKModel\models.py:118 #: .\AKModel\availability\models.py:39 .\AKModel\models.py:121
#: .\AKModel\models.py:173 .\AKModel\models.py:192 .\AKModel\models.py:224 #: .\AKModel\models.py:176 .\AKModel\models.py:195 .\AKModel\models.py:227
#: .\AKModel\models.py:278 .\AKModel\models.py:344 .\AKModel\models.py:377 #: .\AKModel\models.py:281 .\AKModel\models.py:355 .\AKModel\models.py:388
#: .\AKModel\models.py:448 .\AKModel\models.py:489 #: .\AKModel\models.py:459 .\AKModel\models.py:500
msgid "Associated event" msgid "Associated event"
msgstr "Zugehöriges Event" msgstr "Zugehöriges Event"
...@@ -87,8 +87,8 @@ msgstr "Person" ...@@ -87,8 +87,8 @@ msgstr "Person"
msgid "Person whose availability this is" msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird" msgstr "Person deren Verfügbarkeit hier abgebildet wird"
#: .\AKModel\availability\models.py:56 .\AKModel\models.py:347 #: .\AKModel\availability\models.py:56 .\AKModel\models.py:358
#: .\AKModel\models.py:366 .\AKModel\models.py:497 #: .\AKModel\models.py:377 .\AKModel\models.py:508
msgid "Room" msgid "Room"
msgstr "Raum" msgstr "Raum"
...@@ -96,8 +96,8 @@ msgstr "Raum" ...@@ -96,8 +96,8 @@ msgstr "Raum"
msgid "Room whose availability this is" msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird" msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
#: .\AKModel\availability\models.py:65 .\AKModel\models.py:283 #: .\AKModel\availability\models.py:65 .\AKModel\models.py:286
#: .\AKModel\models.py:365 .\AKModel\models.py:442 #: .\AKModel\models.py:376 .\AKModel\models.py:453
msgid "AK" msgid "AK"
msgstr "AK" msgstr "AK"
...@@ -105,8 +105,8 @@ msgstr "AK" ...@@ -105,8 +105,8 @@ msgstr "AK"
msgid "AK whose availability this is" msgid "AK whose availability this is"
msgstr "Verfügbarkeiten" msgstr "Verfügbarkeiten"
#: .\AKModel\availability\models.py:74 .\AKModel\models.py:176 #: .\AKModel\availability\models.py:74 .\AKModel\models.py:179
#: .\AKModel\models.py:503 #: .\AKModel\models.py:514
msgid "AK Category" msgid "AK Category"
msgstr "AK-Kategorie" msgstr "AK-Kategorie"
...@@ -135,131 +135,131 @@ msgstr "AK-Kategorien kopieren" ...@@ -135,131 +135,131 @@ msgstr "AK-Kategorien kopieren"
msgid "Copy ak requirements" msgid "Copy ak requirements"
msgstr "AK-Anforderungen kopieren" msgstr "AK-Anforderungen kopieren"
#: .\AKModel\models.py:17 .\AKModel\models.py:164 .\AKModel\models.py:188 #: .\AKModel\models.py:18 .\AKModel\models.py:167 .\AKModel\models.py:191
#: .\AKModel\models.py:207 .\AKModel\models.py:221 .\AKModel\models.py:239 #: .\AKModel\models.py:210 .\AKModel\models.py:224 .\AKModel\models.py:242
#: .\AKModel\models.py:335 #: .\AKModel\models.py:346
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
#: .\AKModel\models.py:18 #: .\AKModel\models.py:19
msgid "Name or iteration of the event" msgid "Name or iteration of the event"
msgstr "Name oder Iteration des Events" msgstr "Name oder Iteration des Events"
#: .\AKModel\models.py:19 #: .\AKModel\models.py:20
msgid "Short Form" msgid "Short Form"
msgstr "Kurzer Name" msgstr "Kurzer Name"
#: .\AKModel\models.py:20 #: .\AKModel\models.py:21
msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs." msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs."
msgstr "" msgstr ""
"Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur " "Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur "
"Nutzung in URLs" "Nutzung in URLs"
#: .\AKModel\models.py:22 #: .\AKModel\models.py:23
msgid "Place" msgid "Place"
msgstr "Ort" msgstr "Ort"
#: .\AKModel\models.py:23 #: .\AKModel\models.py:24
msgid "City etc. the event takes place in" msgid "City etc. the event takes place in"
msgstr "Stadt o.ä. in der das Event stattfindet" msgstr "Stadt o.ä. in der das Event stattfindet"
#: .\AKModel\models.py:25 #: .\AKModel\models.py:26
msgid "Time Zone" msgid "Time Zone"
msgstr "Zeitzone" msgstr "Zeitzone"
#: .\AKModel\models.py:25 #: .\AKModel\models.py:26
msgid "Time Zone where this event takes place in" msgid "Time Zone where this event takes place in"
msgstr "Zeitzone in der das Event stattfindet" msgstr "Zeitzone in der das Event stattfindet"
#: .\AKModel\models.py:26 .\AKModel\views.py:220 #: .\AKModel\models.py:27 .\AKModel\views.py:242
msgid "Start" msgid "Start"
msgstr "Start" msgstr "Start"
#: .\AKModel\models.py:26 #: .\AKModel\models.py:27
msgid "Time the event begins" msgid "Time the event begins"
msgstr "Zeit zu der das Event beginnt" msgstr "Zeit zu der das Event beginnt"
#: .\AKModel\models.py:27 #: .\AKModel\models.py:28
msgid "End" msgid "End"
msgstr "Ende" msgstr "Ende"
#: .\AKModel\models.py:27 #: .\AKModel\models.py:28
msgid "Time the event ends" msgid "Time the event ends"
msgstr "Zeit zu der das Event endet" msgstr "Zeit zu der das Event endet"
#: .\AKModel\models.py:28 #: .\AKModel\models.py:29
msgid "Resolution Deadline" msgid "Resolution Deadline"
msgstr "Resolutionsdeadline" msgstr "Resolutionsdeadline"
#: .\AKModel\models.py:29 #: .\AKModel\models.py:30
msgid "When should AKs with intention to submit a resolution be done?" msgid "When should AKs with intention to submit a resolution be done?"
msgstr "Wann sollen AKs mit Resolutionsabsicht stattgefunden haben?" msgstr "Wann sollen AKs mit Resolutionsabsicht stattgefunden haben?"
#: .\AKModel\models.py:31 #: .\AKModel\models.py:32
msgid "Interest Window Start" msgid "Interest Window Start"
msgstr "Beginn Interessensbekundung" msgstr "Beginn Interessensbekundung"
#: .\AKModel\models.py:32 #: .\AKModel\models.py:33
msgid "Opening time for expression of interest." msgid "Opening time for expression of interest."
msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs." msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs."
#: .\AKModel\models.py:33 #: .\AKModel\models.py:34
msgid "Interest Window End" msgid "Interest Window End"
msgstr "Ende Interessensbekundung" msgstr "Ende Interessensbekundung"
#: .\AKModel\models.py:34 #: .\AKModel\models.py:35
msgid "Closing time for expression of interest." msgid "Closing time for expression of interest."
msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs." msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs."
#: .\AKModel\models.py:36 #: .\AKModel\models.py:37
msgid "Public event" msgid "Public event"
msgstr "Öffentliches Event" msgstr "Öffentliches Event"
#: .\AKModel\models.py:37 #: .\AKModel\models.py:38
msgid "Show this event on overview page." msgid "Show this event on overview page."
msgstr "Zeige dieses Event auf der Übersichtseite an" msgstr "Zeige dieses Event auf der Übersichtseite an"
#: .\AKModel\models.py:39 #: .\AKModel\models.py:40
msgid "Active State" msgid "Active State"
msgstr "Aktiver Status" msgstr "Aktiver Status"
#: .\AKModel\models.py:39 #: .\AKModel\models.py:40
msgid "Marks currently active events" msgid "Marks currently active events"
msgstr "Markiert aktuell aktive Events" msgstr "Markiert aktuell aktive Events"
#: .\AKModel\models.py:40 #: .\AKModel\models.py:41
msgid "Plan Hidden" msgid "Plan Hidden"
msgstr "Plan verborgen" msgstr "Plan verborgen"
#: .\AKModel\models.py:40 #: .\AKModel\models.py:41
msgid "Hides plan for non-staff users" msgid "Hides plan for non-staff users"
msgstr "Verbirgt den Plan für Nutzer*innen ohne erweiterte Rechte" msgstr "Verbirgt den Plan für Nutzer*innen ohne erweiterte Rechte"
#: .\AKModel\models.py:43 #: .\AKModel\models.py:44
msgid "Base URL" msgid "Base URL"
msgstr "URL-Prefix" msgstr "URL-Prefix"
#: .\AKModel\models.py:43 #: .\AKModel\models.py:44
msgid "Prefix for wiki link construction" msgid "Prefix for wiki link construction"
msgstr "Prefix für die automatische Generierung von Wiki-Links" msgstr "Prefix für die automatische Generierung von Wiki-Links"
#: .\AKModel\models.py:44 #: .\AKModel\models.py:45
msgid "Wiki Export Template Name" msgid "Wiki Export Template Name"
msgstr "Wiki-Export Templatename" msgstr "Wiki-Export Templatename"
#: .\AKModel\models.py:45 #: .\AKModel\models.py:46
msgid "Default Slot Length" msgid "Default Slot Length"
msgstr "Standardslotlänge" msgstr "Standardslotlänge"
#: .\AKModel\models.py:46 #: .\AKModel\models.py:47
msgid "Default length in hours that is assumed for AKs in this event." msgid "Default length in hours that is assumed for AKs in this event."
msgstr "Standardlänge von Slots (in Stunden) für dieses Event" msgstr "Standardlänge von Slots (in Stunden) für dieses Event"
#: .\AKModel\models.py:48 #: .\AKModel\models.py:49
msgid "Contact email address" msgid "Contact email address"
msgstr "E-Mail Kontaktadresse" msgstr "E-Mail Kontaktadresse"
#: .\AKModel\models.py:50 #: .\AKModel\models.py:51
msgid "" msgid ""
"An email address that is displayed on every page and can be used for all " "An email address that is displayed on every page and can be used for all "
"kinds of questions" "kinds of questions"
...@@ -267,75 +267,75 @@ msgstr "" ...@@ -267,75 +267,75 @@ msgstr ""
"Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von " "Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von "
"Fragen genutzt werden kann" "Fragen genutzt werden kann"
#: .\AKModel\models.py:54 #: .\AKModel\models.py:55
msgid "Events" msgid "Events"
msgstr "Events" msgstr "Events"
#: .\AKModel\models.py:112 #: .\AKModel\models.py:115
msgid "Nickname" msgid "Nickname"
msgstr "Spitzname" msgstr "Spitzname"
#: .\AKModel\models.py:112 #: .\AKModel\models.py:115
msgid "Name to identify an AK owner by" msgid "Name to identify an AK owner by"
msgstr "Name, durch den eine AK-Leitung identifiziert wird" msgstr "Name, durch den eine AK-Leitung identifiziert wird"
#: .\AKModel\models.py:113 #: .\AKModel\models.py:116
msgid "Slug" msgid "Slug"
msgstr "Slug" msgstr "Slug"
#: .\AKModel\models.py:113 #: .\AKModel\models.py:116
msgid "Slug for URL generation" msgid "Slug for URL generation"
msgstr "Slug für URL-Generierung" msgstr "Slug für URL-Generierung"
#: .\AKModel\models.py:114 #: .\AKModel\models.py:117
msgid "Institution" msgid "Institution"
msgstr "Instutution" msgstr "Instutution"
#: .\AKModel\models.py:114 #: .\AKModel\models.py:117
msgid "Uni etc." msgid "Uni etc."
msgstr "Universität o.ä." msgstr "Universität o.ä."
#: .\AKModel\models.py:115 .\AKModel\models.py:248 #: .\AKModel\models.py:118 .\AKModel\models.py:251
msgid "Web Link" msgid "Web Link"
msgstr "Internet Link" msgstr "Internet Link"
#: .\AKModel\models.py:115 #: .\AKModel\models.py:118
msgid "Link to Homepage" msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite" msgstr "Link zu Homepage oder Webseite"
#: .\AKModel\models.py:121 .\AKModel\models.py:496 #: .\AKModel\models.py:124 .\AKModel\models.py:507
msgid "AK Owner" msgid "AK Owner"
msgstr "AK-Leitung" msgstr "AK-Leitung"
#: .\AKModel\models.py:122 #: .\AKModel\models.py:125
msgid "AK Owners" msgid "AK Owners"
msgstr "AK-Leitungen" msgstr "AK-Leitungen"
#: .\AKModel\models.py:164 #: .\AKModel\models.py:167
msgid "Name of the AK Category" msgid "Name of the AK Category"
msgstr "Name der AK-Kategorie" msgstr "Name der AK-Kategorie"
#: .\AKModel\models.py:165 .\AKModel\models.py:189 #: .\AKModel\models.py:168 .\AKModel\models.py:192
msgid "Color" msgid "Color"
msgstr "Farbe" msgstr "Farbe"
#: .\AKModel\models.py:165 .\AKModel\models.py:189 #: .\AKModel\models.py:168 .\AKModel\models.py:192
msgid "Color for displaying" msgid "Color for displaying"
msgstr "Farbe für die Anzeige" msgstr "Farbe für die Anzeige"
#: .\AKModel\models.py:166 .\AKModel\models.py:242 #: .\AKModel\models.py:169 .\AKModel\models.py:245
msgid "Description" msgid "Description"
msgstr "Beschreibung" msgstr "Beschreibung"
#: .\AKModel\models.py:167 #: .\AKModel\models.py:170
msgid "Short description of this AK Category" msgid "Short description of this AK Category"
msgstr "Beschreibung der AK-Kategorie" msgstr "Beschreibung der AK-Kategorie"
#: .\AKModel\models.py:168 #: .\AKModel\models.py:171
msgid "Present by default" msgid "Present by default"
msgstr "Defaultmäßig präsentieren" msgstr "Defaultmäßig präsentieren"
#: .\AKModel\models.py:170 #: .\AKModel\models.py:173
msgid "" msgid ""
"Present AKs of this category by default if AK owner did not specify whether " "Present AKs of this category by default if AK owner did not specify whether "
"this AK should be presented?" "this AK should be presented?"
...@@ -343,152 +343,152 @@ msgstr "" ...@@ -343,152 +343,152 @@ msgstr ""
"AKs dieser Kategorie standardmäßig vorstellen, wenn die Leitungen das für " "AKs dieser Kategorie standardmäßig vorstellen, wenn die Leitungen das für "
"ihren AK nicht explizit spezifiziert haben?" "ihren AK nicht explizit spezifiziert haben?"
#: .\AKModel\models.py:177 #: .\AKModel\models.py:180
msgid "AK Categories" msgid "AK Categories"
msgstr "AK-Kategorien" msgstr "AK-Kategorien"
#: .\AKModel\models.py:188 #: .\AKModel\models.py:191
msgid "Name of the AK Track" msgid "Name of the AK Track"
msgstr "Name des AK-Tracks" msgstr "Name des AK-Tracks"
#: .\AKModel\models.py:195 #: .\AKModel\models.py:198
msgid "AK Track" msgid "AK Track"
msgstr "AK-Track" msgstr "AK-Track"
#: .\AKModel\models.py:196 #: .\AKModel\models.py:199
msgid "AK Tracks" msgid "AK Tracks"
msgstr "AK-Tracks" msgstr "AK-Tracks"
#: .\AKModel\models.py:207 #: .\AKModel\models.py:210
msgid "Name of the AK Tag" msgid "Name of the AK Tag"
msgstr "Name das AK-Tags" msgstr "Name das AK-Tags"
#: .\AKModel\models.py:210 #: .\AKModel\models.py:213
msgid "AK Tag" msgid "AK Tag"
msgstr "AK-Tag" msgstr "AK-Tag"
#: .\AKModel\models.py:211 #: .\AKModel\models.py:214
msgid "AK Tags" msgid "AK Tags"
msgstr "AK-Tags" msgstr "AK-Tags"
#: .\AKModel\models.py:221 #: .\AKModel\models.py:224
msgid "Name of the Requirement" msgid "Name of the Requirement"
msgstr "Name der Anforderung" msgstr "Name der Anforderung"
#: .\AKModel\models.py:227 .\AKModel\models.py:500 #: .\AKModel\models.py:230 .\AKModel\models.py:511
msgid "AK Requirement" msgid "AK Requirement"
msgstr "AK-Anforderung" msgstr "AK-Anforderung"
#: .\AKModel\models.py:228 #: .\AKModel\models.py:231
msgid "AK Requirements" msgid "AK Requirements"
msgstr "AK-Anforderungen" msgstr "AK-Anforderungen"
#: .\AKModel\models.py:239 #: .\AKModel\models.py:242
msgid "Name of the AK" msgid "Name of the AK"
msgstr "Name des AKs" msgstr "Name des AKs"
#: .\AKModel\models.py:240 #: .\AKModel\models.py:243
msgid "Short Name" msgid "Short Name"
msgstr "Kurzer Name" msgstr "Kurzer Name"
#: .\AKModel\models.py:241 #: .\AKModel\models.py:244
msgid "Name displayed in the schedule" msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK-Plan" msgstr "Name zur Anzeige im AK-Plan"
#: .\AKModel\models.py:242 #: .\AKModel\models.py:245
msgid "Description of the AK" msgid "Description of the AK"
msgstr "Beschreibung des AKs" msgstr "Beschreibung des AKs"
#: .\AKModel\models.py:244 #: .\AKModel\models.py:247
msgid "Owners" msgid "Owners"
msgstr "Leitungen" msgstr "Leitungen"
#: .\AKModel\models.py:245 #: .\AKModel\models.py:248
msgid "Those organizing the AK" msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten" msgstr "Menschen, die den AK organisieren und halten"
#: .\AKModel\models.py:248 #: .\AKModel\models.py:251
msgid "Link to wiki page" msgid "Link to wiki page"
msgstr "Link zur Wiki Seite" msgstr "Link zur Wiki Seite"
#: .\AKModel\models.py:249 #: .\AKModel\models.py:252
msgid "Protocol Link" msgid "Protocol Link"
msgstr "Protokolllink" msgstr "Protokolllink"
#: .\AKModel\models.py:249 #: .\AKModel\models.py:252
msgid "Link to protocol" msgid "Link to protocol"
msgstr "Link zum Protokoll" msgstr "Link zum Protokoll"
#: .\AKModel\models.py:251 #: .\AKModel\models.py:254
msgid "Category" msgid "Category"
msgstr "Kategorie" msgstr "Kategorie"
#: .\AKModel\models.py:252 #: .\AKModel\models.py:255
msgid "Category of the AK" msgid "Category of the AK"
msgstr "Kategorie des AKs" msgstr "Kategorie des AKs"
#: .\AKModel\models.py:253 #: .\AKModel\models.py:256
msgid "Tags" msgid "Tags"
msgstr "Tags" msgstr "Tags"
#: .\AKModel\models.py:253 #: .\AKModel\models.py:256
msgid "Tags provided by owners" msgid "Tags provided by owners"
msgstr "Tags, die durch die AK-Leitung vergeben wurden" msgstr "Tags, die durch die AK-Leitung vergeben wurden"
#: .\AKModel\models.py:254 #: .\AKModel\models.py:257
msgid "Track" msgid "Track"
msgstr "Track" msgstr "Track"
#: .\AKModel\models.py:255 #: .\AKModel\models.py:258
msgid "Track the AK belongs to" msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört" msgstr "Track zu dem der AK gehört"
#: .\AKModel\models.py:257 #: .\AKModel\models.py:260
msgid "Resolution Intention" msgid "Resolution Intention"
msgstr "Resolutionsabsicht" msgstr "Resolutionsabsicht"
#: .\AKModel\models.py:258 #: .\AKModel\models.py:261
msgid "Intends to submit a resolution" msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen" msgstr "Beabsichtigt eine Resolution einzureichen"
#: .\AKModel\models.py:259 #: .\AKModel\models.py:262
msgid "Present this AK" msgid "Present this AK"
msgstr "AK präsentieren" msgstr "AK präsentieren"
#: .\AKModel\models.py:260 #: .\AKModel\models.py:263
msgid "Present results of this AK" msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen" msgstr "Die Ergebnisse dieses AKs vorstellen"
#: .\AKModel\models.py:262 .\AKModel\templates\admin\AKModel\status.html:97 #: .\AKModel\models.py:265 .\AKModel\templates\admin\AKModel\status.html:97
msgid "Requirements" msgid "Requirements"
msgstr "Anforderungen" msgstr "Anforderungen"
#: .\AKModel\models.py:263 #: .\AKModel\models.py:266
msgid "AK's Requirements" msgid "AK's Requirements"
msgstr "Anforderungen des AKs" msgstr "Anforderungen des AKs"
#: .\AKModel\models.py:265 #: .\AKModel\models.py:268
msgid "Conflicting AKs" msgid "Conflicting AKs"
msgstr "AK-Konflikte" msgstr "AK-Konflikte"
#: .\AKModel\models.py:266 #: .\AKModel\models.py:269
msgid "AKs that conflict and thus must not take place at the same time" msgid "AKs that conflict and thus must not take place at the same time"
msgstr "" msgstr ""
"AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen" "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
#: .\AKModel\models.py:267 #: .\AKModel\models.py:270
msgid "Prerequisite AKs" msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs" msgstr "Vorausgesetzte AKs"
#: .\AKModel\models.py:268 #: .\AKModel\models.py:271
msgid "AKs that should precede this AK in the schedule" msgid "AKs that should precede this AK in the schedule"
msgstr "AKs die im AK-Plan vor diesem AK stattfinden müssen" msgstr "AKs die im AK-Plan vor diesem AK stattfinden müssen"
#: .\AKModel\models.py:270 #: .\AKModel\models.py:273
msgid "Organizational Notes" msgid "Organizational Notes"
msgstr "Notizen zur Organisation" msgstr "Notizen zur Organisation"
#: .\AKModel\models.py:271 #: .\AKModel\models.py:274
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Notes to organizers. These are public. For private notes, please send an " #| "Notes to organizers. These are public. For private notes, please send an "
...@@ -502,258 +502,258 @@ msgstr "" ...@@ -502,258 +502,258 @@ msgstr ""
"Anmerkungen bitte den Button für Direktnachrichten verwenden (nach dem " "Anmerkungen bitte den Button für Direktnachrichten verwenden (nach dem "
"Anlegen/Bearbeiten)." "Anlegen/Bearbeiten)."
#: .\AKModel\models.py:273 #: .\AKModel\models.py:276
msgid "Interest" msgid "Interest"
msgstr "Interesse" msgstr "Interesse"
#: .\AKModel\models.py:273 #: .\AKModel\models.py:276
msgid "Expected number of people" msgid "Expected number of people"
msgstr "Erwartete Personenzahl" msgstr "Erwartete Personenzahl"
#: .\AKModel\models.py:274 #: .\AKModel\models.py:277
msgid "Interest Counter" msgid "Interest Counter"
msgstr "Interessenszähler" msgstr "Interessenszähler"
#: .\AKModel\models.py:275 #: .\AKModel\models.py:278
msgid "People who have indicated interest online" msgid "People who have indicated interest online"
msgstr "Anzahl Personen, die online Interesse bekundet haben" msgstr "Anzahl Personen, die online Interesse bekundet haben"
#: .\AKModel\models.py:284 .\AKModel\models.py:491 #: .\AKModel\models.py:287 .\AKModel\models.py:502
#: .\AKModel\templates\admin\AKModel\status.html:49 #: .\AKModel\templates\admin\AKModel\status.html:49
#: .\AKModel\templates\admin\AKModel\status.html:56 .\AKModel\views.py:337 #: .\AKModel\templates\admin\AKModel\status.html:56 .\AKModel\views.py:359
msgid "AKs" msgid "AKs"
msgstr "AKs" msgstr "AKs"
#: .\AKModel\models.py:335 #: .\AKModel\models.py:346
msgid "Name or number of the room" msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums" msgstr "Name oder Nummer des Raums"
#: .\AKModel\models.py:336 #: .\AKModel\models.py:347
msgid "Location" msgid "Location"
msgstr "Ort" msgstr "Ort"
#: .\AKModel\models.py:337 #: .\AKModel\models.py:348
msgid "Name or number of the location" msgid "Name or number of the location"
msgstr "Name oder Nummer des Ortes" msgstr "Name oder Nummer des Ortes"
#: .\AKModel\models.py:338 #: .\AKModel\models.py:349
msgid "Capacity" msgid "Capacity"
msgstr "Kapazität" msgstr "Kapazität"
#: .\AKModel\models.py:339 #: .\AKModel\models.py:350
msgid "Maximum number of people (-1 for unlimited)." msgid "Maximum number of people (-1 for unlimited)."
msgstr "Maximale Personenzahl (-1 wenn unbeschränkt)." msgstr "Maximale Personenzahl (-1 wenn unbeschränkt)."
#: .\AKModel\models.py:340 #: .\AKModel\models.py:351
msgid "Properties" msgid "Properties"
msgstr "Eigenschaften" msgstr "Eigenschaften"
#: .\AKModel\models.py:341 #: .\AKModel\models.py:352
msgid "AK requirements fulfilled by the room" msgid "AK requirements fulfilled by the room"
msgstr "AK-Anforderungen, die dieser Raum erfüllt" msgstr "AK-Anforderungen, die dieser Raum erfüllt"
#: .\AKModel\models.py:348 .\AKModel\templates\admin\AKModel\status.html:33 #: .\AKModel\models.py:359 .\AKModel\templates\admin\AKModel\status.html:33
msgid "Rooms" msgid "Rooms"
msgstr "Räume" msgstr "Räume"
#: .\AKModel\models.py:365 #: .\AKModel\models.py:376
msgid "AK being mapped" msgid "AK being mapped"
msgstr "AK, der zugeordnet wird" msgstr "AK, der zugeordnet wird"
#: .\AKModel\models.py:367 #: .\AKModel\models.py:378
msgid "Room the AK will take place in" msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet" msgstr "Raum in dem der AK stattfindet"
#: .\AKModel\models.py:368 #: .\AKModel\models.py:379
msgid "Slot Begin" msgid "Slot Begin"
msgstr "Beginn des Slots" msgstr "Beginn des Slots"
#: .\AKModel\models.py:368 #: .\AKModel\models.py:379
msgid "Time and date the slot begins" msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt" msgstr "Zeit und Datum zu der der AK beginnt"
#: .\AKModel\models.py:370 #: .\AKModel\models.py:381
msgid "Duration" msgid "Duration"
msgstr "Dauer" msgstr "Dauer"
#: .\AKModel\models.py:371 #: .\AKModel\models.py:382
msgid "Length in hours" msgid "Length in hours"
msgstr "Länge in Stunden" msgstr "Länge in Stunden"
#: .\AKModel\models.py:373 #: .\AKModel\models.py:384
msgid "Scheduling fixed" msgid "Scheduling fixed"
msgstr "Planung fix" msgstr "Planung fix"
#: .\AKModel\models.py:374 #: .\AKModel\models.py:385
msgid "Length and time of this AK should not be changed" msgid "Length and time of this AK should not be changed"
msgstr "Dauer und Zeit dieses AKs sollten nicht verändert werden" msgstr "Dauer und Zeit dieses AKs sollten nicht verändert werden"
#: .\AKModel\models.py:379 #: .\AKModel\models.py:390
msgid "Last update" msgid "Last update"
msgstr "Letzte Aktualisierung" msgstr "Letzte Aktualisierung"
#: .\AKModel\models.py:382 #: .\AKModel\models.py:393
msgid "AK Slot" msgid "AK Slot"
msgstr "AK-Slot" msgstr "AK-Slot"
#: .\AKModel\models.py:383 .\AKModel\models.py:493 #: .\AKModel\models.py:394 .\AKModel\models.py:504
msgid "AK Slots" msgid "AK Slots"
msgstr "AK-Slot" msgstr "AK-Slot"
#: .\AKModel\models.py:405 .\AKModel\models.py:414 #: .\AKModel\models.py:416 .\AKModel\models.py:425
msgid "Not scheduled yet" msgid "Not scheduled yet"
msgstr "Noch nicht geplant" msgstr "Noch nicht geplant"
#: .\AKModel\models.py:443 #: .\AKModel\models.py:454
msgid "AK this message belongs to" msgid "AK this message belongs to"
msgstr "AK zu dem die Nachricht gehört" msgstr "AK zu dem die Nachricht gehört"
#: .\AKModel\models.py:444 #: .\AKModel\models.py:455
msgid "Message text" msgid "Message text"
msgstr "Nachrichtentext" msgstr "Nachrichtentext"
#: .\AKModel\models.py:445 #: .\AKModel\models.py:456
msgid "Message to the organizers. This is not publicly visible." msgid "Message to the organizers. This is not publicly visible."
msgstr "" msgstr ""
"Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar." "Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar."
#: .\AKModel\models.py:451 #: .\AKModel\models.py:462
msgid "AK Orga Message" msgid "AK Orga Message"
msgstr "AK-Organachricht" msgstr "AK-Organachricht"
#: .\AKModel\models.py:452 #: .\AKModel\models.py:463
msgid "AK Orga Messages" msgid "AK Orga Messages"
msgstr "AK-Organachrichten" msgstr "AK-Organachrichten"
#: .\AKModel\models.py:461 #: .\AKModel\models.py:472
msgid "Constraint Violation" msgid "Constraint Violation"
msgstr "Constraintverletzung" msgstr "Constraintverletzung"
#: .\AKModel\models.py:462 .\AKModel\templates\admin\AKModel\status.html:79 #: .\AKModel\models.py:473 .\AKModel\templates\admin\AKModel\status.html:79
msgid "Constraint Violations" msgid "Constraint Violations"
msgstr "Constraintverletzungen" msgstr "Constraintverletzungen"
#: .\AKModel\models.py:466 #: .\AKModel\models.py:477
msgid "Owner has two parallel slots" msgid "Owner has two parallel slots"
msgstr "Leitung hat zwei Slots parallel" msgstr "Leitung hat zwei Slots parallel"
#: .\AKModel\models.py:467 #: .\AKModel\models.py:478
msgid "AK Slot was scheduled outside the AK's availabilities" msgid "AK Slot was scheduled outside the AK's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des AKs platziert" msgstr "AK Slot wurde außerhalb der Verfügbarkeit des AKs platziert"
#: .\AKModel\models.py:468 #: .\AKModel\models.py:479
msgid "Room has two AK slots scheduled at the same time" msgid "Room has two AK slots scheduled at the same time"
msgstr "Raum hat zwei AK Slots gleichzeitig" msgstr "Raum hat zwei AK Slots gleichzeitig"
#: .\AKModel\models.py:469 #: .\AKModel\models.py:480
msgid "Room does not satisfy the requirement of the scheduled AK" msgid "Room does not satisfy the requirement of the scheduled AK"
msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht" msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht"
#: .\AKModel\models.py:470 #: .\AKModel\models.py:481
msgid "AK Slot is scheduled at the same time as an AK listed as a conflict" msgid "AK Slot is scheduled at the same time as an AK listed as a conflict"
msgstr "" msgstr ""
"AK Slot wurde wurde zur gleichen Zeit wie ein Konflikt des AKs platziert" "AK Slot wurde wurde zur gleichen Zeit wie ein Konflikt des AKs platziert"
#: .\AKModel\models.py:471 #: .\AKModel\models.py:482
msgid "AK Slot is scheduled before an AK listed as a prerequisite" msgid "AK Slot is scheduled before an AK listed as a prerequisite"
msgstr "AK Slot wurde vor einem als Voraussetzung gelisteten AK platziert" msgstr "AK Slot wurde vor einem als Voraussetzung gelisteten AK platziert"
#: .\AKModel\models.py:473 #: .\AKModel\models.py:484
msgid "" msgid ""
"AK Slot for AK with intention to submit a resolution is scheduled after " "AK Slot for AK with intention to submit a resolution is scheduled after "
"resolution deadline" "resolution deadline"
msgstr "" msgstr ""
"AK Slot eines AKs mit Resoabsicht wurde nach der Resodeadline platziert" "AK Slot eines AKs mit Resoabsicht wurde nach der Resodeadline platziert"
#: .\AKModel\models.py:474 #: .\AKModel\models.py:485
msgid "AK Slot in a category is outside that categories availabilities" msgid "AK Slot in a category is outside that categories availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeiten seiner Kategorie" msgstr "AK Slot wurde außerhalb der Verfügbarkeiten seiner Kategorie"
#: .\AKModel\models.py:475 #: .\AKModel\models.py:486
msgid "Two AK Slots for the same AK scheduled at the same time" msgid "Two AK Slots for the same AK scheduled at the same time"
msgstr "Zwei AK Slots eines AKs wurden zur selben Zeit platziert" msgstr "Zwei AK Slots eines AKs wurden zur selben Zeit platziert"
#: .\AKModel\models.py:476 #: .\AKModel\models.py:487
msgid "Room does not have enough space for interest in scheduled AK Slot" 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" msgstr "Room hat nicht genug Platz für das Interesse am geplanten AK-Slot"
#: .\AKModel\models.py:477 #: .\AKModel\models.py:488
msgid "AK Slot is scheduled outside the event's availabilities" msgid "AK Slot is scheduled outside the event's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des Events platziert" msgstr "AK Slot wurde außerhalb der Verfügbarkeit des Events platziert"
#: .\AKModel\models.py:480 #: .\AKModel\models.py:491
msgid "Warning" msgid "Warning"
msgstr "Warnung" msgstr "Warnung"
#: .\AKModel\models.py:481 #: .\AKModel\models.py:492
msgid "Violation" msgid "Violation"
msgstr "Verletzung" msgstr "Verletzung"
#: .\AKModel\models.py:483 #: .\AKModel\models.py:494
msgid "Type" msgid "Type"
msgstr "Art" msgstr "Art"
#: .\AKModel\models.py:484 #: .\AKModel\models.py:495
msgid "Type of violation, i.e. what kind of constraint was violated" msgid "Type of violation, i.e. what kind of constraint was violated"
msgstr "Art der Verletzung, gibt an welche Art Constraint verletzt wurde" msgstr "Art der Verletzung, gibt an welche Art Constraint verletzt wurde"
#: .\AKModel\models.py:485 #: .\AKModel\models.py:496
msgid "Level" msgid "Level"
msgstr "Level" msgstr "Level"
#: .\AKModel\models.py:486 #: .\AKModel\models.py:497
msgid "Severity level of the violation" msgid "Severity level of the violation"
msgstr "Schweregrad der Verletzung" msgstr "Schweregrad der Verletzung"
#: .\AKModel\models.py:492 #: .\AKModel\models.py:503
msgid "AK(s) belonging to this constraint" msgid "AK(s) belonging to this constraint"
msgstr "AK(s), die zu diesem Constraint gehören" msgstr "AK(s), die zu diesem Constraint gehören"
#: .\AKModel\models.py:494 #: .\AKModel\models.py:505
msgid "AK Slot(s) belonging to this constraint" msgid "AK Slot(s) belonging to this constraint"
msgstr "AK Slot(s), die zu diesem Constraint gehören" msgstr "AK Slot(s), die zu diesem Constraint gehören"
#: .\AKModel\models.py:496 #: .\AKModel\models.py:507
msgid "AK Owner belonging to this constraint" msgid "AK Owner belonging to this constraint"
msgstr "AK Leitung(en), die zu diesem Constraint gehören" msgstr "AK Leitung(en), die zu diesem Constraint gehören"
#: .\AKModel\models.py:498 #: .\AKModel\models.py:509
msgid "Room belonging to this constraint" msgid "Room belonging to this constraint"
msgstr "Raum, der zu diesem Constraint gehört" msgstr "Raum, der zu diesem Constraint gehört"
#: .\AKModel\models.py:501 #: .\AKModel\models.py:512
msgid "AK Requirement belonging to this constraint" msgid "AK Requirement belonging to this constraint"
msgstr "AK Anforderung, die zu diesem Constraint gehört" msgstr "AK Anforderung, die zu diesem Constraint gehört"
#: .\AKModel\models.py:503 #: .\AKModel\models.py:514
msgid "AK Category belonging to this constraint" msgid "AK Category belonging to this constraint"
msgstr "AK Kategorie, di zu diesem Constraint gehört" msgstr "AK Kategorie, di zu diesem Constraint gehört"
#: .\AKModel\models.py:505 #: .\AKModel\models.py:516
msgid "Comment" msgid "Comment"
msgstr "Kommentar" msgstr "Kommentar"
#: .\AKModel\models.py:505 #: .\AKModel\models.py:516
msgid "Comment or further details for this violation" msgid "Comment or further details for this violation"
msgstr "Kommentar oder weitere Details zu dieser Vereletzung" msgstr "Kommentar oder weitere Details zu dieser Vereletzung"
#: .\AKModel\models.py:508 #: .\AKModel\models.py:519
msgid "Timestamp" msgid "Timestamp"
msgstr "Timestamp" msgstr "Timestamp"
#: .\AKModel\models.py:508 #: .\AKModel\models.py:519
msgid "Time of creation" msgid "Time of creation"
msgstr "Zeitpunkt der ERstellung" msgstr "Zeitpunkt der ERstellung"
#: .\AKModel\models.py:509 #: .\AKModel\models.py:520
msgid "Manually Resolved" msgid "Manually Resolved"
msgstr "Manuell behoben" msgstr "Manuell behoben"
#: .\AKModel\models.py:510 #: .\AKModel\models.py:521
msgid "Mark this violation manually as resolved" msgid "Mark this violation manually as resolved"
msgstr "Markiere diese Verletzung manuell als behoben" msgstr "Markiere diese Verletzung manuell als behoben"
#: .\AKModel\models.py:537 #: .\AKModel\models.py:548
#: .\AKModel\templates\admin\AKModel\requirements_overview.html:27 #: .\AKModel\templates\admin\AKModel\requirements_overview.html:27
msgid "Details" msgid "Details"
msgstr "Details" msgstr "Details"
...@@ -779,6 +779,17 @@ msgstr "" ...@@ -779,6 +779,17 @@ msgstr ""
msgid "Logout" msgid "Logout"
msgstr "Ausloggen" msgstr "Ausloggen"
#: .\AKModel\templates\admin\AKModel\action_intermediate.html:23
msgid "Confirm"
msgstr "Bestätigen"
#: .\AKModel\templates\admin\AKModel\action_intermediate.html:27
#: .\AKModel\templates\admin\AKModel\event_wizard\import.html:24
#: .\AKModel\templates\admin\AKModel\event_wizard\settings.html:29
#: .\AKModel\templates\admin\AKModel\event_wizard\start.html:23
msgid "Cancel"
msgstr "Abbrechen"
#: .\AKModel\templates\admin\AKModel\event_wizard\activate.html:9 #: .\AKModel\templates\admin\AKModel\event_wizard\activate.html:9
#: .\AKModel\templates\admin\AKModel\event_wizard\created_prepare_import.html:9 #: .\AKModel\templates\admin\AKModel\event_wizard\created_prepare_import.html:9
#: .\AKModel\templates\admin\AKModel\event_wizard\finish.html:9 #: .\AKModel\templates\admin\AKModel\event_wizard\finish.html:9
...@@ -794,7 +805,7 @@ msgid "Successfully imported.<br><br>Do you want to activate your event now?" ...@@ -794,7 +805,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?" msgstr "Erfolgreich importiert.<br><br>Soll das Event jetzt aktiviert werden?"
#: .\AKModel\templates\admin\AKModel\event_wizard\activate.html:27 #: .\AKModel\templates\admin\AKModel\event_wizard\activate.html:27
#: .\AKModel\views.py:225 #: .\AKModel\views.py:247
msgid "Finish" msgid "Finish"
msgstr "Abschluss" msgstr "Abschluss"
...@@ -821,13 +832,6 @@ msgstr "Fortfahren" ...@@ -821,13 +832,6 @@ msgstr "Fortfahren"
msgid "Congratulations. Everything is set up!" msgid "Congratulations. Everything is set up!"
msgstr "Herzlichen Glückwunsch. Alles ist eingerichtet!" msgstr "Herzlichen Glückwunsch. Alles ist eingerichtet!"
#: .\AKModel\templates\admin\AKModel\event_wizard\import.html:24
#: .\AKModel\templates\admin\AKModel\event_wizard\settings.html:29
#: .\AKModel\templates\admin\AKModel\event_wizard\start.html:23
#: .\AKModel\templates\admin\AKModel\message_delete.html:21
msgid "Cancel"
msgstr "Abbrechen"
#: .\AKModel\templates\admin\AKModel\event_wizard\settings.html:26 #: .\AKModel\templates\admin\AKModel\event_wizard\settings.html:26
msgid "Back" msgid "Back"
msgstr "Zurück" msgstr "Zurück"
...@@ -844,15 +848,7 @@ msgstr "" ...@@ -844,15 +848,7 @@ msgstr ""
msgid "Step" msgid "Step"
msgstr "Schritt" msgstr "Schritt"
#: .\AKModel\templates\admin\AKModel\message_delete.html:7 #: .\AKModel\templates\admin\AKModel\message_delete.html:8
msgid "Delete Orga-Messages"
msgstr "Organachrichten löschen"
#: .\AKModel\templates\admin\AKModel\message_delete.html:10
msgid "Delete AK Orga Messages"
msgstr "AK-Organachrichten löschen"
#: .\AKModel\templates\admin\AKModel\message_delete.html:11
#, python-format #, python-format
msgid "" msgid ""
"Are you sure you want to delete all orga messages for %(event)s? This will " "Are you sure you want to delete all orga messages for %(event)s? This will "
...@@ -861,10 +857,6 @@ msgstr "" ...@@ -861,10 +857,6 @@ msgstr ""
"Sollen wirklich alle Organachrichten für %(event)s gelöscht werden? Dadurch " "Sollen wirklich alle Organachrichten für %(event)s gelöscht werden? Dadurch "
"werden %(message_count)s Nachricht(en) dauerhaft gelöscht:" "werden %(message_count)s Nachricht(en) dauerhaft gelöscht:"
#: .\AKModel\templates\admin\AKModel\message_delete.html:17
msgid "Delete"
msgstr "Löschen"
#: .\AKModel\templates\admin\AKModel\requirements_overview.html:12 #: .\AKModel\templates\admin\AKModel\requirements_overview.html:12
msgid "Requirements Overview" msgid "Requirements Overview"
msgstr "Übersicht Anforderungen" msgstr "Übersicht Anforderungen"
...@@ -996,86 +988,93 @@ msgstr "Login" ...@@ -996,86 +988,93 @@ msgstr "Login"
msgid "Register" msgid "Register"
msgstr "Registrieren" msgstr "Registrieren"
#: .\AKModel\views.py:143 #: .\AKModel\views.py:144
msgid "Event Status" msgid "Event Status"
msgstr "Eventstatus" msgstr "Eventstatus"
#: .\AKModel\views.py:156 #: .\AKModel\views.py:157
msgid "Requirements for Event" msgid "Requirements for Event"
msgstr "Anforderungen für das Event" msgstr "Anforderungen für das Event"
#: .\AKModel\views.py:170 #: .\AKModel\views.py:171
msgid "AK CSV Export" msgid "AK CSV Export"
msgstr "AK-CSV-Export" msgstr "AK-CSV-Export"
#: .\AKModel\views.py:184 #: .\AKModel\views.py:185
msgid "AK Wiki Export" msgid "AK Wiki Export"
msgstr "AK-Wiki-Export" msgstr "AK-Wiki-Export"
#: .\AKModel\views.py:192 .\AKModel\views.py:323 #: .\AKModel\views.py:193 .\AKModel\views.py:345
msgid "Wishes" msgid "Wishes"
msgstr "Wünsche" msgstr "Wünsche"
#: .\AKModel\views.py:211 #: .\AKModel\views.py:215
msgid "Delete AK Orga Messages"
msgstr "AK-Organachrichten löschen"
#: .\AKModel\views.py:233
msgid "AK Orga Messages successfully deleted" msgid "AK Orga Messages successfully deleted"
msgstr "AK-Organachrichten erfolgreich gelöscht" msgstr "AK-Organachrichten erfolgreich gelöscht"
#: .\AKModel\views.py:221 #: .\AKModel\views.py:243
msgid "Settings" msgid "Settings"
msgstr "Einstellungen" msgstr "Einstellungen"
#: .\AKModel\views.py:222 #: .\AKModel\views.py:244
msgid "Event created, Prepare Import" msgid "Event created, Prepare Import"
msgstr "Event angelegt, Import vorbereiten" msgstr "Event angelegt, Import vorbereiten"
#: .\AKModel\views.py:223 #: .\AKModel\views.py:245
msgid "Import categories & requirements" msgid "Import categories & requirements"
msgstr "Kategorien & Anforderungen kopieren" msgstr "Kategorien & Anforderungen kopieren"
#: .\AKModel\views.py:224 #: .\AKModel\views.py:246
#, fuzzy #, fuzzy
#| msgid "Active State" #| msgid "Active State"
msgid "Activate?" msgid "Activate?"
msgstr "Aktivieren?" msgstr "Aktivieren?"
#: .\AKModel\views.py:283 #: .\AKModel\views.py:305
#, python-format #, python-format
msgid "Copied '%(obj)s'" msgid "Copied '%(obj)s'"
msgstr "'%(obj)s' kopiert" msgstr "'%(obj)s' kopiert"
#: .\AKModel\views.py:286 #: .\AKModel\views.py:308
#, python-format #, python-format
msgid "Could not copy '%(obj)s' (%(error)s)" msgid "Could not copy '%(obj)s' (%(error)s)"
msgstr "'%(obj)s' konnte nicht kopiert werden (%(error)s)" msgstr "'%(obj)s' konnte nicht kopiert werden (%(error)s)"
#: .\AKModel\views.py:318 #: .\AKModel\views.py:340
msgid "Symbols" msgid "Symbols"
msgstr "Symbole" msgstr "Symbole"
#: .\AKModel\views.py:319 #: .\AKModel\views.py:341
msgid "Who?" msgid "Who?"
msgstr "Wer?" msgstr "Wer?"
#: .\AKModel\views.py:320 #: .\AKModel\views.py:342
msgid "Duration(s)" msgid "Duration(s)"
msgstr "Dauer(n)" msgstr "Dauer(n)"
#: .\AKModel\views.py:321 #: .\AKModel\views.py:343
msgid "Reso intention?" msgid "Reso intention?"
msgstr "Resolutionsabsicht?" msgstr "Resolutionsabsicht?"
#: .\AKModel\views.py:322 #: .\AKModel\views.py:344
msgid "Category (for Wishes)" msgid "Category (for Wishes)"
msgstr "Kategorie (für Wünsche)" msgstr "Kategorie (für Wünsche)"
#~ msgid "Delete Orga-Messages"
#~ msgstr "Organachrichten löschen"
#~ msgid "Delete"
#~ msgstr "Löschen"
#~ msgid "AK Slot is scheduled in a room with less space than interest" #~ msgid "AK Slot is scheduled in a room with less space than interest"
#~ msgstr "" #~ msgstr ""
#~ "AK Slot wurde in einem Raum mit weniger Plätzen als am AK Interessierten " #~ "AK Slot wurde in einem Raum mit weniger Plätzen als am AK Interessierten "
#~ "platziert" #~ "platziert"
#~ msgid "Confirm"
#~ msgstr "Bestätigen"
#~ msgid "messages will be permanently deleted:" #~ msgid "messages will be permanently deleted:"
#~ msgstr "Nachrichten werden dauerhaft gelöscht:" #~ msgstr "Nachrichten werden dauerhaft gelöscht:"
......
AKModel/models.py
View file @ b6d4bdde
...@@ -2,6 +2,7 @@ import itertools ...@@ -2,6 +2,7 @@ import itertools
from datetime import timedelta from datetime import timedelta
from django.db import models from django.db import models
from django.db.models import Count
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.utils import timezone from django.utils import timezone
from django.utils.datetime_safe import datetime from django.utils.datetime_safe import datetime
...@@ -105,6 +106,12 @@ class Event(models.Model): ...@@ -105,6 +106,12 @@ class Event(models.Model):
categories_with_aks.append((category, ak_list)) categories_with_aks.append((category, ak_list))
return categories_with_aks return categories_with_aks
def get_unscheduled_wish_slots(self):
return self.akslot_set.filter(start__isnull=True).annotate(Count('ak__owners')).filter(ak__owners__count=0)
def get_aks_without_availabilities(self):
return self.ak_set.annotate(Count('availabilities', distinct=True)).annotate(Count('owners', distinct=True)).filter(availabilities__count=0, owners__count__gt=0)
class AKOwner(models.Model): class AKOwner(models.Model):
""" An AKOwner describes the person organizing/holding an AK. """ An AKOwner describes the person organizing/holding an AK.
...@@ -328,6 +335,14 @@ class AK(models.Model): ...@@ -328,6 +335,14 @@ class AK(models.Model):
def availabilities(self): def availabilities(self):
return "Availability".objects.filter(ak=self) return "Availability".objects.filter(ak=self)
@property
def availabilities_total_duration(self):
from AKModel.availability.models import Availability
for a in Availability.objects.filter(ak=self):
print(a)
print(a.end)
# [a.end - a.start for a in ]
return 0
class Room(models.Model): class Room(models.Model):
""" A room describes where an AK can be held. """ A room describes where an AK can be held.
......
AKModel/templates/admin/AKModel/action_intermediate.html 0 → 100644
View file @ b6d4bdde
{% extends "admin/base_site.html" %}
{% load tags_AKModel %}
{% load i18n %}
{% load bootstrap4 %}
{% load fontawesome_5 %}
{% block title %}{{event}}: {{ title }}{% endblock %}
{% block content %}
{% block action_preview %}
<p>
{{ preview|linebreaksbr }}
</p>
{% endblock %}
<form method="post">{% csrf_token %}
{% bootstrap_form form %}
<div class="float-right">
<button type="submit" class="save btn btn-success" value="Submit">
{% fa5_icon "check" 'fas' %} {% trans "Confirm" %}
</button>
</div>
<a href="javascript:history.back()" class="btn btn-info">
{% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
AKModel/templates/admin/AKModel/message_delete.html
View file @ b6d4bdde
{% extends "admin/base_site.html" %} {% extends "admin/AKModel/action_intermediate.html" %}
{% load tags_AKModel %} {% load tags_AKModel %}
{% load i18n %} {% load i18n %}
{% load fontawesome_5 %} {% load fontawesome_5 %}
{% block title %}{{event}}: {% trans "Delete Orga-Messages" %}{% endblock %} {% block action_preview %}
{% block content %}
<h2>{% trans "Delete AK Orga Messages" %}</h2>
<p>{% blocktrans with message_count=ak_messages.count %}Are you sure you want to delete all orga messages for {{ event }}? This will permanently delete {{ message_count }} message(s):{% endblocktrans %}</p> <p>{% blocktrans with message_count=ak_messages.count %}Are you sure you want to delete all orga messages for {{ event }}? This will permanently delete {{ message_count }} message(s):{% endblocktrans %}</p>
{% include "admin/AKModel/render_ak_messages.html" %} {% include "admin/AKModel/render_ak_messages.html" %}
<form method="post">{% csrf_token %}
<button type="submit" class="save btn btn-danger float-right" value="Confirm">
{% fa5_icon "check" 'fas' %} {% trans "Delete" %}
</button>
<a href="{% url 'admin:event_status' slug=event.slug %}" class="btn btn-info">
{% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %} {% endblock %}
AKModel/templates/admin/AKModel/status.html
View file @ b6d4bdde
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<div class="col-md-4"> <div class="col-md-4">
<h3 class="block-header">{% trans "Messages" %}</h3> <h3 class="block-header">{% trans "Messages" %}</h3>
{% include "admin/AKModel/render_ak_messages.html" %} {% include "admin/AKModel/render_ak_messages.html" %}
<a class="btn btn-danger" href="{% url 'admin:ak_delete_orga_messages' slug=event.slug %}">{% trans "Delete all messages" %}</a> <a class="btn btn-danger" href="{% url 'admin:ak_delete_orga_messages' event_slug=event.slug %}">{% trans "Delete all messages" %}</a>
</div> </div>
</div> </div>
{% endtimezone %} {% endtimezone %}
......
AKModel/urls.py
View file @ b6d4bdde
...@@ -79,7 +79,7 @@ def get_admin_urls_event(admin_site): ...@@ -79,7 +79,7 @@ def get_admin_urls_event(admin_site):
name="ak_csv_export"), name="ak_csv_export"),
path('<slug:slug>/ak-wiki-export/', admin_site.admin_view(AKWikiExportView.as_view()), path('<slug:slug>/ak-wiki-export/', admin_site.admin_view(AKWikiExportView.as_view()),
name="ak_wiki_export"), name="ak_wiki_export"),
path('<slug:slug>/delete-orga-messages/', admin_site.admin_view(AKMessageDeleteView.as_view()), path('<slug:event_slug>/delete-orga-messages/', admin_site.admin_view(AKMessageDeleteView.as_view()),
name="ak_delete_orga_messages"), name="ak_delete_orga_messages"),
path('<slug:event_slug>/ak-slide-export/', export_slides, name="ak_slide_export"), path('<slug:event_slug>/ak-slide-export/', export_slides, name="ak_slide_export"),
......
AKModel/views.py
View file @ b6d4bdde
from abc import ABC, abstractmethod
from itertools import zip_longest from itertools import zip_longest
from django.contrib import admin, messages from django.contrib import admin, messages
...@@ -11,7 +12,7 @@ from django_tex.shortcuts import render_to_pdf ...@@ -11,7 +12,7 @@ from django_tex.shortcuts import render_to_pdf
from rest_framework import viewsets, permissions, mixins from rest_framework import viewsets, permissions, mixins
from AKModel.forms import NewEventWizardStartForm, NewEventWizardSettingsForm, NewEventWizardPrepareImportForm, \ from AKModel.forms import NewEventWizardStartForm, NewEventWizardSettingsForm, NewEventWizardPrepareImportForm, \
NewEventWizardImportForm, NewEventWizardActivateForm NewEventWizardImportForm, NewEventWizardActivateForm, AdminIntermediateForm
from AKModel.models import Event, AK, AKSlot, Room, AKTrack, AKCategory, AKOwner, AKOrgaMessage, AKRequirement from AKModel.models import Event, AK, AKSlot, Room, AKTrack, AKCategory, AKOwner, AKOrgaMessage, AKRequirement
from AKModel.serializers import AKSerializer, AKSlotSerializer, RoomSerializer, AKTrackSerializer, AKCategorySerializer, \ from AKModel.serializers import AKSerializer, AKSlotSerializer, RoomSerializer, AKTrackSerializer, AKCategorySerializer, \
AKOwnerSerializer AKOwnerSerializer
...@@ -194,22 +195,43 @@ class AKWikiExportView(AdminViewMixin, DetailView): ...@@ -194,22 +195,43 @@ class AKWikiExportView(AdminViewMixin, DetailView):
return context return context
class AKMessageDeleteView(AdminViewMixin, DeleteView): class IntermediateAdminView(AdminViewMixin, FormView, ABC):
model = Event template_name = "admin/AKModel/action_intermediate.html"
form_class = AdminIntermediateForm
@abstractmethod
def get_preview(self):
pass
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = self.title
context["preview"] = self.get_preview()
return context
class AKMessageDeleteView(EventSlugMixin, IntermediateAdminView):
template_name = "admin/AKModel/message_delete.html" template_name = "admin/AKModel/message_delete.html"
title = _("Delete AK Orga Messages")
def get_orga_messages_for_event(self, event): def get_orga_messages_for_event(self, event):
return AKOrgaMessage.objects.filter(ak__event=event) return AKOrgaMessage.objects.filter(ak__event=event)
def get_preview(self):
return None
def get_success_url(self):
return reverse_lazy('admin:event_status', kwargs={'slug': self.event.slug})
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["ak_messages"] = self.get_orga_messages_for_event(self.get_object()) context["ak_messages"] = self.get_orga_messages_for_event(self.event)
return context return context
def post(self, request, *args, **kwargs): def form_valid(self, form):
self.get_orga_messages_for_event(self.get_object()).delete() self.get_orga_messages_for_event(self.event).delete()
messages.add_message(self.request, messages.SUCCESS, _("AK Orga Messages successfully deleted")) messages.add_message(self.request, messages.SUCCESS, _("AK Orga Messages successfully deleted"))
return HttpResponseRedirect(reverse_lazy('admin:event_status', kwargs={'slug': self.get_object().slug})) return super().form_valid(form)
class WizardViewMixin: class WizardViewMixin:
......
AKScheduling/locale/de_DE/LC_MESSAGES/django.po
View file @ b6d4bdde
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-17 22:41+0200\n" "POT-Creation-Date: 2022-09-27 17:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -79,7 +79,7 @@ msgstr "Seit" ...@@ -79,7 +79,7 @@ msgstr "Seit"
#: .\AKScheduling\templates\admin\AKScheduling\constraint_violations.html:139 #: .\AKScheduling\templates\admin\AKScheduling\constraint_violations.html:139
#: .\AKScheduling\templates\admin\AKScheduling\manage_tracks.html:243 #: .\AKScheduling\templates\admin\AKScheduling\manage_tracks.html:243
#: .\AKScheduling\templates\admin\AKScheduling\scheduling.html:208 #: .\AKScheduling\templates\admin\AKScheduling\scheduling.html:208
#: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:43 #: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:48
#: .\AKScheduling\templates\admin\AKScheduling\unscheduled.html:34 #: .\AKScheduling\templates\admin\AKScheduling\unscheduled.html:34
msgid "Event Status" msgid "Event Status"
msgstr "Event-Status" msgstr "Event-Status"
...@@ -158,10 +158,18 @@ msgid "AKs without availabilities" ...@@ -158,10 +158,18 @@ msgid "AKs without availabilities"
msgstr "AKs ohne Verfügbarkeiten" msgstr "AKs ohne Verfügbarkeiten"
#: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:28 #: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:28
msgid "Create default availabilities"
msgstr "Standardverfügbarkeiten anlegen"
#: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:31
msgid "AK wishes with slots" msgid "AK wishes with slots"
msgstr "AK-Wünsche mit Slots" msgstr "AK-Wünsche mit Slots"
#: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:35 #: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:38
msgid "Delete slots for wishes"
msgstr ""
#: .\AKScheduling\templates\admin\AKScheduling\special_attention.html:40
msgid "AKs without slots" msgid "AKs without slots"
msgstr "AKs ohne Slots" msgstr "AKs ohne Slots"
...@@ -173,10 +181,57 @@ msgstr "Noch nicht geschedulte AK-Slots" ...@@ -173,10 +181,57 @@ msgstr "Noch nicht geschedulte AK-Slots"
msgid "Count" msgid "Count"
msgstr "Anzahl" msgstr "Anzahl"
#: .\AKScheduling\views.py:103 #: .\AKScheduling\views.py:109
msgid "Interest updated" msgid "Interest updated"
msgstr "Interesse aktualisiert" msgstr "Interesse aktualisiert"
#: .\AKScheduling\views.py:141 #: .\AKScheduling\views.py:147
msgid "Wishes" msgid "Wishes"
msgstr "Wünsche" msgstr "Wünsche"
#: .\AKScheduling\views.py:155
msgid "Cleanup: Delete unscheduled slots for wishes"
msgstr "Aufräumen: Noch nicht geplante Slots für Wünsche löschen"
#: .\AKScheduling\views.py:162
#, python-brace-format
msgid ""
"The following {count} unscheduled slots of wishes will be deleted:\n"
"\n"
" {slots}"
msgstr ""
"Die folgenden {count} noch nicht geplanten Slots von Wünschen werden "
"gelöscht:\n"
"\n"
" {slots}"
#: .\AKScheduling\views.py:169
msgid "Unscheduled slots for wishes successfully deleted"
msgstr "Noch nicht geplante Slots für Wünsche erfolgreich gelöscht"
#: .\AKScheduling\views.py:174
msgid "Create default availabilities for AKs"
msgstr "Standardverfügbarkeiten für AKs anlegen"
#: .\AKScheduling\views.py:181
#, python-brace-format
msgid ""
"The following {count} AKs don't have any availability information. Create "
"default availability for them:\n"
"\n"
" {aks}"
msgstr ""
"Die folgenden {count} AKs haben keine Verfügbarkeitsinformationen. "
"Standardverfügbarkeiten für sie anlegen:\n"
"\n"
" {aks}"
#: .\AKScheduling\views.py:199
#, python-brace-format
msgid "Could not create default availabilities for AK: {ak}"
msgstr "Konnte keine Verfügbarkeit anlegen für AK: {ak}"
#: .\AKScheduling\views.py:204
#, python-brace-format
msgid "Created default availabilities for {count} AKs"
msgstr "Standardverfügbarkeiten für {count} AKs angelegt"
AKScheduling/models.py
View file @ b6d4bdde
...@@ -157,7 +157,7 @@ def ak_owners_changed_handler(sender, instance: AK, action: str, **kwargs): ...@@ -157,7 +157,7 @@ def ak_owners_changed_handler(sender, instance: AK, action: str, **kwargs):
c.ak_slots_tmp.add(other_slot) c.ak_slots_tmp.add(other_slot)
new_violations.append(c) new_violations.append(c)
print(f"{owner} has the following conflicts: {new_violations}") #print(f"{owner} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -203,7 +203,7 @@ def ak_conflicts_changed_handler(sender, instance: AK, action: str, **kwargs): ...@@ -203,7 +203,7 @@ def ak_conflicts_changed_handler(sender, instance: AK, action: str, **kwargs):
c.ak_slots_tmp.add(other_slot) c.ak_slots_tmp.add(other_slot)
new_violations.append(c) new_violations.append(c)
print(f"{instance} has the following conflicts: {new_violations}") # print(f"{instance} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -249,7 +249,7 @@ def ak_prerequisites_changed_handler(sender, instance: AK, action: str, **kwargs ...@@ -249,7 +249,7 @@ def ak_prerequisites_changed_handler(sender, instance: AK, action: str, **kwargs
c.ak_slots_tmp.add(other_slot) c.ak_slots_tmp.add(other_slot)
new_violations.append(c) new_violations.append(c)
print(f"{instance} has the following conflicts: {new_violations}") # print(f"{instance} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -298,7 +298,7 @@ def ak_requirements_changed_handler(sender, instance: AK, action: str, **kwargs) ...@@ -298,7 +298,7 @@ def ak_requirements_changed_handler(sender, instance: AK, action: str, **kwargs)
c.ak_slots_tmp.add(slot) c.ak_slots_tmp.add(slot)
new_violations.append(c) new_violations.append(c)
print(f"{instance} has the following conflicts: {new_violations}") # print(f"{instance} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -310,7 +310,7 @@ def ak_requirements_changed_handler(sender, instance: AK, action: str, **kwargs) ...@@ -310,7 +310,7 @@ def ak_requirements_changed_handler(sender, instance: AK, action: str, **kwargs)
@receiver(post_save, sender=AKSlot) @receiver(post_save, sender=AKSlot)
def akslot_changed_handler(sender, instance: AKSlot, **kwargs): def akslot_changed_handler(sender, instance: AKSlot, **kwargs):
# Changes might affect: Duplicate parallel, Two in room, Resodeadline # Changes might affect: Duplicate parallel, Two in room, Resodeadline
print(f"{sender} changed") # print(f"{sender} changed")
event = instance.event event = instance.event
# == Check for two parallel slots by one of the owners == # == Check for two parallel slots by one of the owners ==
...@@ -341,7 +341,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs): ...@@ -341,7 +341,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs):
c.ak_slots_tmp.add(other_slot) c.ak_slots_tmp.add(other_slot)
new_violations.append(c) new_violations.append(c)
print(f"{owner} has the following conflicts: {new_violations}") # print(f"{owner} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -373,7 +373,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs): ...@@ -373,7 +373,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs):
c.ak_slots_tmp.add(other_slot) c.ak_slots_tmp.add(other_slot)
new_violations.append(c) new_violations.append(c)
print(f"Multiple slots in room {instance.room}: {new_violations}") # print(f"Multiple slots in room {instance.room}: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the slot that was recently changed (important!) # belonging to the slot that was recently changed (important!)
...@@ -437,7 +437,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs): ...@@ -437,7 +437,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs):
c.ak_slots_tmp.add(instance) c.ak_slots_tmp.add(instance)
new_violations.append(c) new_violations.append(c)
print(f"{instance.ak} has the following slots outside availabilities: {new_violations}") # print(f"{instance.ak} has the following slots outside availabilities: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -470,7 +470,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs): ...@@ -470,7 +470,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs):
c.ak_slots_tmp.add(instance) c.ak_slots_tmp.add(instance)
new_violations.append(c) new_violations.append(c)
print(f"{instance} has the following conflicts: {new_violations}") # print(f"{instance} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -502,7 +502,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs): ...@@ -502,7 +502,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs):
c.ak_slots_tmp.add(other_slot) c.ak_slots_tmp.add(other_slot)
new_violations.append(c) new_violations.append(c)
print(f"{instance} has the following conflicts: {new_violations}") # print(f"{instance} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -534,7 +534,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs): ...@@ -534,7 +534,7 @@ def akslot_changed_handler(sender, instance: AKSlot, **kwargs):
c.ak_slots_tmp.add(other_slot) c.ak_slots_tmp.add(other_slot)
new_violations.append(c) new_violations.append(c)
print(f"{instance} has the following conflicts: {new_violations}") # print(f"{instance} has the following conflicts: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
...@@ -556,7 +556,7 @@ def akslot_deleted_handler(sender, instance: AKSlot, **kwargs): ...@@ -556,7 +556,7 @@ def akslot_deleted_handler(sender, instance: AKSlot, **kwargs):
# Manually clean up or remove constraint violations that belong to this slot since there is no cascade deletion # Manually clean up or remove constraint violations that belong to this slot since there is no cascade deletion
# for many2many relationships. Explicitly listening for AK deletion signals is not necessary since they will # for many2many relationships. Explicitly listening for AK deletion signals is not necessary since they will
# transitively trigger this signal and we always set both AK and AKSlot references in a constraint violation # transitively trigger this signal and we always set both AK and AKSlot references in a constraint violation
print(f"{instance} deleted") # print(f"{instance} deleted")
for cv in instance.constraintviolation_set.all(): for cv in instance.constraintviolation_set.all():
# Make sure not delete CVs that e.g., show three parallel slots in a single room # Make sure not delete CVs that e.g., show three parallel slots in a single room
...@@ -599,7 +599,7 @@ def room_requirements_changed_handler(sender, instance: Room, action: str, **kwa ...@@ -599,7 +599,7 @@ def room_requirements_changed_handler(sender, instance: Room, action: str, **kwa
@receiver(post_save, sender=Availability) @receiver(post_save, sender=Availability)
def availability_changed_handler(sender, instance: Availability, **kwargs): def availability_changed_handler(sender, instance: Availability, **kwargs):
# Changes might affect: category availability, AK availability, Room availability # Changes might affect: category availability, AK availability, Room availability
print(f"{instance} changed") # print(f"{instance} changed")
event = instance.event event = instance.event
...@@ -627,7 +627,7 @@ def availability_changed_handler(sender, instance: Availability, **kwargs): ...@@ -627,7 +627,7 @@ def availability_changed_handler(sender, instance: Availability, **kwargs):
c.ak_slots_tmp.add(slot) c.ak_slots_tmp.add(slot)
new_violations.append(c) new_violations.append(c)
print(f"{instance.ak} has the following slots outside availabilities: {new_violations}") # print(f"{instance.ak} has the following slots outside availabilities: {new_violations}")
# ... and compare to/update list of existing violations of this type # ... and compare to/update list of existing violations of this type
# belonging to the AK that was recently changed (important!) # belonging to the AK that was recently changed (important!)
......
AKScheduling/templates/admin/AKScheduling/special_attention.html
View file @ b6d4bdde
...@@ -22,21 +22,26 @@ ...@@ -22,21 +22,26 @@
{% for ak in aks_without_availabilities %} {% for ak in aks_without_availabilities %}
<a href="{% url "submit:ak_edit" event_slug=event.slug pk=ak.pk %}">{{ ak }}</a><br> <a href="{% url "submit:ak_edit" event_slug=event.slug pk=ak.pk %}">{{ ak }}</a><br>
{% empty %} {% empty %}
- -<br>
{% endfor %} {% endfor %}
<a class="btn btn-warning mt-2" href="{% url "admin:autocreate-availabilities" event_slug=event.slug %}">{% trans "Create default availabilities" %}</a>
<h4 class="mt-4 mb-4">{% trans "AK wishes with slots" %}</h4> <h4 class="mt-4 mb-4">{% trans "AK wishes with slots" %}</h4>
{% for ak in ak_wishes_with_slots %} {% for ak in ak_wishes_with_slots %}
<a href="{% url "submit:ak_detail" event_slug=event.slug pk=ak.pk %}">{{ ak }}</a><br> <a href="{% url "submit:ak_detail" event_slug=event.slug pk=ak.pk %}">{{ ak }}</a> <a href="{% url "admin:AKModel_akslot_changelist" %}?ak={{ ak.pk }}">({{ ak.akslot__count }})</a><br>
{% empty %} {% empty %}
- -<br>
{% endfor %} {% endfor %}
<a class="btn btn-warning mt-2" href="{% url "admin:cleanup-wish-slots" event_slug=event.slug %}">{% trans "Delete slots for wishes" %}</a>
<h4 class="mt-4 mb-4">{% trans "AKs without slots" %}</h4> <h4 class="mt-4 mb-4">{% trans "AKs without slots" %}</h4>
{% for ak in aks_without_slots %} {% for ak in aks_without_slots %}
<a href="{% url "submit:ak_detail" event_slug=event.slug pk=ak.pk %}">{{ ak }}</a><br> <a href="{% url "submit:ak_detail" event_slug=event.slug pk=ak.pk %}">{{ ak }}</a><br>
{% empty %} {% empty %}
- -<br>
{% endfor %} {% endfor %}
<div class="mt-5"> <div class="mt-5">
......
AKScheduling/urls.py
View file @ b6d4bdde
from django.urls import path from django.urls import path
from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView, TrackAdminView, \ from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView, TrackAdminView, \
ConstraintViolationsAdminView, SpecialAttentionAKsAdminView, InterestEnteringAdminView ConstraintViolationsAdminView, SpecialAttentionAKsAdminView, InterestEnteringAdminView, WishSlotCleanupView, \
AvailabilityAutocreateView
def get_admin_urls_scheduling(admin_site): def get_admin_urls_scheduling(admin_site):
...@@ -14,6 +15,10 @@ def get_admin_urls_scheduling(admin_site): ...@@ -14,6 +15,10 @@ def get_admin_urls_scheduling(admin_site):
name="constraint-violations"), name="constraint-violations"),
path('<slug:slug>/special-attention/', admin_site.admin_view(SpecialAttentionAKsAdminView.as_view()), path('<slug:slug>/special-attention/', admin_site.admin_view(SpecialAttentionAKsAdminView.as_view()),
name="special-attention"), name="special-attention"),
path('<slug:event_slug>/cleanup-wish-slots/', admin_site.admin_view(WishSlotCleanupView.as_view()),
name="cleanup-wish-slots"),
path('<slug:event_slug>/autocreate-availabilities/', admin_site.admin_view(AvailabilityAutocreateView.as_view()),
name="autocreate-availabilities"),
path('<slug:event_slug>/tracks/', admin_site.admin_view(TrackAdminView.as_view()), path('<slug:event_slug>/tracks/', admin_site.admin_view(TrackAdminView.as_view()),
name="tracks_manage"), name="tracks_manage"),
path('<slug:event_slug>/enter-interest/<int:pk>', admin_site.admin_view(InterestEnteringAdminView.as_view()), path('<slug:event_slug>/enter-interest/<int:pk>', admin_site.admin_view(InterestEnteringAdminView.as_view()),
......
AKScheduling/views.py
View file @ b6d4bdde
from django.contrib import messages
from django.contrib.messages.views import SuccessMessageMixin from django.contrib.messages.views import SuccessMessageMixin
from django.db.models import Count
from django.urls import reverse_lazy
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.views.generic import ListView, DetailView, UpdateView from django.views.generic import ListView, DetailView, UpdateView
from AKModel.models import AKSlot, AKTrack, Event, AK, AKCategory from AKModel.models import AKSlot, AKTrack, Event, AK, AKCategory
from AKModel.views import AdminViewMixin, FilterByEventSlugMixin, EventSlugMixin from AKModel.views import AdminViewMixin, FilterByEventSlugMixin, EventSlugMixin, IntermediateAdminView
from AKScheduling.forms import AKInterestForm from AKScheduling.forms import AKInterestForm
...@@ -71,7 +74,7 @@ class SpecialAttentionAKsAdminView(AdminViewMixin, DetailView): ...@@ -71,7 +74,7 @@ class SpecialAttentionAKsAdminView(AdminViewMixin, DetailView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["title"] = f"{_('AKs requiring special attention for')} {context['event']}" context["title"] = f"{_('AKs requiring special attention for')} {context['event']}"
aks = AK.objects.filter(event=context["event"]) aks = AK.objects.filter(event=context["event"]).annotate(Count('owners', distinct=True)).annotate(Count('akslot', distinct=True)).annotate(Count('availabilities', distinct=True))
aks_with_comment = [] aks_with_comment = []
ak_wishes_with_slots = [] ak_wishes_with_slots = []
aks_without_availabilities = [] aks_without_availabilities = []
...@@ -81,13 +84,13 @@ class SpecialAttentionAKsAdminView(AdminViewMixin, DetailView): ...@@ -81,13 +84,13 @@ class SpecialAttentionAKsAdminView(AdminViewMixin, DetailView):
if ak.notes != "": if ak.notes != "":
aks_with_comment.append(ak) aks_with_comment.append(ak)
if ak.wish: if ak.owners__count == 0:
if ak.akslot_set.count() > 0: if ak.akslot__count > 0:
ak_wishes_with_slots.append(ak) ak_wishes_with_slots.append(ak)
else: else:
if ak.akslot_set.count() == 0: if ak.akslot__count == 0:
aks_without_slots.append(ak) aks_without_slots.append(ak)
if ak.availabilities.count() == 0: if ak.availabilities__count == 0:
aks_without_availabilities.append(ak) aks_without_availabilities.append(ak)
context["aks_with_comment"] = aks_with_comment context["aks_with_comment"] = aks_with_comment
...@@ -146,3 +149,58 @@ class InterestEnteringAdminView(SuccessMessageMixin, AdminViewMixin, EventSlugMi ...@@ -146,3 +149,58 @@ class InterestEnteringAdminView(SuccessMessageMixin, AdminViewMixin, EventSlugMi
context["categories_with_aks"] = categories_with_aks context["categories_with_aks"] = categories_with_aks
return context return context
class WishSlotCleanupView(EventSlugMixin, IntermediateAdminView):
title = _('Cleanup: Delete unscheduled slots for wishes')
def get_success_url(self):
return reverse_lazy('admin:special-attention', kwargs={'slug': self.event.slug})
def get_preview(self):
slots = self.event.get_unscheduled_wish_slots()
return _("The following {count} unscheduled slots of wishes will be deleted:\n\n {slots}").format(
count=len(slots),
slots=", ".join(str(s.ak) for s in slots)
)
def form_valid(self, form):
self.event.get_unscheduled_wish_slots().delete()
messages.add_message(self.request, messages.SUCCESS, _("Unscheduled slots for wishes successfully deleted"))
return super().form_valid(form)
class AvailabilityAutocreateView(EventSlugMixin, IntermediateAdminView):
title = _('Create default availabilities for AKs')
def get_success_url(self):
return reverse_lazy('admin:special-attention', kwargs={'slug': self.event.slug})
def get_preview(self):
aks = self.event.get_aks_without_availabilities()
return _("The following {count} AKs don't have any availability information. "
"Create default availability for them:\n\n {aks}").format(
count=len(aks),
aks=", ".join(str(ak) for ak in aks)
)
def form_valid(self, form):
from AKModel.availability.models import Availability
success_count = 0
for ak in self.event.get_aks_without_availabilities():
try:
availability = Availability.with_event_length(event=self.event, ak=ak)
availability.save()
success_count += 1
except:
messages.add_message(
self.request, messages.WARNING,
_("Could not create default availabilities for AK: {ak}").format(ak=ak)
)
messages.add_message(
self.request, messages.SUCCESS,
_("Created default availabilities for {count} AKs").format(count=success_count)
)
return super().form_valid(form)
AKSubmission/forms.py
View file @ b6d4bdde
...@@ -151,7 +151,7 @@ class AKEditForm(AKForm): ...@@ -151,7 +151,7 @@ class AKEditForm(AKForm):
self.fields["tags_raw"].initial = "; ".join(str(tag) for tag in self.instance.tags.all()) self.fields["tags_raw"].initial = "; ".join(str(tag) for tag in self.instance.tags.all())
class AKWishForm(AKSubmissionForm): class AKWishForm(AKForm):
class Meta(AKForm.Meta): class Meta(AKForm.Meta):
exclude = ['owners', 'link', 'protocol_link'] exclude = ['owners', 'link', 'protocol_link']
......
AKSubmission/templates/AKSubmission/ak_detail.html
View file @ b6d4bdde
...@@ -235,95 +235,96 @@ ...@@ -235,95 +235,96 @@
<p style="margin-top: 30px;margin-bottom: 30px;">{{ ak.description|linebreaks }}</p> <p style="margin-top: 30px;margin-bottom: 30px;">{{ ak.description|linebreaks }}</p>
{% if not ak.wish %}
<table class="table"> <table class="table">
<thead> <thead>
<tr>
{% if not ak.event.plan_hidden or user.is_staff %}
<th>{% trans "When?" %}</th>
{% endif %}
<th>{% trans "Duration" %}</th>
{% if not ak.event.plan_hidden or user.is_staff %}
<th>{% trans "Room" %}</th>
{% endif %}
<th></th>
</tr>
</thead>
<tbody>
{% for slot in ak.akslot_set.all %}
<tr> <tr>
{% if not ak.event.plan_hidden or user.is_staff %} {% if not ak.event.plan_hidden or user.is_staff %}
<td>{{ slot.time_simplified }}</td> <th>{% trans "When?" %}</th>
{% endif %} {% endif %}
<td>{{ slot.duration_simplified }}</td> <th>{% trans "Duration" %}</th>
{% if not ak.event.plan_hidden or user.is_staff %} {% if not ak.event.plan_hidden or user.is_staff %}
<td> <th>{% trans "Room" %}</th>
{% if slot.room %} {% endif %}
{% if "AKPlan"|check_app_installed %} <th></th>
<a href="{% url 'plan:plan_room' event_slug=ak.event.slug pk=slot.room.pk %}">{{ slot.room }}</a> </tr>
</thead>
<tbody>
{% for slot in ak.akslot_set.all %}
<tr>
{% if not ak.event.plan_hidden or user.is_staff %}
<td>{{ slot.time_simplified }}</td>
{% endif %}
<td>{{ slot.duration_simplified }}</td>
{% if not ak.event.plan_hidden or user.is_staff %}
<td>
{% if slot.room %}
{% if "AKPlan"|check_app_installed %}
<a href="{% url 'plan:plan_room' event_slug=ak.event.slug pk=slot.room.pk %}">{{ slot.room }}</a>
{% else %}
{{ slot.room }}
{% endif %}
{% else %} {% else %}
{{ slot.room }} -
{% endif %} {% endif %}
</td>
{% endif %}
<td>
{% if not slot.start %}
<a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}"
data-toggle="tooltip" title="{% trans 'Edit' %}"
class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
<a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}"
data-toggle="tooltip" title="{% trans 'Delete' %}"
class="btn btn-danger">{% fa5_icon 'times' 'fas' %}</a>
{% else %} {% else %}
- {% if "AKOnline"|check_app_installed and slot.room and slot.room.virtualroom and slot.room.virtualroom.url != '' %}
<a class="btn btn-success" href="{{ slot.room.virtualroom.url }}">
{% fa5_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
</a>
{% endif %}
{% endif %} {% endif %}
</td> {% if user.is_staff %}
{% endif %} <a href="{% url 'admin:AKModel_akslot_change' slot.pk %}"
<td> data-toggle="tooltip" title="{% trans 'Schedule' %}"
{% if not slot.start %} class="btn btn-outline-success">{% fa5_icon 'stream' 'fas' %}</a>
<a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}"
data-toggle="tooltip" title="{% trans 'Edit' %}"
class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
<a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}"
data-toggle="tooltip" title="{% trans 'Delete' %}"
class="btn btn-danger">{% fa5_icon 'times' 'fas' %}</a>
{% else %}
{% if "AKOnline"|check_app_installed and slot.room and slot.room.virtualroom and slot.room.virtualroom.url != '' %}
<a class="btn btn-success" href="{{ slot.room.virtualroom.url }}">
{% fa5_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
</a>
{% endif %} {% endif %}
{% endif %} </td>
{% if user.is_staff %} </tr>
<a href="{% url 'admin:AKModel_akslot_change' slot.pk %}" {% endfor %}
data-toggle="tooltip" title="{% trans 'Schedule' %}" </tbody>
class="btn btn-outline-success">{% fa5_icon 'stream' 'fas' %}</a> </table>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% if ak.event.active %} {% if ak.event.active %}
<div class=""> <div class="">
<a href="{% url 'submit:akslot_add' event_slug=ak.event.slug pk=ak.pk %}" <a href="{% url 'submit:akslot_add' event_slug=ak.event.slug pk=ak.pk %}"
class="btn btn-success">{% fa5_icon 'plus' 'fas' %} {% trans "Add another slot" %}</a> class="btn btn-success">{% fa5_icon 'plus' 'fas' %} {% trans "Add another slot" %}</a>
</div> </div>
{% endif %} {% endif %}
{% if 'AKPlan'|check_app_installed %} {% if 'AKPlan'|check_app_installed %}
<div id='akSlotCalendar' style="margin-top: 50px;margin-bottom: 50px;"></div> <div id='akSlotCalendar' style="margin-top: 50px;margin-bottom: 50px;"></div>
{% endif %} {% endif %}
<h4 style="margin-top: 30px;">{% trans "Possible Times" %}</h4> <h4 style="margin-top: 30px;">{% trans "Possible Times" %}</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr>
<th>{% trans "Start" %}</th>
<th>{% trans "End" %}</th>
</tr>
</thead>
<tbody>
{% for a in availabilities %}
<tr> <tr>
<td>{{ a.start | timezone:event.timezone | date:"l H:i" }}</td> <th>{% trans "Start" %}</th>
<td>{{ a.end | timezone:event.timezone | date:"l H:i" }}</td> <th>{% trans "End" %}</th>
</tr> </tr>
{% endfor %} </thead>
</tbody> <tbody>
</table> {% for a in availabilities %}
<tr>
<td>{{ a.start | timezone:event.timezone | date:"l H:i" }}</td>
<td>{{ a.end | timezone:event.timezone | date:"l H:i" }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endif %}
{% endblock %} {% endblock %}
AKSubmission/views.py
View file @ b6d4bdde
...@@ -223,10 +223,11 @@ class AKAndAKWishSubmissionView(EventSlugMixin, EventInactiveRedirectMixin, Crea ...@@ -223,10 +223,11 @@ class AKAndAKWishSubmissionView(EventSlugMixin, EventInactiveRedirectMixin, Crea
tag, was_created = AKTag.objects.get_or_create(name=tag_name) tag, was_created = AKTag.objects.get_or_create(name=tag_name)
self.object.tags.add(tag) self.object.tags.add(tag)
# Generate slot(s) # Generate slot(s) (but not for wishes)
for duration in form.cleaned_data["durations"]: if "durations" in form.cleaned_data:
new_slot = AKSlot(ak=self.object, duration=duration, event=self.object.event) for duration in form.cleaned_data["durations"]:
new_slot.save() new_slot = AKSlot(ak=self.object, duration=duration, event=self.object.event)
new_slot.save()
return super_form_valid return super_form_valid
...@@ -269,6 +270,8 @@ class AKEditView(EventSlugMixin, EventInactiveRedirectMixin, UpdateView): ...@@ -269,6 +270,8 @@ class AKEditView(EventSlugMixin, EventInactiveRedirectMixin, UpdateView):
return redirect(reverse_lazy('submit:submission_overview', return redirect(reverse_lazy('submit:submission_overview',
kwargs={'event_slug': form.cleaned_data["event"].slug})) kwargs={'event_slug': form.cleaned_data["event"].slug}))
previous_owner_count = self.object.owners.count()
super_form_valid = super().form_valid(form) super_form_valid = super().form_valid(form)
# Detach existing tags # Detach existing tags
...@@ -279,6 +282,17 @@ class AKEditView(EventSlugMixin, EventInactiveRedirectMixin, UpdateView): ...@@ -279,6 +282,17 @@ class AKEditView(EventSlugMixin, EventInactiveRedirectMixin, UpdateView):
tag, was_created = AKTag.objects.get_or_create(name=tag_name) tag, was_created = AKTag.objects.get_or_create(name=tag_name)
self.object.tags.add(tag) self.object.tags.add(tag)
# Did this AK change from wish to AK or vice versa?
new_owner_count = self.object.owners.count()
# Now AK:
if previous_owner_count == 0 and new_owner_count > 0 and self.object.akslot_set.count() == 0:
# Create one slot with default length
AKSlot.objects.create(ak=self.object, duration=self.object.event.default_slot, event=self.object.event)
# Now wish:
elif previous_owner_count > 0 and new_owner_count == 0:
# Delete all unscheduled slots
self.object.akslot_set.filter(start__isnull=True).delete()
return super_form_valid return super_form_valid
......