From 7098b23c58866931d52e0a2022c2f2aa807df90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Sat, 21 May 2022 18:06:47 +0200
Subject: [PATCH 1/3] Hide slot durations in presentation version of slides
This is part of #123
---
AKModel/templates/admin/AKModel/export/slides.tex | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/AKModel/templates/admin/AKModel/export/slides.tex b/AKModel/templates/admin/AKModel/export/slides.tex
index ff949585..a30f8d8b 100644
--- a/AKModel/templates/admin/AKModel/export/slides.tex
+++ b/AKModel/templates/admin/AKModel/export/slides.tex
@@ -45,7 +45,9 @@
\faUser~ {{ ak.owners_list | latex_escape }}
- \faClock~ {{ak.durations_list}}
+ {% if not result_presentation_mode %}
+ \faClock~ {{ak.durations_list}}
+ {% endif %}
{% if ak.reso %}
\faScroll
--
GitLab
From 09190d05790ca16ed4d3974fff58eb827aef3c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Sat, 21 May 2022 18:28:09 +0200
Subject: [PATCH 2/3] Link presentation mode of slides on status page
This implements #139
---
AKModel/locale/de_DE/LC_MESSAGES/django.po | 18 +++++++++++-------
AKModel/templates/admin/AKModel/status.html | 4 +++-
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po
index b4020bb5..1eb0d565 100644
--- a/AKModel/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-29 13:36+0000\n"
+"POT-Creation-Date: 2022-05-21 16:20+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"
@@ -459,7 +459,7 @@ msgstr "AK präsentieren"
msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen"
-#: AKModel/models.py:261 AKModel/templates/admin/AKModel/status.html:91
+#: AKModel/models.py:261 AKModel/templates/admin/AKModel/status.html:93
msgid "Requirements"
msgstr "Anforderungen"
@@ -872,7 +872,7 @@ msgid "No AKs with this requirement"
msgstr "Kein AK mit dieser Anforderung"
#: AKModel/templates/admin/AKModel/requirements_overview.html:45
-#: AKModel/templates/admin/AKModel/status.html:107
+#: AKModel/templates/admin/AKModel/status.html:109
msgid "Add Requirement"
msgstr "Anforderung hinzufügen"
@@ -929,19 +929,23 @@ msgstr "AKs im Wiki-Format exportieren"
msgid "Export AK Slides"
msgstr "AK-Folien exportieren"
-#: AKModel/templates/admin/AKModel/status.html:93
+#: AKModel/templates/admin/AKModel/status.html:90
+msgid "Export AK Slides (Presentation AKs only)"
+msgstr "AK-Folien exportieren (Nur zu präsentierende AKs)"
+
+#: AKModel/templates/admin/AKModel/status.html:95
msgid "No requirements yet"
msgstr "Bisher keine Anforderungen"
-#: AKModel/templates/admin/AKModel/status.html:106
+#: AKModel/templates/admin/AKModel/status.html:108
msgid "Show AKs for requirements"
msgstr "Zu Anforderungen gehörige AKs anzeigen"
-#: AKModel/templates/admin/AKModel/status.html:110
+#: AKModel/templates/admin/AKModel/status.html:112
msgid "Messages"
msgstr "Nachrichten"
-#: AKModel/templates/admin/AKModel/status.html:112
+#: AKModel/templates/admin/AKModel/status.html:114
msgid "Delete all messages"
msgstr "Alle Nachrichten löschen"
diff --git a/AKModel/templates/admin/AKModel/status.html b/AKModel/templates/admin/AKModel/status.html
index 8ccf44e3..2720ea86 100644
--- a/AKModel/templates/admin/AKModel/status.html
+++ b/AKModel/templates/admin/AKModel/status.html
@@ -85,7 +85,9 @@
<a class="btn btn-success"
href="{% url 'admin:ak_wiki_export' slug=event.slug %}">{% trans "Export AKs for Wiki" %}</a>
<a class="btn btn-success"
- href="{% url 'admin:ak_slide_export' event_slug=event.slug %}">{% trans "Export AK Slides" %}</a>
+ href="{% url 'admin:ak_slide_export' event_slug=event.slug %}?num_next=3">{% trans "Export AK Slides" %}</a>
+ <a class="btn btn-success"
+ href="{% url 'admin:ak_slide_export' event_slug=event.slug %}?num_next=3&presentation_mode">{% trans "Export AK Slides (Presentation AKs only)" %}</a>
{% endif %}
<h3 class="block-header">{% trans "Requirements" %}</h3>
--
GitLab
From 9af297bfa6d70e5a68e06b636e3fae6ca97e3d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Sat, 21 May 2022 18:42:26 +0200
Subject: [PATCH 3/3] Introduce note space parameter for slide export
One can now specify whether there should be symbols for owner and duration of a wish such that the person leading the plenum can write one the slides if some is interested in becoming owner of the AK or not. The default link on the status page hides those symbols.
---
AKModel/templates/admin/AKModel/export/slides.tex | 2 ++
AKModel/templates/admin/AKModel/status.html | 2 +-
AKModel/views.py | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/AKModel/templates/admin/AKModel/export/slides.tex b/AKModel/templates/admin/AKModel/export/slides.tex
index a30f8d8b..a74b7536 100644
--- a/AKModel/templates/admin/AKModel/export/slides.tex
+++ b/AKModel/templates/admin/AKModel/export/slides.tex
@@ -86,9 +86,11 @@
\faFilter~ {{ ak.category.name | latex_escape }}
+ {% if space_for_notes_in_wishes %}
\faUser~
\faClock~
+ {% endif %}
{{ ak.description | truncatechars(280) | latex_escape }}
diff --git a/AKModel/templates/admin/AKModel/status.html b/AKModel/templates/admin/AKModel/status.html
index 2720ea86..1af396e8 100644
--- a/AKModel/templates/admin/AKModel/status.html
+++ b/AKModel/templates/admin/AKModel/status.html
@@ -85,7 +85,7 @@
<a class="btn btn-success"
href="{% url 'admin:ak_wiki_export' slug=event.slug %}">{% trans "Export AKs for Wiki" %}</a>
<a class="btn btn-success"
- href="{% url 'admin:ak_slide_export' event_slug=event.slug %}?num_next=3">{% trans "Export AK Slides" %}</a>
+ href="{% url 'admin:ak_slide_export' event_slug=event.slug %}?num_next=3&wish_notes=False">{% trans "Export AK Slides" %}</a>
<a class="btn btn-success"
href="{% url 'admin:ak_slide_export' event_slug=event.slug %}?num_next=3&presentation_mode">{% trans "Export AK Slides (Presentation AKs only)" %}</a>
{% endif %}
diff --git a/AKModel/views.py b/AKModel/views.py
index 539c4f43..2729bdb6 100644
--- a/AKModel/views.py
+++ b/AKModel/views.py
@@ -312,6 +312,7 @@ def export_slides(request, event_slug):
NEXT_AK_LIST_LENGTH = int(request.GET["num_next"]) if "num_next" in request.GET else 3
RESULT_PRESENTATION_MODE = True if "presentation_mode" in request.GET else False
+ SPACE_FOR_NOTES_IN_WISHES = request.GET["wish_notes"] == "True" if "wish_notes" in request.GET else False
translations = {
'symbols': _("Symbols"),
@@ -337,6 +338,7 @@ def export_slides(request, event_slug):
"wishes": build_ak_list_with_next_aks(ak_wishes),
"translations": translations,
"result_presentation_mode": RESULT_PRESENTATION_MODE,
+ "space_for_notes_in_wishes": SPACE_FOR_NOTES_IN_WISHES,
}
return render_to_pdf(request, template_name, context, filename='slides.pdf')
--
GitLab