Adds delete meeting link and test.

src/privatim/locale/de/LC_MESSAGES/privatim.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2024-06-20 09:55+0200\n"
+"POT-Creation-Date: 2024-06-22 21:53+0200\n"
 "PO-Revision-Date: 2024-05-21 21:20+0200\n"
 "Last-Translator: cyrill <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -106,6 +106,10 @@ msgstr "Datei \"${title}\" erfolgreich gelöscht"
 msgid "Export meeting protocol"
 msgstr "Protokoll drucken"
 
+#: src/privatim/views/meetings.py
+msgid "Delete Meeting"
+msgstr "Sitzung löschen"
+
 #: src/privatim/views/meetings.py src/privatim/forms/agenda_item_form.py
 msgid "Edit Agenda Item"
 msgstr "Traktandum bearbeiten"
@@ -141,20 +145,25 @@ msgstr "Sitzung \"${name}\" erfolgreich bearbeitet"
 msgid "Successfully deleted meeting \"${name}\""
 msgstr "Sitzung \"${name}\" erfolgreich gelöscht"
 
+#: src/privatim/views/consultations.py src/privatim/forms/consultation_form.py
+msgid "Edit Consultation"
+msgstr "Vernehmlassung bearbeiten"
+
 #: src/privatim/views/consultations.py
 #, python-format
 msgid "Successfully added consultation \"${name}\""
 msgstr "Vernehmlassung \"${name}\" erfolgreich hinzugefügt"
 
+#: src/privatim/views/consultations.py
+#, python-format
+msgid "Successfully edited consultation \"${name}\""
+msgstr "Vernehmlassung \"${name}\" erfolgreich bearbeitet"
+
 #: src/privatim/views/consultations.py
 #: src/privatim/views/templates/activities.pt
 msgid "Add Consultation"
 msgstr "Vernehmlassung Erfassen"
 
-#: src/privatim/views/consultations.py src/privatim/forms/consultation_form.py
-msgid "Edit Consultation"
-msgstr "Vernehmlassung bearbeiten"
-
 #: src/privatim/views/password_change.py
 msgid "Email"
 msgstr "E-Mail"

src/privatim/locale/fr/LC_MESSAGES/privatim.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2024-06-20 09:55+0200\n"
+"POT-Creation-Date: 2024-06-22 21:53+0200\n"
 "PO-Revision-Date: 2024-04-11 15:53+0200\n"
 "Last-Translator: cyrill <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -103,6 +103,10 @@ msgstr "Fichier supprimé avec succès \"${titre}\""
 msgid "Export meeting protocol"
 msgstr "Imprimer le protocole"
 
+#: src/privatim/views/meetings.py
+msgid "Delete Meeting"
+msgstr "Supprimer la réunion"
+
 #: src/privatim/views/meetings.py src/privatim/forms/agenda_item_form.py
 msgid "Edit Agenda Item"
 msgstr "Traiter un point de l'ordre du jour"
@@ -138,20 +142,25 @@ msgstr "Réunion modifiée avec succès \"${nom}\""
 msgid "Successfully deleted meeting \"${name}\""
 msgstr "Réunion supprimée avec succès \"${nom}\""
 
+#: src/privatim/views/consultations.py src/privatim/forms/consultation_form.py
+msgid "Edit Consultation"
+msgstr "Modifier la consultation"
+
 #: src/privatim/views/consultations.py
 #, python-format
 msgid "Successfully added consultation \"${name}\""
 msgstr "L'ajout de la consultation a été effectué avec succès \"${name}\""
 
+#: src/privatim/views/consultations.py
+#, python-format
+msgid "Successfully edited consultation \"${name}\""
+msgstr "Consultation modifiée avec succès \"${nom}\""
+
 #: src/privatim/views/consultations.py
 #: src/privatim/views/templates/activities.pt
 msgid "Add Consultation"
 msgstr "Ajouter une consultation"
 
-#: src/privatim/views/consultations.py src/privatim/forms/consultation_form.py
-msgid "Edit Consultation"
-msgstr "Modifier la consultation"
-
 #: src/privatim/views/password_change.py
 msgid "Email"
 msgstr "E-Mail"

src/privatim/locale/privatim.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2024-06-20 09:55+0200\n"
+"POT-Creation-Date: 2024-06-22 21:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -103,6 +103,10 @@ msgstr ""
 msgid "Export meeting protocol"
 msgstr ""
 
+#: ./src/privatim/views/meetings.py
+msgid "Delete Meeting"
+msgstr ""
+
 #: ./src/privatim/views/meetings.py ./src/privatim/forms/agenda_item_form.py
 msgid "Edit Agenda Item"
 msgstr ""
@@ -138,19 +142,24 @@ msgstr ""
 msgid "Successfully deleted meeting \"${name}\""
 msgstr ""
 
+#: ./src/privatim/views/consultations.py
+#: ./src/privatim/forms/consultation_form.py
+msgid "Edit Consultation"
+msgstr ""
+
 #: ./src/privatim/views/consultations.py
 #, python-format
 msgid "Successfully added consultation \"${name}\""
 msgstr ""
 
 #: ./src/privatim/views/consultations.py
-#: ./src/privatim/views/templates/activities.pt
-msgid "Add Consultation"
+#, python-format
+msgid "Successfully edited consultation \"${name}\""
 msgstr ""
 
 #: ./src/privatim/views/consultations.py
-#: ./src/privatim/forms/consultation_form.py
-msgid "Edit Consultation"
+#: ./src/privatim/views/templates/activities.pt
+msgid "Add Consultation"
 msgstr ""
 
 #: ./src/privatim/views/password_change.py

src/privatim/views/meetings.py

@@ -39,6 +39,10 @@ def meeting_view(
         translate(_('Export meeting protocol')),
         request.route_url('export_meeting_as_pdf_view', id=context.id),
     )
+    request.add_action_menu_entry(
+        translate(_('Delete Meeting')),
+        request.route_url('delete_meeting', id=context.id),
+    )
 
     items = []
     for item in context.agenda_items:
@@ -266,6 +270,7 @@ def delete_meeting_view(
 
     assert isinstance(context, Meeting)
     name = context.name
+    working_group_id = context.working_group.id
 
     session = request.dbsession
     session.delete(context)
@@ -281,5 +286,5 @@ def delete_meeting_view(
 
     request.messages.add(message, 'success')
     return HTTPFound(
-        location=request.route_url('working_groups'),
+        location=request.route_url('meetings', id=working_group_id),
     )

tests/views/client/test_views_working_group.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from sqlalchemy import select
 
-from privatim.models import User, WorkingGroup
+from privatim.models import User, WorkingGroup, Meeting
 
 
 def test_view_add_working_group_with_meeting(client):
@@ -55,3 +55,10 @@ def test_view_add_working_group_with_meeting(client):
     page = page.form.submit().follow()
 
     assert 'Weekly Meeting' in page
+
+    stmt = select(Meeting).where(Meeting.working_group_id == group.id)
+    meeting = client.db.execute(stmt).scalars().first()
+    assert 'Weekly Meeting' in page
+
+    page = client.get(f'/meetings/{meeting.id}/delete').follow()
+    assert 'erfolgreich gelöscht' in page