Skip to content
Snippets Groups Projects
Commit 8db9661b authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

Merge branch 'plan-adapt' into 'master' 

Improve plan

Closes #22 and #28

See merge request !22
parents 7de7e8b0 64613992
No related branches found
No related tags found
1 merge request!22Improve plan
Hide whitespace changes
Inline Side-by-side
Showing
with 224 additions and 176 deletions
AKDashboard/locale/de_DE/LC_MESSAGES/django.po
+ 9
− 5
View file @ 8db9661b
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-10 16:22+0000\n"
"POT-Creation-Date: 2020-05-11 20:45+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"
......@@ -73,20 +73,24 @@ msgstr "Aktuelle AKs"
msgid "AK Wall"
msgstr "AK-Wall"
#: AKDashboard/templates/AKDashboard/dashboard.html:56
#: AKDashboard/templates/AKDashboard/dashboard.html:55
msgid "Schedule"
msgstr "AK-Plan"
#: AKDashboard/templates/AKDashboard/dashboard.html:65
msgid "AK Submission"
msgstr "AK-Submission"
#: AKDashboard/templates/AKDashboard/dashboard.html:72
#: AKDashboard/templates/AKDashboard/dashboard.html:81
msgid "Write to organizers of this event for questions and comments"
msgstr ""
"Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren"
#: AKDashboard/templates/AKDashboard/dashboard.html:79
#: AKDashboard/templates/AKDashboard/dashboard.html:88
msgid "Currently, there are no Events!"
msgstr "Aktuell gibt es keine Events!"
#: AKDashboard/templates/AKDashboard/dashboard.html:82
#: AKDashboard/templates/AKDashboard/dashboard.html:91
msgid "Please contact an administrator if you want to use AKPlanning."
msgstr ""
"Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden "
......
AKDashboard/templates/AKDashboard/dashboard.html
+ 24
− 15
View file @ 8db9661b
......@@ -32,21 +32,30 @@
</a>
{% endif %}
{% if 'AKPlan'|check_app_installed %}
<a class="dashboard-box btn btn-primary"
href="{% url 'plan:plan_overview' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-clock"></span>
<span class='text'>{% trans 'Current AKs' %}</span>
</div>
</a>
<a class="dashboard-box btn btn-primary"
href="{% url 'plan:plan_wall' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-calendar"></span>
<span class='text'>{% trans 'AK Wall' %}</span>
</div>
</a>
{% if event.active %}
<a class="dashboard-box btn btn-primary"
href="{% url 'plan:plan_overview' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-clock"></span>
<span class='text'>{% trans 'Current AKs' %}</span>
</div>
</a>
<a class="dashboard-box btn btn-primary"
href="{% url 'plan:plan_wall' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-calendar"></span>
<span class='text'>{% trans 'AK Wall' %}</span>
</div>
</a>
{% else %}
<a class="dashboard-box btn btn-primary"
href="{% url 'plan:plan_overview' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-calendar-alt"></span>
<span class='text'>{% trans 'Schedule' %}</span>
</div>
</a>
{% endif %}
{% endif %}
{% if 'AKSubmission'|check_app_installed %}
<a class="dashboard-box btn btn-primary"
......
AKModel/locale/de_DE/LC_MESSAGES/django.po
+ 86
− 86
View file @ 8db9661b
......@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-10 20:54+0000\n"
"POT-Creation-Date: 2020-05-11 20:45+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -27,15 +27,15 @@ msgstr "Ist kein Wunsch"
msgid "Export to wiki syntax"
msgstr "In Wiki-Syntax exportieren"
#: AKModel/availability.py:38 AKModel/models.py:37 AKModel/models.py:65
#: AKModel/models.py:117 AKModel/models.py:136 AKModel/models.py:168
#: AKModel/models.py:221 AKModel/models.py:261 AKModel/models.py:291
#: AKModel/availability.py:38 AKModel/models.py:37 AKModel/models.py:61
#: AKModel/models.py:113 AKModel/models.py:132 AKModel/models.py:164
#: AKModel/models.py:217 AKModel/models.py:257 AKModel/models.py:287
msgid "Event"
msgstr "Event"
#: AKModel/availability.py:39 AKModel/models.py:66 AKModel/models.py:118
#: AKModel/models.py:137 AKModel/models.py:169 AKModel/models.py:222
#: AKModel/models.py:262 AKModel/models.py:292
#: AKModel/availability.py:39 AKModel/models.py:62 AKModel/models.py:114
#: AKModel/models.py:133 AKModel/models.py:165 AKModel/models.py:218
#: AKModel/models.py:258 AKModel/models.py:288
msgid "Associated event"
msgstr "Zugehöriges Event"
......@@ -47,7 +47,7 @@ msgstr "Person"
msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird"
#: AKModel/availability.py:56 AKModel/models.py:265 AKModel/models.py:284
#: AKModel/availability.py:56 AKModel/models.py:261 AKModel/models.py:280
msgid "Room"
msgstr "Raum"
......@@ -55,7 +55,7 @@ msgstr "Raum"
msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
#: AKModel/availability.py:65 AKModel/models.py:225 AKModel/models.py:283
#: AKModel/availability.py:65 AKModel/models.py:221 AKModel/models.py:279
msgid "AK"
msgstr "AK"
......@@ -63,7 +63,7 @@ msgstr "AK"
msgid "AK whose availability this is"
msgstr "Verfügbarkeiten"
#: AKModel/availability.py:74 AKModel/models.py:121
#: AKModel/availability.py:74 AKModel/models.py:117
msgid "AK Category"
msgstr "AK Kategorie"
......@@ -79,9 +79,9 @@ msgstr "Verfügbarkeit"
msgid "Availabilities"
msgstr "Verfügbarkeiten"
#: AKModel/models.py:14 AKModel/models.py:112 AKModel/models.py:133
#: AKModel/models.py:152 AKModel/models.py:166 AKModel/models.py:184
#: AKModel/models.py:254
#: AKModel/models.py:14 AKModel/models.py:108 AKModel/models.py:129
#: AKModel/models.py:148 AKModel/models.py:162 AKModel/models.py:180
#: AKModel/models.py:250
msgid "Name"
msgstr "Name"
......@@ -171,206 +171,206 @@ msgstr ""
msgid "Events"
msgstr "Events"
#: AKModel/models.py:60
#: AKModel/models.py:56
msgid "Nickname"
msgstr "Spitzname"
#: AKModel/models.py:60
#: AKModel/models.py:56
msgid "Name to identify an AK owner by"
msgstr "Name durch den eine AK Leitung identifiziert wird"
#: AKModel/models.py:61
#: AKModel/models.py:57
msgid "Slug"
msgstr "Slug"
#: AKModel/models.py:61
#: AKModel/models.py:57
msgid "Slug for URL generation"
msgstr "Slug für URL-Generierung"
#: AKModel/models.py:62
#: AKModel/models.py:58
msgid "Institution"
msgstr "Instutution"
#: AKModel/models.py:62
#: AKModel/models.py:58
msgid "Uni etc."
msgstr "Universität o.ä."
#: AKModel/models.py:63 AKModel/models.py:193
#: AKModel/models.py:59 AKModel/models.py:189
msgid "Web Link"
msgstr "Internet Link"
#: AKModel/models.py:63
#: AKModel/models.py:59
msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite"
#: AKModel/models.py:69
#: AKModel/models.py:65
msgid "AK Owner"
msgstr "AK Leitung"
#: AKModel/models.py:70
#: AKModel/models.py:66
msgid "AK Owners"
msgstr "AK Leitungen"
#: AKModel/models.py:112
#: AKModel/models.py:108
msgid "Name of the AK Category"
msgstr "Name des AK Kategorie"
#: AKModel/models.py:113 AKModel/models.py:134
#: AKModel/models.py:109 AKModel/models.py:130
msgid "Color"
msgstr "Farbe"
#: AKModel/models.py:113 AKModel/models.py:134
#: AKModel/models.py:109 AKModel/models.py:130
msgid "Color for displaying"
msgstr "Farbe für die Anzeige"
#: AKModel/models.py:114 AKModel/models.py:187
#: AKModel/models.py:110 AKModel/models.py:183
msgid "Description"
msgstr "Beschreibung"
#: AKModel/models.py:115
#: AKModel/models.py:111
msgid "Short description of this AK Category"
msgstr "Beschreibung der AK-Kategorie"
#: AKModel/models.py:122
#: AKModel/models.py:118
msgid "AK Categories"
msgstr "AK Kategorien"
#: AKModel/models.py:133
#: AKModel/models.py:129
msgid "Name of the AK Track"
msgstr "Name des AK Tracks"
#: AKModel/models.py:140
#: AKModel/models.py:136
msgid "AK Track"
msgstr "AK Track"
#: AKModel/models.py:141
#: AKModel/models.py:137
msgid "AK Tracks"
msgstr "AK Tracks"
#: AKModel/models.py:152
#: AKModel/models.py:148
msgid "Name of the AK Tag"
msgstr "Name das AK Tags"
#: AKModel/models.py:155
#: AKModel/models.py:151
msgid "AK Tag"
msgstr "AK Tag"
#: AKModel/models.py:156
#: AKModel/models.py:152
msgid "AK Tags"
msgstr "AK Tags"
#: AKModel/models.py:166
#: AKModel/models.py:162
msgid "Name of the Requirement"
msgstr "Name der Anforderung"
#: AKModel/models.py:172
#: AKModel/models.py:168
msgid "AK Requirement"
msgstr "AK Anforderung"
#: AKModel/models.py:173
#: AKModel/models.py:169
msgid "AK Requirements"
msgstr "AK Anforderungen"
#: AKModel/models.py:184
#: AKModel/models.py:180
msgid "Name of the AK"
msgstr "Name des AKs"
#: AKModel/models.py:185
#: AKModel/models.py:181
msgid "Short Name"
msgstr "Kurzer Name"
#: AKModel/models.py:186
#: AKModel/models.py:182
msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK Plan"
#: AKModel/models.py:187
#: AKModel/models.py:183
msgid "Description of the AK"
msgstr "Beschreibung des AKs"
#: AKModel/models.py:189
#: AKModel/models.py:185
msgid "Owners"
msgstr "Leitungen"
#: AKModel/models.py:190
#: AKModel/models.py:186
msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten"
#: AKModel/models.py:193
#: AKModel/models.py:189
msgid "Link to wiki page"
msgstr "Link zur Wiki Seite"
#: AKModel/models.py:195
#: AKModel/models.py:191
msgid "Category"
msgstr "Kategorie"
#: AKModel/models.py:196
#: AKModel/models.py:192
msgid "Category of the AK"
msgstr "Kategorie des AKs"
#: AKModel/models.py:197
#: AKModel/models.py:193
msgid "Tags"
msgstr "Tags"
#: AKModel/models.py:197
#: AKModel/models.py:193
msgid "Tags provided by owners"
msgstr "Tags, die durch die AK Leitung vergeben wurden"
#: AKModel/models.py:198
#: AKModel/models.py:194
msgid "Track"
msgstr "Track"
#: AKModel/models.py:199
#: AKModel/models.py:195
msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört"
#: AKModel/models.py:201
#: AKModel/models.py:197
msgid "Resolution Intention"
msgstr "Resolutionsabsicht"
#: AKModel/models.py:202
#: AKModel/models.py:198
msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen"
#: AKModel/models.py:203
#: AKModel/models.py:199
msgid "Present this AK"
msgstr "AK Präsentieren"
#: AKModel/models.py:204
#: AKModel/models.py:200
msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen"
#: AKModel/models.py:206
#: AKModel/models.py:202
msgid "Requirements"
msgstr "Anforderungen"
#: AKModel/models.py:207
#: AKModel/models.py:203
msgid "AK's Requirements"
msgstr "Anforderungen des AKs"
#: AKModel/models.py:209
#: AKModel/models.py:205
msgid "Conflicting AKs"
msgstr "AK Konflikte"
#: AKModel/models.py:210
#: AKModel/models.py:206
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:211
#: AKModel/models.py:207
msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs"
#: AKModel/models.py:212
#: AKModel/models.py:208
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:214
#: AKModel/models.py:210
#, fuzzy
#| msgid "Internal Notes"
msgid "Organizational Notes"
msgstr "Interne Notizen"
#: AKModel/models.py:215
#: AKModel/models.py:211
msgid ""
"Notes to organizers. These are public. For private notes, please send an e-"
"mail."
......@@ -378,97 +378,97 @@ msgstr ""
"Notizen an die Organisator*innen. Diese sind öffentlich, für private "
"Anmerkungen bitte eine E-Mail schicken."
#: AKModel/models.py:217
#: AKModel/models.py:213
msgid "Interest"
msgstr "Interesse"
#: AKModel/models.py:217
#: AKModel/models.py:213
msgid "Expected number of people"
msgstr "Erwartete Personenzahl"
#: AKModel/models.py:218
#: AKModel/models.py:214
#, fuzzy
#| msgid "Interest"
msgid "Interest Counter"
msgstr "Interesse"
#: AKModel/models.py:219
#: AKModel/models.py:215
msgid "People who have indicated interest online"
msgstr "Anzahl Personen, die online Interesse bekundet haben"
#: AKModel/models.py:226
#: AKModel/models.py:222
msgid "AKs"
msgstr "AKs"
#: AKModel/models.py:254
#: AKModel/models.py:250
msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums"
#: AKModel/models.py:255
#: AKModel/models.py:251
msgid "Building"
msgstr "Gebäude"
#: AKModel/models.py:256
#: AKModel/models.py:252
msgid "Name or number of the building"
msgstr "Name oder Nummer des Gebäudes"
#: AKModel/models.py:257
#: AKModel/models.py:253
msgid "Capacity"
msgstr "Kapazität"
#: AKModel/models.py:257
#: AKModel/models.py:253
msgid "Maximum number of people"
msgstr "Maximale Personenzahl"
#: AKModel/models.py:258
#: AKModel/models.py:254
msgid "Properties"
msgstr "Eigenschaften"
#: AKModel/models.py:259
#: AKModel/models.py:255
msgid "AK requirements fulfilled by the room"
msgstr "AK Anforderungen, die dieser Raum erfüllt"
#: AKModel/models.py:266
#: AKModel/models.py:262
msgid "Rooms"
msgstr "Räume"
#: AKModel/models.py:283
#: AKModel/models.py:279
msgid "AK being mapped"
msgstr "AK, der zugeordnet wird"
#: AKModel/models.py:285
#: AKModel/models.py:281
msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet"
#: AKModel/models.py:286
#: AKModel/models.py:282
msgid "Slot Begin"
msgstr "Beginn des Slots"
#: AKModel/models.py:286
#: AKModel/models.py:282
msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt"
#: AKModel/models.py:288
#: AKModel/models.py:284
msgid "Duration"
msgstr "Dauer"
#: AKModel/models.py:289
#: AKModel/models.py:285
msgid "Length in hours"
msgstr "Länge in Stunden"
#: AKModel/models.py:294
#: AKModel/models.py:290
msgid "Last update"
msgstr "Letzte Aktualisierung"
#: AKModel/models.py:297
#: AKModel/models.py:293
msgid "AK Slot"
msgstr "AK Slot"
#: AKModel/models.py:298
#: AKModel/models.py:294
msgid "AK Slots"
msgstr "AK Slot"
#: AKModel/models.py:312
#: AKModel/models.py:308
msgid "Not scheduled yet"
msgstr "Noch nicht geplant"
......
AKPlan/locale/de_DE/LC_MESSAGES/django.po
+ 10
− 6
View file @ 8db9661b
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-10 16:22+0000\n"
"POT-Creation-Date: 2020-05-11 20:45+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"
......@@ -40,30 +40,34 @@ msgstr "Veranstaltung"
msgid "Room"
msgstr "Raum"
#: AKPlan/templates/AKPlan/plan_index.html:80
#: AKPlan/templates/AKPlan/plan_index.html:81
#: AKPlan/templates/AKPlan/plan_room.html:34
msgid "Rooms"
msgstr "Räume"
#: AKPlan/templates/AKPlan/plan_index.html:88
#: AKPlan/templates/AKPlan/plan_index.html:91
#: AKPlan/templates/AKPlan/plan_track.html:34
msgid "Tracks"
msgstr "Tracks"
#: AKPlan/templates/AKPlan/plan_index.html:96
#: AKPlan/templates/AKPlan/plan_index.html:102
msgid "AK Wall"
msgstr "AK-Wall"
#: AKPlan/templates/AKPlan/plan_index.html:106
#: AKPlan/templates/AKPlan/plan_index.html:114
#: AKPlan/templates/AKPlan/plan_wall.html:88
msgid "Current AKs"
msgstr "Aktuelle AKs"
#: AKPlan/templates/AKPlan/plan_index.html:113
#: AKPlan/templates/AKPlan/plan_index.html:121
#: AKPlan/templates/AKPlan/plan_wall.html:93
msgid "Next AKs"
msgstr "Nächste AKs"
#: AKPlan/templates/AKPlan/plan_index.html:129
msgid "This event is not active."
msgstr "Dieses Event ist nicht aktiv."
#: AKPlan/templates/AKPlan/plan_track.html:8
#: AKPlan/templates/AKPlan/plan_track.html:44
msgid "Track"
......
AKPlan/templates/AKPlan/plan_index.html
+ 51
− 32
View file @ 8db9661b
......@@ -76,25 +76,36 @@
{% block content %}
<div class="float-right">
<ul class="nav nav-pills">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{% trans "Rooms" %}</a>
<div class="dropdown-menu" style="">
{% for r in event.room_set.all %}
<a class="dropdown-item" href="{% url "plan:plan_room" event_slug=event.slug pk=r.pk %}">{{ r }}</a>
{% endfor %}
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{% trans "Tracks" %}</a>
<div class="dropdown-menu">
{% for t in event.aktrack_set.all %}
<a class="dropdown-item" href="{% url "plan:plan_track" event_slug=event.slug pk=t.pk %}">{{ t }}</a>
{% endfor %}
</div>
</li>
<li class="nav-item">
<a class="nav-link active" href="{% url 'plan:plan_wall' event_slug=event.slug %}">{% fa5_icon 'desktop' 'fas' %}&nbsp;&nbsp;{% trans "AK Wall" %}</a>
</li>
{% if event.room_set.count > 0 %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
aria-expanded="false">{% trans "Rooms" %}</a>
<div class="dropdown-menu" style="">
{% for r in event.room_set.all %}
<a class="dropdown-item"
href="{% url "plan:plan_room" event_slug=event.slug pk=r.pk %}">{{ r }}</a>
{% endfor %}
</div>
</li>
{% endif %}
{% if event.aktrack_set.count > 0 %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
aria-expanded="false">{% trans "Tracks" %}</a>
<div class="dropdown-menu">
{% for t in event.aktrack_set.all %}
<a class="dropdown-item"
href="{% url "plan:plan_track" event_slug=event.slug pk=t.pk %}">{{ t }}</a>
{% endfor %}
</div>
</li>
{% endif %}
{% if event.active %}
<li class="nav-item">
<a class="nav-link active"
href="{% url 'plan:plan_wall' event_slug=event.slug %}">{% fa5_icon 'desktop' 'fas' %}&nbsp;&nbsp;{% trans "AK Wall" %}</a>
</li>
{% endif %}
</ul>
</div>
......@@ -102,19 +113,27 @@
{% timezone event.timezone %}
<div class="row" style="margin-top:30px;">
<div class="col-md-6">
<h2><a name="currentAKs">{% trans "Current AKs" %}:</a></h2>
{% with akslots_now as slots %}
{% include "AKPlan/slots_table.html" %}
{% endwith %}
</div>
<div class="col-md-6">
<h2><a name="currentAKs">{% trans "Next AKs" %}:</a></h2>
{% with akslots_next as slots %}
{% include "AKPlan/slots_table.html" %}
{% endwith %}
</div>
{% if event.active %}
<div class="col-md-6">
<h2><a name="currentAKs">{% trans "Current AKs" %}:</a></h2>
{% with akslots_now as slots %}
{% include "AKPlan/slots_table.html" %}
{% endwith %}
</div>
<div class="col-md-6">
<h2><a name="currentAKs">{% trans "Next AKs" %}:</a></h2>
{% with akslots_next as slots %}
{% include "AKPlan/slots_table.html" %}
{% endwith %}
</div>
{% else %}
<div class="col-md-12">
<div class="alert alert-warning">
<p class="mb-0">{% trans "This event is not active." %}</p>
</div>
</div>
{% endif %}
<div class="col-md-12">
<div id="planCalendar" style="margin-top:30px;"></div>
......
AKPlan/views.py
+ 9
− 0
View file @ 8db9661b
from datetime import timedelta
from django.conf import settings
from django.shortcuts import redirect
from django.urls import reverse_lazy
from django.utils.datetime_safe import datetime
from django.views.generic import ListView, DetailView
......@@ -58,6 +60,13 @@ class PlanIndexView(FilterByEventSlugMixin, ListView):
class PlanScreenView(PlanIndexView):
template_name = "AKPlan/plan_wall.html"
def get(self, request, *args, **kwargs):
s = super().get(request, *args, **kwargs)
# Don't show wall when event is not active -> redirect to normal schedule
if not self.event.active:
return redirect(reverse_lazy("plan:plan_overview", kwargs={"event_slug": self.event.slug}))
return s
def get_queryset(self):
# Determine interesting range (some hours ago until some hours in the future as specified in the settings)
now = datetime.now().astimezone(self.event.timezone)
......
AKSubmission/locale/de_DE/LC_MESSAGES/django.po
+ 35
− 32
View file @ 8db9661b
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-10 20:54+0000\n"
"POT-Creation-Date: 2020-05-11 20:45+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"
......@@ -21,16 +21,16 @@ msgstr ""
msgid "Separate multiple tags with semicolon"
msgstr "Mehrere Tags mit Semikolon trennen"
#: AKSubmission/forms.py:69
#: AKSubmission/forms.py:71
#, python-format
msgid "\"%(duration)s\" is not a valid duration"
msgstr "\"%(duration)s\" ist keine gültige Dauer"
#: AKSubmission/forms.py:112
#: AKSubmission/forms.py:114
msgid "Duration(s)"
msgstr "Dauer(n)"
#: AKSubmission/forms.py:114
#: AKSubmission/forms.py:116
msgid ""
"Enter at least one planned duration (in hours). If your AK should have "
"multiple slots, use multiple lines"
......@@ -69,69 +69,68 @@ msgstr "AK"
msgid "AK Submission"
msgstr "AK-Eintragung"
#: AKSubmission/templates/AKSubmission/ak_detail.html:29
#: AKSubmission/templates/AKSubmission/ak_detail.html:30
msgid "Interest"
msgstr "Interesse"
#: AKSubmission/templates/AKSubmission/ak_detail.html:42
#: AKSubmission/templates/AKSubmission/ak_detail.html:43
#: AKSubmission/templates/AKSubmission/ak_list_table.html:32
msgid "AK Wish"
msgstr "AK-Wunsch"
#: AKSubmission/templates/AKSubmission/ak_detail.html:46
#: AKSubmission/templates/AKSubmission/ak_detail.html:47
#: AKSubmission/templates/AKSubmission/ak_list_table.html:10
msgid "Who?"
msgstr "Wer?"
#: AKSubmission/templates/AKSubmission/ak_detail.html:50
#: AKSubmission/templates/AKSubmission/ak_detail.html:51
#: AKSubmission/templates/AKSubmission/ak_list_table.html:11
msgid "Category"
msgstr "Kategorie"
#: AKSubmission/templates/AKSubmission/ak_detail.html:56
#: AKSubmission/templates/AKSubmission/ak_detail.html:57
msgid "Present this AK"
msgstr "Diesen AK vorstellen"
#: AKSubmission/templates/AKSubmission/ak_detail.html:60
#: AKSubmission/templates/AKSubmission/ak_list.html:35
#: AKSubmission/templates/AKSubmission/ak_detail.html:61
#: AKSubmission/templates/AKSubmission/ak_list_table.html:12
msgid "Tags"
msgstr "Tags"
#: AKSubmission/templates/AKSubmission/ak_detail.html:66
#: AKSubmission/templates/AKSubmission/ak_detail.html:67
msgid "Reso?"
msgstr "Reso?"
#: AKSubmission/templates/AKSubmission/ak_detail.html:73
#: AKSubmission/templates/AKSubmission/ak_detail.html:74
msgid "Requirements"
msgstr "Anforderungen"
#: AKSubmission/templates/AKSubmission/ak_detail.html:86
#: AKSubmission/templates/AKSubmission/ak_detail.html:87
msgid "Conflicting AKs"
msgstr "AK Konflikte"
#: AKSubmission/templates/AKSubmission/ak_detail.html:94
#: AKSubmission/templates/AKSubmission/ak_detail.html:95
msgid "Prerequisite AKs"
msgstr "AK Voraussetzungen"
#: AKSubmission/templates/AKSubmission/ak_detail.html:102
#: AKSubmission/templates/AKSubmission/ak_detail.html:103
msgid "Notes"
msgstr "Notizen"
#: AKSubmission/templates/AKSubmission/ak_detail.html:119
#: AKSubmission/templates/AKSubmission/ak_detail.html:120
msgid "When?"
msgstr "Wann?"
#: AKSubmission/templates/AKSubmission/ak_detail.html:120
#: AKSubmission/templates/AKSubmission/ak_detail.html:121
#: AKSubmission/templates/AKSubmission/akslot_delete.html:35
msgid "Duration"
msgstr "Dauer"
#: AKSubmission/templates/AKSubmission/ak_detail.html:121
#: AKSubmission/templates/AKSubmission/ak_detail.html:122
msgid "Room"
msgstr "Raum"
#: AKSubmission/templates/AKSubmission/ak_detail.html:147
#: AKSubmission/templates/AKSubmission/ak_detail.html:148
msgid "Add another slot"
msgstr "Einen neuen AK-Slot hinzufügen"
......@@ -149,10 +148,14 @@ msgstr "Bearbeiten"
msgid "AK List"
msgstr "AK Liste"
#: AKSubmission/templates/AKSubmission/ak_list.html:29
#: AKSubmission/templates/AKSubmission/ak_list.html:30
msgid "Categories"
msgstr "Kategorie"
#: AKSubmission/templates/AKSubmission/ak_list.html:37
msgid "Tracks"
msgstr ""
#: AKSubmission/templates/AKSubmission/ak_list_table.html:9
msgid "Name"
msgstr "Name"
......@@ -257,48 +260,48 @@ msgstr "Aktuelle AKs"
msgid "Submit"
msgstr "Eintragen"
#: AKSubmission/views.py:42
#: AKSubmission/views.py:39
msgid "Wishes"
msgstr "Wünsche"
#: AKSubmission/views.py:42
#: AKSubmission/views.py:39
msgid "AKs one would like to have"
msgstr ""
"AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie "
"macht. Falls du dir das vorstellen kannst, trag dich einfach ein"
#: AKSubmission/views.py:103
#: AKSubmission/views.py:113
msgid "AK successfully created"
msgstr "AK erfolgreich angelegt"
#: AKSubmission/views.py:156
#: AKSubmission/views.py:166
msgid "AK successfully updated"
msgstr "AK erfolgreich aktualisiert"
#: AKSubmission/views.py:222
#: AKSubmission/views.py:233
msgid "Person Info successfully updated"
msgstr "Personen-Info erfolgreich aktualisiert"
#: AKSubmission/views.py:235
#: AKSubmission/views.py:246
msgid "No user selected"
msgstr "Keine Person ausgewählt"
#: AKSubmission/views.py:261
#: AKSubmission/views.py:272
msgid "AK Slot successfully added"
msgstr "AK-Slot erfolgreich angelegt"
#: AKSubmission/views.py:275
#: AKSubmission/views.py:286
msgid "You cannot edit a slot that has already been scheduled"
msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden"
#: AKSubmission/views.py:285
#: AKSubmission/views.py:296
msgid "AK Slot successfully updated"
msgstr "AK-Slot erfolgreich aktualisiert"
#: AKSubmission/views.py:298
#: AKSubmission/views.py:309
msgid "You cannot delete a slot that has already been scheduled"
msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden"
#: AKSubmission/views.py:308
#: AKSubmission/views.py:319
msgid "AK Slot successfully deleted"
msgstr "AK-Slot erfolgreich angelegt"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment