Merge branch 'feature-protocol-link' into 'master'

Introduce protocol link feature

See merge request !46

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: 2020-05-20 23:30+0000\n"
+"POT-Creation-Date: 2020-05-21 05:33+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"
@@ -58,13 +58,13 @@ msgstr "Bitte Verfügbarkeiten eintragen!"
 
 #: AKModel/availability/models.py:38 AKModel/models.py:41 AKModel/models.py:70
 #: AKModel/models.py:122 AKModel/models.py:141 AKModel/models.py:173
-#: AKModel/models.py:226 AKModel/models.py:272 AKModel/models.py:302
+#: AKModel/models.py:227 AKModel/models.py:273 AKModel/models.py:303
 msgid "Event"
 msgstr "Event"
 
 #: AKModel/availability/models.py:39 AKModel/models.py:71 AKModel/models.py:123
-#: AKModel/models.py:142 AKModel/models.py:174 AKModel/models.py:227
-#: AKModel/models.py:273 AKModel/models.py:303
+#: AKModel/models.py:142 AKModel/models.py:174 AKModel/models.py:228
+#: AKModel/models.py:274 AKModel/models.py:304
 msgid "Associated event"
 msgstr "Zugehöriges Event"
 
@@ -76,8 +76,8 @@ msgstr "Person"
 msgid "Person whose availability this is"
 msgstr "Person deren Verfügbarkeit hier abgebildet wird"
 
-#: AKModel/availability/models.py:56 AKModel/models.py:276
-#: AKModel/models.py:295
+#: AKModel/availability/models.py:56 AKModel/models.py:277
+#: AKModel/models.py:296
 msgid "Room"
 msgstr "Raum"
 
@@ -85,8 +85,8 @@ msgstr "Raum"
 msgid "Room whose availability this is"
 msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
 
-#: AKModel/availability/models.py:65 AKModel/models.py:232
-#: AKModel/models.py:294
+#: AKModel/availability/models.py:65 AKModel/models.py:233
+#: AKModel/models.py:295
 msgid "AK"
 msgstr "AK"
 
@@ -108,7 +108,7 @@ msgstr "Verfügbarkeiten"
 
 #: AKModel/models.py:16 AKModel/models.py:117 AKModel/models.py:138
 #: AKModel/models.py:157 AKModel/models.py:171 AKModel/models.py:189
-#: AKModel/models.py:265
+#: AKModel/models.py:266
 msgid "Name"
 msgstr "Name"
 
@@ -334,76 +334,84 @@ msgstr "Menschen, die den AK organisieren und halten"
 msgid "Link to wiki page"
 msgstr "Link zur Wiki Seite"
 
-#: AKModel/models.py:200
+#: AKModel/models.py:199
+msgid "Protocol Link"
+msgstr "Protokolllink"
+
+#: AKModel/models.py:199
+msgid "Link to protocol"
+msgstr "Link zum Protokoll"
+
+#: AKModel/models.py:201
 msgid "Category"
 msgstr "Kategorie"
 
-#: AKModel/models.py:201
+#: AKModel/models.py:202
 msgid "Category of the AK"
 msgstr "Kategorie des AKs"
 
-#: AKModel/models.py:202
+#: AKModel/models.py:203
 msgid "Tags"
 msgstr "Tags"
 
-#: AKModel/models.py:202
+#: AKModel/models.py:203
 msgid "Tags provided by owners"
 msgstr "Tags, die durch die AK Leitung vergeben wurden"
 
-#: AKModel/models.py:203
+#: AKModel/models.py:204
 msgid "Track"
 msgstr "Track"
 
-#: AKModel/models.py:204
+#: AKModel/models.py:205
 msgid "Track the AK belongs to"
 msgstr "Track zu dem der AK gehört"
 
-#: AKModel/models.py:206
+#: AKModel/models.py:207
 msgid "Resolution Intention"
 msgstr "Resolutionsabsicht"
 
-#: AKModel/models.py:207
+#: AKModel/models.py:208
 msgid "Intends to submit a resolution"
 msgstr "Beabsichtigt eine Resolution einzureichen"
 
-#: AKModel/models.py:208
+#: AKModel/models.py:209
 msgid "Present this AK"
 msgstr "AK Präsentieren"
 
-#: AKModel/models.py:209
+#: AKModel/models.py:210
 msgid "Present results of this AK"
 msgstr "Die Ergebnisse dieses AKs vorstellen"
 
-#: AKModel/models.py:211 AKModel/templates/admin/AKModel/status.html:76
+#: AKModel/models.py:212 AKModel/templates/admin/AKModel/status.html:76
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: AKModel/models.py:212
+#: AKModel/models.py:213
 msgid "AK's Requirements"
 msgstr "Anforderungen des AKs"
 
-#: AKModel/models.py:214
+#: AKModel/models.py:215
 msgid "Conflicting AKs"
 msgstr "AK Konflikte"
 
-#: AKModel/models.py:215
+#: AKModel/models.py:216
 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:216
+#: AKModel/models.py:217
 msgid "Prerequisite AKs"
 msgstr "Vorausgesetzte AKs"
 
-#: AKModel/models.py:217
+#: AKModel/models.py:218
 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:219
+#: AKModel/models.py:220
 msgid "Organizational Notes"
 msgstr "Notizen zur Organisation"
 
-#: AKModel/models.py:220
+#: AKModel/models.py:221
 msgid ""
 "Notes to organizers. These are public. For private notes, please send an e-"
 "mail."
@@ -411,96 +419,96 @@ msgstr ""
 "Notizen an die Organisator*innen. Diese sind öffentlich, für private "
 "Anmerkungen bitte eine E-Mail schicken."
 
-#: AKModel/models.py:222
+#: AKModel/models.py:223
 msgid "Interest"
 msgstr "Interesse"
 
-#: AKModel/models.py:222
+#: AKModel/models.py:223
 msgid "Expected number of people"
 msgstr "Erwartete Personenzahl"
 
-#: AKModel/models.py:223
+#: AKModel/models.py:224
 msgid "Interest Counter"
 msgstr "Interessenszähler"
 
-#: AKModel/models.py:224
+#: AKModel/models.py:225
 msgid "People who have indicated interest online"
 msgstr "Anzahl Personen, die online Interesse bekundet haben"
 
-#: AKModel/models.py:233 AKModel/templates/admin/AKModel/status.html:47
+#: AKModel/models.py:234 AKModel/templates/admin/AKModel/status.html:47
 #: AKModel/templates/admin/AKModel/status.html:54
 msgid "AKs"
 msgstr "AKs"
 
-#: AKModel/models.py:265
+#: AKModel/models.py:266
 msgid "Name or number of the room"
 msgstr "Name oder Nummer des Raums"
 
-#: AKModel/models.py:266
+#: AKModel/models.py:267
 msgid "Location"
 msgstr "Ort"
 
-#: AKModel/models.py:267
+#: AKModel/models.py:268
 msgid "Name or number of the location"
 msgstr "Name oder Nummer des Ortes"
 
-#: AKModel/models.py:268
+#: AKModel/models.py:269
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: AKModel/models.py:268
+#: AKModel/models.py:269
 msgid "Maximum number of people"
 msgstr "Maximale Personenzahl"
 
-#: AKModel/models.py:269
+#: AKModel/models.py:270
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: AKModel/models.py:270
+#: AKModel/models.py:271
 msgid "AK requirements fulfilled by the room"
 msgstr "AK Anforderungen, die dieser Raum erfüllt"
 
-#: AKModel/models.py:277 AKModel/templates/admin/AKModel/status.html:31
+#: AKModel/models.py:278 AKModel/templates/admin/AKModel/status.html:31
 msgid "Rooms"
 msgstr "Räume"
 
-#: AKModel/models.py:294
+#: AKModel/models.py:295
 msgid "AK being mapped"
 msgstr "AK, der zugeordnet wird"
 
-#: AKModel/models.py:296
+#: AKModel/models.py:297
 msgid "Room the AK will take place in"
 msgstr "Raum in dem der AK stattfindet"
 
-#: AKModel/models.py:297
+#: AKModel/models.py:298
 msgid "Slot Begin"
 msgstr "Beginn des Slots"
 
-#: AKModel/models.py:297
+#: AKModel/models.py:298
 msgid "Time and date the slot begins"
 msgstr "Zeit und Datum zu der der AK beginnt"
 
-#: AKModel/models.py:299
+#: AKModel/models.py:300
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKModel/models.py:300
+#: AKModel/models.py:301
 msgid "Length in hours"
 msgstr "Länge in Stunden"
 
-#: AKModel/models.py:305
+#: AKModel/models.py:306
 msgid "Last update"
 msgstr "Letzte Aktualisierung"
 
-#: AKModel/models.py:308
+#: AKModel/models.py:309
 msgid "AK Slot"
 msgstr "AK Slot"
 
-#: AKModel/models.py:309
+#: AKModel/models.py:310
 msgid "AK Slots"
 msgstr "AK Slot"
 
-#: AKModel/models.py:323
+#: AKModel/models.py:324
 msgid "Not scheduled yet"
 msgstr "Noch nicht geplant"
 

AKModel/migrations/0036_protocol_link.py

+# Generated by Django 3.0.6 on 2020-05-21 05:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('AKModel', '0035_event_plan_hidden'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ak',
+            name='protocol_link',
+            field=models.URLField(blank=True, help_text='Link to protocol', verbose_name='Protocol Link'),
+        ),
+        migrations.AddField(
+            model_name='historicalak',
+            name='protocol_link',
+            field=models.URLField(blank=True, help_text='Link to protocol', verbose_name='Protocol Link'),
+        ),
+    ]

AKModel/models.py

@@ -196,6 +196,7 @@ class AK(models.Model):
 
     # TODO generate automatically
     link = models.URLField(blank=True, verbose_name=_('Web Link'), help_text=_('Link to wiki page'))
+    protocol_link = models.URLField(blank=True, verbose_name=_('Protocol Link'), help_text=_('Link to protocol'))
 
     category = models.ForeignKey(to=AKCategory, on_delete=models.PROTECT, verbose_name=_('Category'),
                                  help_text=_('Category of the AK'))

AKPlan/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-19 20:46+0000\n"
+"POT-Creation-Date: 2020-05-21 05:33+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"
@@ -93,6 +93,6 @@ msgstr "Eigenschaften"
 msgid "Track"
 msgstr "Track"
 
-#: AKPlan/templates/AKPlan/slots_table.html:12
+#: AKPlan/templates/AKPlan/slots_table.html:14
 msgid "No AKs"
 msgstr "Keine AKs"

AKSubmission/forms.py

@@ -18,6 +18,7 @@ class AKForm(AvailabilitiesFormMixin, forms.ModelForm):
         fields = ['name',
                   'short_name',
                   'link',
+                  'protocol_link',
                   'owners',
                   'description',
                   'category',

AKSubmission/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-20 12:18+0000\n"
+"POT-Creation-Date: 2020-05-21 05:33+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"
@@ -17,20 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AKSubmission/forms.py:47
+#: AKSubmission/forms.py:48
 msgid "Separate multiple tags with comma or semicolon"
 msgstr "Mehrere Tags mit Komma oder Semikolon trennen"
 
-#: AKSubmission/forms.py:77
+#: AKSubmission/forms.py:78
 #, python-format
 msgid "\"%(duration)s\" is not a valid duration"
 msgstr "\"%(duration)s\" ist keine gültige Dauer"
 
-#: AKSubmission/forms.py:122
+#: AKSubmission/forms.py:123
 msgid "Duration(s)"
 msgstr "Dauer(n)"
 
-#: AKSubmission/forms.py:124
+#: AKSubmission/forms.py:125
 msgid ""
 "Enter at least one planned duration (in hours). If your AK should have "
 "multiple slots, use multiple lines"
@@ -90,94 +90,107 @@ msgid "Open external link"
 msgstr "Externen Link öffnen"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:45
+msgid "Open protocol link"
+msgstr "Protokolllink öffnen"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:50
 #: AKSubmission/templates/AKSubmission/ak_history.html:19
 #: AKSubmission/templates/AKSubmission/ak_history.html:31
 msgid "History"
 msgstr "Versionsgeschichte"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:48
-#: AKSubmission/templates/AKSubmission/ak_detail.html:157
+#: AKSubmission/templates/AKSubmission/ak_detail.html:53
+#: AKSubmission/templates/AKSubmission/ak_detail.html:168
 #: AKSubmission/templates/AKSubmission/ak_edit.html:16
 #: AKSubmission/templates/AKSubmission/ak_table.html:53
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:53
+#: AKSubmission/templates/AKSubmission/ak_detail.html:58
 #: AKSubmission/templates/AKSubmission/ak_history.html:31
 #: AKSubmission/templates/AKSubmission/ak_table.html:35
 msgid "AK Wish"
 msgstr "AK-Wunsch"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:57
+#: AKSubmission/templates/AKSubmission/ak_detail.html:62
 #: AKSubmission/templates/AKSubmission/ak_table.html:10
 msgid "Who?"
 msgstr "Wer?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:63
+#: AKSubmission/templates/AKSubmission/ak_detail.html:68
 #: AKSubmission/templates/AKSubmission/ak_history.html:36
 #: AKSubmission/templates/AKSubmission/ak_table.html:11
 msgid "Category"
 msgstr "Kategorie"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:69
+#: AKSubmission/templates/AKSubmission/ak_detail.html:75
+#: AKSubmission/templates/AKSubmission/ak_history.html:37
+msgid "Track"
+msgstr "Track"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:80
 msgid "Present this AK"
 msgstr "Diesen AK vorstellen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:73
+#: AKSubmission/templates/AKSubmission/ak_detail.html:84
 #: AKSubmission/templates/AKSubmission/ak_table.html:12
 msgid "Tags"
 msgstr "Tags"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:79
+#: AKSubmission/templates/AKSubmission/ak_detail.html:90
 msgid "Reso?"
 msgstr "Reso?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:86
+#: AKSubmission/templates/AKSubmission/ak_detail.html:97
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:99
+#: AKSubmission/templates/AKSubmission/ak_detail.html:110
 msgid "Conflicting AKs"
 msgstr "AK Konflikte"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:107
+#: AKSubmission/templates/AKSubmission/ak_detail.html:118
 msgid "Prerequisite AKs"
 msgstr "AK Voraussetzungen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:115
+#: AKSubmission/templates/AKSubmission/ak_detail.html:126
 msgid "Notes"
 msgstr "Notizen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:132
+#: AKSubmission/templates/AKSubmission/ak_detail.html:143
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:35
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:134
+#: AKSubmission/templates/AKSubmission/ak_detail.html:145
 msgid "When?"
 msgstr "Wann?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:135
+#: AKSubmission/templates/AKSubmission/ak_detail.html:146
 msgid "Room"
 msgstr "Raum"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:160
+#: AKSubmission/templates/AKSubmission/ak_detail.html:171
 msgid "Delete"
 msgstr "Löschen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:172
+#: AKSubmission/templates/AKSubmission/ak_detail.html:176
+msgid "Schedule"
+msgstr "Schedule"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:188
 msgid "Add another slot"
 msgstr "Einen neuen AK-Slot hinzufügen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:176
+#: AKSubmission/templates/AKSubmission/ak_detail.html:192
 msgid "Possible Times"
 msgstr "Mögliche Zeiten"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:180
+#: AKSubmission/templates/AKSubmission/ak_detail.html:196
 msgid "Start"
 msgstr "Start"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:181
+#: AKSubmission/templates/AKSubmission/ak_detail.html:197
 msgid "End"
 msgstr "Ende"
 
@@ -195,10 +208,6 @@ msgstr "Zurück"
 msgid "Name"
 msgstr "Name"
 
-#: AKSubmission/templates/AKSubmission/ak_history.html:37
-msgid "Track"
-msgstr "Track"
-
 #: AKSubmission/templates/AKSubmission/ak_history.html:38
 msgid "Time"
 msgstr "Zeit"

AKSubmission/templates/AKSubmission/ak_detail.html

@@ -40,6 +40,11 @@
                title="{% trans 'Open external link' %}"
                class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
         {% endif %}
+        {% if ak.protocol_link != "" %}
+            <a href="{{ ak.protocol_link }}" data-toggle="tooltip"
+               title="{% trans 'Open protocol link' %}"
+               class="btn btn-warning">{% fa5_icon 'file-alt' 'far' %}</a>
+        {% endif %}
         <a href="{% url 'submit:ak_history' event_slug=ak.event.slug pk=ak.pk %}"
            data-toggle="tooltip"
            title="{% trans 'History' %}" class="btn btn-light">{% fa5_icon 'clock' 'fas' %}</a>
@@ -65,6 +70,12 @@
                 {% category_linked_badge ak.category ak.event.slug %}
             </td>
         </tr>
+        {% if ak.track %}
+            <tr>
+                <td>{% trans 'Track' %}</td>
+                <td>{{ ak.track }}</td>
+            </tr>
+        {% endif %}
         <tr>
             <td>{% trans "Present this AK" %}</td>
             <td>{{ ak.present | bool_symbol }}</td>