Adds menu to meetings

src/onegov/org/forms/meeting.py

@@ -1,24 +1,102 @@
 from __future__ import annotations
 
-from wtforms import DateTimeField
+from wtforms import StringField
+from wtforms.validators import Optional, InputRequired
 
 from onegov.form import Form
+from onegov.form.fields import TimezoneDateTimeField, ChosenSelectMultipleField
 from onegov.org.forms.fields import HtmlField
 from onegov.parliament import _
-from wtforms.validators import Optional
+from onegov.parliament.models import Meeting, MeetingItem
+
+from typing import TYPE_CHECKING
+from collections.abc import Collection
+if TYPE_CHECKING:
+    from collections.abc import Collection
 
 
 class MeetingForm(Form):
+    title = StringField(
+        label=_('Title'),
+        validators=[InputRequired()],
+    )
 
-    start_datetime = DateTimeField(
+    start_datetime = TimezoneDateTimeField(
+        timezone='Europe/Zurich',
         label=_('Start'),
         validators=[Optional()],
     )
 
+    end_datetime = TimezoneDateTimeField(
+        timezone='Europe/Zurich',
+        label=_('End'),
+        validators=[Optional()],
+    )
+
     address = HtmlField(
-        label=_('Portrait'),
+        label=_('Address'),
+        validators=[InputRequired()],
+        render_kw={'rows': 3}
     )
 
     description = HtmlField(
         label=_('Description'),
+        validators=[Optional()],
+        render_kw={'rows': 5}
     )
+
+    agenda_items = ChosenSelectMultipleField(
+        label=_('Agenda Items'),
+        validators=[Optional()],
+        choices=[],
+    )
+
+    def on_request(self) -> None:
+
+        meetings = (self.request.session.query(MeetingItem)
+                    .order_by(MeetingItem.number, MeetingItem.title)
+                    .all())
+
+        self.agenda_items.choices = [
+            (item.id.hex, item.display_name())
+            for item in meetings
+        ]
+
+    def populate_obj(
+            self,
+            obj: object,
+            exclude: Collection[str] | None = None,
+            include: Collection[str] | None = None
+    ) -> None:
+        if not isinstance(obj, Meeting):
+            raise TypeError('Object must be a MeetingItem')
+
+        meeting: Meeting = obj
+        item: MeetingItem | None
+        super().populate_obj(obj, exclude=exclude, include=include)
+
+        meeting_item_ids = {item.id.hex for item in meeting.meeting_items}
+        new_item_ids = set(self.agenda_items.data or [])
+
+        items_to_add = new_item_ids - meeting_item_ids
+        for new_id in items_to_add:
+            item = (self.request.session.query(MeetingItem)
+                    .filter(MeetingItem.id == new_id).one())
+            if item is not None:
+                meeting.meeting_items.append(item)
+
+        items_to_remove = meeting_item_ids - new_item_ids
+        for current_id in items_to_remove:
+            item = self.request.session.query(MeetingItem).get(current_id)
+            if item is not None:
+                meeting.meeting_items.remove(item)
+
+    def process_obj(self, obj: MeetingItem) -> None:  # type: ignore[override]
+        if not isinstance(obj, Meeting):
+            raise TypeError('Object must be a MeetingItem')
+
+        super().process_obj(obj)
+
+        self.agenda_items.data = [
+            item.id.hex for item in obj.meeting_items
+        ]

src/onegov/parliament/collections/meeting.py

@@ -1,18 +1,24 @@
 from __future__ import annotations
 
+from functools import cached_property
+
 from onegov.core.collection import GenericCollection
+from onegov.parliament.models import Meeting
+from onegov.town6 import _
 
 from typing import TYPE_CHECKING
 
-from onegov.parliament.models import Meeting
-
 if TYPE_CHECKING:
     from uuid import UUID
     from sqlalchemy.orm import Query
 
 
 class MeetingCollection(GenericCollection[Meeting]):
 
+    @cached_property
+    def title(self) -> str:
+        return _('Meeting')
+
     @property
     def model_class(self) -> type[Meeting]:
         return Meeting

src/onegov/parliament/models/meeting.py

@@ -80,6 +80,7 @@ def title_text(self) -> str:
         ForeignKey('par_political_businesses.id'),
     )
 
+    # FIXME: is this used or covered by meeting_items?
     #: list of political businesses, "Traktanden"
     political_businesses: RelationshipProperty[PoliticalBusiness] = (
         relationship(
@@ -97,7 +98,7 @@ def title_text(self) -> str:
         'MeetingItem',
         cascade='all, delete-orphan',
         back_populates='meeting',
-        order_by='desc(MeetingItem.number)'
+        order_by='asc(MeetingItem.number)'
     )
 
     def __repr__(self) -> str:

src/onegov/parliament/models/meeting_item.py

@@ -71,5 +71,8 @@
         back_populates='meeting_items'
     )
 
+    def display_name(self) -> str:
+        return f'{self.number} {self.title}' if self.number else self.title
+
     def __repr__(self) -> str:
         return f'<Meeting Item {self.number} {self.title}>'

src/onegov/town6/layout.py

@@ -1078,6 +1078,10 @@
 
 class MeetingLayout(DefaultLayout):
 
+    @cached_property
+    def collection(self) -> MeetingCollection:
+        return MeetingCollection(self.request.session)
+
     @cached_property
     def title(self) -> str:
         return self.model.title
@@ -1096,20 +1100,48 @@
         ]
 
     @cached_property
-    def editbar_links(self) -> list[LinkGroup] | None:
+    def editbar_links(self) -> list[Link | LinkGroup] | None:
         if self.request.is_manager:
             return [
                 LinkGroup(
                     title=_('Add'),
                     links=[
                         Link(
-                            text=_('Meeting'),
+                            text=_('Parliamentarian'),
                             url=self.request.link(self.model, 'new'),
-                            attrs={'class': 'new-meeting'},
+                            attrs={'class': 'new-parliamentarian'},
                         ),
                     ],
                 ),
+                Link(
+                    text=_('Edit'),
+                    url=self.request.link(self.model, 'edit'),
+                    attrs={'class': 'edit-meeting'}
+                ),
+                Link(
+                    text=_('Delete'),
+                    url=self.csrf_protected_url(
+                        self.request.link(self.model)
+                    ),
+                    attrs={'class': 'delete-meeting'},
+                    traits=(
+                        Confirm(
+                            _(
+                                'Do you really want to delete this meeting?'
+                            ),
+                            _('This cannot be undone.'),
+                            _('Delete meeting'),
+                            _('Cancel')
+                        ),
+                        Intercooler(
+                            request_method='DELETE',
+                            redirect_after=self.request.link(
+                                self.collection)
+                        )
+                    )
+                )
             ]
+
         return None
 
 

src/onegov/town6/locale/de_CH/LC_MESSAGES/onegov.town6.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OneGov Cloud 1.0\n"
-"POT-Creation-Date: 2025-07-09 13:44+0200\n"
+"POT-Creation-Date: 2025-07-07 15:20+0200\n"
 "PO-Revision-Date: 2021-03-03 16:24+0100\n"
 "Last-Translator: Lukas Burkhard <lukas.burkhard@seantis.ch>\n"
 "Language-Team: German\n"
@@ -301,18 +301,27 @@ msgstr "Parlamentarierinnen und Parlamentarier"
 msgid "Parliamentarian"
 msgstr "Parlamentarier:in"
 
-msgid "Role (as a party or group member)"
-msgstr "Rolle (als Partei- oder Fraktionsmitglied)"
-
 msgid "Edit"
 msgstr "Bearbeiten"
 
-msgid "Do you really want to delete this parliamentarian?"
-msgstr "Möchten Sie diese:n Parlamentarier:in wirklich löschen?"
+msgid "Do you really want to delete this meeting?"
+msgstr "Diese Sitzung wirklich löschen?"
 
 msgid "This cannot be undone."
 msgstr "Dies kann nicht rückgängig gemacht werden."
 
+msgid "Delete meeting"
+msgstr "Sitzung löschen"
+
+msgid "Parliamentarians"
+msgstr "Parlamentarierinnen und Parlamentarier"
+
+msgid "Role (as a party or group member)"
+msgstr "Rolle (als Partei- oder Fraktionsmitglied)"
+
+msgid "Do you really want to delete this parliamentarian?"
+msgstr "Möchten Sie diese:n Parlamentarier:in wirklich löschen?"
+
 msgid "Delete parliamentarian"
 msgstr "Parlamentarier:in löschen"
 
@@ -2460,33 +2469,63 @@ msgstr "Neue Kommission"
 msgid "Your changes were saved"
 msgstr "Ihre Änderungen wurden gespeichert"
 
+msgid "The commission has been deleted."
+msgstr "Die Kommission wurde gelöscht."
+
 msgid "Sort"
 msgstr "Sortieren"
 
+msgid "Added a new meeting."
+msgstr "Neue Sitzung hinzugefügt"
+
+msgid "New Meeting"
+msgstr "Neue Sitzung"
+
+msgid "Your changes were saved."
+msgstr "Ihre Änderungen wurden gespeichert."
+
+msgid "Edit Meeting"
+msgstr "Sitzung bearbeiten"
+
+msgid "The meeting has been deleted."
+msgstr "Die Sitzung wurde gelöscht."
+
 msgid "Added a new parliamentarian"
 msgstr "Parlamentarier:in hinzugefügt"
 
 msgid "New parliamentarian"
 msgstr "Neue:r Parlamentarier:in"
 
+msgid "The parliamentarian has been deleted."
+msgstr "Der/die Parlamentarier:in wurde gelöscht."
+
 msgid "Added a new role"
 msgstr "Neue Rolle hinzugefügt"
 
 msgid "New role"
 msgstr "Neue Rolle"
 
+msgid "The parliamentarian role has been deleted."
+msgstr "Die Rolle des/der Parlamentarier:in wurde gelöscht."
+
 msgid "Added a new parliamentary group"
 msgstr "Fraktion hinzugefügt"
 
 msgid "New parliamentary group"
 msgstr "Neue Fraktion"
 
+msgid "The parliamentary group has been deleted."
+msgstr "Die Fraktion wurde gelöscht."
+
 msgid "Added a new party"
 msgstr "Partei hinzugefügt"
 
 msgid "New party"
 msgstr "Neue Partei"
 
+msgid "The party has been deleted."
+msgstr "Die Partei wurde gelöscht."
+
 msgid "New Recipient"
 msgstr "Neuer Empfänger"
 
@@ -2596,6 +2635,12 @@ msgstr "Ratsinformationssystem (RIS)"
 msgid "New Note"
 msgstr "Neue Notiz"
 
+#~ msgid "The political business has been deleted."
+#~ msgstr "Das politische Geschäft wurde gelöscht."
+
+#~ msgid "Agenda Items"
+#~ msgstr "Traktanden"
+
 #~ msgid "Parliamentarian is not in this commission."
 #~ msgstr "Parlamentarier:in ist nicht in dieser Kommission."
 
@@ -2629,12 +2674,6 @@ msgstr "Neue Notiz"
 #~ msgid "End must be after start"
 #~ msgstr "Ende muss nach dem Start liegen"
 
-#~ msgid "Do you really want to delete this meeting?"
-#~ msgstr "Diese Sitzung wirklich löschen?"
-
-#~ msgid "Delete meeting"
-#~ msgstr "Sitzung löschen"
-
 #~ msgid "Do you really want to remove this parliamentarian?"
 #~ msgstr "Diese:n Parlamentarier:in wirklich entfernen?"