Adds missing delete view (Agenda Items).

seantis · Sep 10, 2024 · 3fab79d · 3fab79d
1 parent aff3b92
commit 3fab79d
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 26 deletions.
diff --git a/src/privatim/locale/de/LC_MESSAGES/privatim.mo b/src/privatim/locale/de/LC_MESSAGES/privatim.mo
diff --git a/src/privatim/locale/de/LC_MESSAGES/privatim.po b/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-08-31 19:01+0200\n"
+"POT-Creation-Date: 2024-09-10 10:36+0200\n"
 "PO-Revision-Date: 2024-05-21 21:20+0200\n"
 "Last-Translator: cyrill <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -184,8 +184,8 @@ msgid "Edit Agenda Item"
 msgstr "Traktandum bearbeiten"
 
 #: src/privatim/views/meetings.py
-msgid "Delete meeting"
-msgstr "Sitzung löschen"
+msgid "Delete Agenda Item"
+msgstr "Traktandum löschen"
 
 #: src/privatim/views/meetings.py src/privatim/forms/working_group_forms.py
 msgid "Members"
@@ -501,6 +501,10 @@ msgstr "Datum / Zeit:"
 msgid "Agenda Items"
 msgstr "Traktanden"
 
+#: src/privatim/views/templates/meeting.pt
+msgid "Reorder item"
+msgstr "Element verschieben"
+
 #: src/privatim/views/templates/meeting.pt
 #: src/privatim/forms/agenda_item_form.py
 msgid "Add Agenda Item"
@@ -1022,6 +1026,9 @@ msgstr "Gremium:"
 msgid "Attendees:"
 msgstr "Teilnehmende:"
 
+#~ msgid "Delete meeting"
+#~ msgstr "Sitzung löschen"
+
 #~ msgid "Choose a canton..."
 #~ msgstr "Kanton auswählen..."
 

diff --git a/src/privatim/locale/fr/LC_MESSAGES/privatim.mo b/src/privatim/locale/fr/LC_MESSAGES/privatim.mo
diff --git a/src/privatim/locale/fr/LC_MESSAGES/privatim.po b/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-08-31 19:01+0200\n"
+"POT-Creation-Date: 2024-09-10 10:36+0200\n"
 "PO-Revision-Date: 2024-04-11 15:53+0200\n"
 "Last-Translator: cyrill <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -181,8 +181,8 @@ msgid "Edit Agenda Item"
 msgstr "Traiter un point de l'ordre du jour"
 
 #: src/privatim/views/meetings.py
-msgid "Delete meeting"
-msgstr "Supprimer la réunion"
+msgid "Delete Agenda Item"
+msgstr "Supprimer un point de l'ordre du jour"
 
 #: src/privatim/views/meetings.py src/privatim/forms/working_group_forms.py
 msgid "Members"
@@ -500,6 +500,10 @@ msgstr "Date / Heure:"
 msgid "Agenda Items"
 msgstr "ordres du jour"
 
+#: src/privatim/views/templates/meeting.pt
+msgid "Reorder item"
+msgstr "Déplacer un élément"
+
 #: src/privatim/views/templates/meeting.pt
 #: src/privatim/forms/agenda_item_form.py
 msgid "Add Agenda Item"
@@ -1018,6 +1022,9 @@ msgstr "Comité:"
 msgid "Attendees:"
 msgstr "Participants:"
 
+#~ msgid "Delete meeting"
+#~ msgstr "Supprimer la réunion"
+
 #~ msgid "Choose a canton..."
 #~ msgstr "Choisissez un canton..."
 

diff --git a/src/privatim/locale/privatim.pot b/src/privatim/locale/privatim.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2024-08-31 19:01+0200\n"
+"POT-Creation-Date: 2024-09-10 10:36+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"
@@ -181,7 +181,7 @@ msgid "Edit Agenda Item"
 msgstr ""
 
 #: ./src/privatim/views/meetings.py
-msgid "Delete meeting"
+msgid "Delete Agenda Item"
 msgstr ""
 
 #: ./src/privatim/views/meetings.py ./src/privatim/forms/working_group_forms.py
@@ -489,6 +489,10 @@ msgstr ""
 msgid "Agenda Items"
 msgstr ""
 
+#: ./src/privatim/views/templates/meeting.pt
+msgid "Reorder item"
+msgstr ""
+
 #: ./src/privatim/views/templates/meeting.pt
 #: ./src/privatim/forms/agenda_item_form.py
 msgid "Add Agenda Item"

diff --git a/src/privatim/static/css/custom.css b/src/privatim/static/css/custom.css
@@ -722,5 +722,5 @@ input[type="color"]:focus,
 
 /* Fix distance of <li> items in list generated by editor. */
 .consultation-main-text ul li p {
-    margin:0;
+    margin: 0;
 }
diff --git a/src/privatim/static/js/custom/custom.js b/src/privatim/static/js/custom/custom.js
@@ -6,14 +6,14 @@ document.addEventListener('DOMContentLoaded', function () {
     addEditorForCommentsEdit();
     makeConsultationsInActivitiesClickable();
     setupAgendaItemGlobalToggle();
-    setupDeleteModalForPersonInPeople();
+    setupDeleteModalListeners();
     autoHideSuccessMessages();
     addTestSystemBadge();
     fixCSSonProfilePage();
 });
 
 
-function setupDeleteModalForPersonInPeople() {
+function setupDeleteModalListeners() {
     var active_popover = null;
     var popover_timeout = null;
 
@@ -269,6 +269,7 @@ function setupCommentAnswerField() {
     }
 }
 
+// Expand / collapse all Agenda Items
 function setupAgendaItemGlobalToggle() {
     if (!window.location.href.includes('/meeting')) {
         return;

diff --git a/src/privatim/views/agenda_items.py b/src/privatim/views/agenda_items.py
@@ -108,7 +108,6 @@ def delete_agenda_item_view(
 
     assert isinstance(context, AgendaItem)
     title = context.title
-    meeting = context.meeting
 
     session = request.dbsession
     session.delete(context)
@@ -119,13 +118,16 @@ def delete_agenda_item_view(
         mapping={'name': title}
     )
 
+    target_url = request.route_url('meeting', id=context.meeting.id)
     if request.is_xhr:
-        return {'success': translate(message, request.locale_name)}
+        return {
+            'success': translate(message, request.locale_name),
+            'name': 'test',
+            'redirect_url': target_url
+        }
 
     request.messages.add(message, 'success')
-    return HTTPFound(
-        location=request.route_url('meeting', id=meeting.id),
-    )
+    return HTTPFound(location=target_url)
 
 
 def copy_agenda_item_view(

diff --git a/src/privatim/views/meetings.py b/src/privatim/views/meetings.py
@@ -45,18 +45,17 @@ def meeting_view(
         request: 'IRequest'
 ) -> 'RenderData':
     """ Displays a single meeting. """
-
     assert isinstance(context, Meeting)
     formatted_time = datetime_format(context.time)
-
     request.add_action_menu_entries(meeting_buttons(context, request))
-
     agenda_items = []
     for indx, item in enumerate(context.agenda_items, start=1):
         agenda_items.append(
             {
                 'title': Markup(
-                    '<strong>{}.</strong> {}'.format(indx, item.title)
+                    '<strong>{}.</strong> {}'.format(
+                        indx, Markup.escape(item.title)
+                    )
                 ),
                 'description': Markup(item.description),
                 'id': item.id,
@@ -66,6 +65,13 @@ def meeting_view(
                     icon='edit',
                     description=_('Edit Agenda Item'),
                 ),
+                'delete_btn': Button(
+                    url=request.route_url('delete_agenda_item', id=item.id),
+                    icon='trash',
+                    description=_('Delete Agenda Item'),
+                    modal='#delete-xhr',
+                    data_item_title=item.title,
+                ),
             }
         )
     data_sortable_url = request.route_url(
@@ -76,7 +82,7 @@ def meeting_view(
         target_id='{target_id}',
     )
     return {
-        'delete_title': _('Delete meeting'),
+        'delete_title': _('Delete'),
         'time': formatted_time,
         'meeting': context,
         'meeting_attendees': user_list(

diff --git a/src/privatim/views/templates/meeting.pt b/src/privatim/views/templates/meeting.pt
@@ -42,13 +42,20 @@
                 </div>
                 <input type="hidden" name="csrf_token" value="${layout.csrf_token()}"/>
                 <div class="accordion" id="agenda-items" data-sortable="" data-sortable-url="${sortable_url}">
-                        <div data-sortable-id="${item.position}" class="accordion-item handle-for-dragging draggable-item" tal:repeat="item agenda_items">
-                            <h2 class="accordion-header">
-                                <button class="accordion-button collapsed agenda-item-accordion" type="button" data-bs-toggle="collapse" data-bs-target="#item-${item.id}" aria-expanded="false" aria-controls="item-${item.id}" >
-                                    <span class="accordion-text-9">${item.title}</span>
+                    <div data-sortable-id="${item.position}"
+                         class="accordion-item handle-for-dragging draggable-item" tal:repeat="item agenda_items">
+                        <h2 class="accordion-header">
+                            <button class="accordion-button collapsed agenda-item-accordion" type="button"
+                                    data-bs-toggle="collapse" data-bs-target="#item-${item.id}" aria-expanded="false"
+                                    aria-controls="item-${item.id}">
+                                <span class="accordion-text-9">${item.title}</span>
                                     ${item.edit_btn()}
+                                    ${item.delete_btn()}
+                                <a href="#" class="btn" data-bs-toggle="tooltip" data-bs-placement="top"
+                                   title="Reorder item" i18n:attributes="title">
                                     <i class="fas fa-arrows-alt-v"></i>
-                                </button>
+                                </a>
+                            </button>
                         </h2>
                         <div id="item-${item.id}" class="accordion-collapse collapse" data-bs-parent="#agenda-items">
                             <div class="accordion-body">