Merge branch 'improve-slides' into 'main'

Improve slide export

Closes #139

See merge request !119

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"
 

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
@@ -84,9 +86,11 @@
 
             \faFilter~ {{ ak.category.name | latex_escape }}
 
+            {% if space_for_notes_in_wishes %}
             \faUser~
 
             \faClock~
+            {% endif %}
 
             {{ ak.description | truncatechars(280) | latex_escape }}
 

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&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 %}
 
                 <h3 class="block-header">{% trans "Requirements" %}</h3>

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')