diff --git a/src/privatim/reporting/report.py b/src/privatim/reporting/report.py index fa7584d..7996697 100644 --- a/src/privatim/reporting/report.py +++ b/src/privatim/reporting/report.py @@ -4,6 +4,7 @@ from pathlib import Path from babel.dates import format_datetime +from markupsafe import Markup from privatim.i18n import translate, _ from privatim.layouts.layout import DEFAULT_TIMEZONE @@ -129,15 +130,28 @@ def render_template( ) -> str: """Render chameleon report template.""" document_context = {'title': meeting.name, 'created_at': timestamp} - title = translate( - _( - "Protocol of meeting ${title}", - mapping={'title': document_context['title']}, + + agenda_items = [] + for indx, item in enumerate(meeting.agenda_items, start=1): + agenda_items.append({ + 'title': Markup( + '{}. {}'.format( + indx, Markup.escape(item.title) + ) + ), + 'description': Markup(item.description), + } ) - ) + ctx = { - 'title': title, + 'title': translate( + _( + "Protocol of meeting ${title}", + mapping={'title': document_context['title']}, + ) + ), 'meeting': meeting, + 'agenda_items': agenda_items, 'sorted_attendance_records': meeting.attendance_records, 'meeting_time': datetime_format(meeting.time), 'document': document_context, diff --git a/src/privatim/reporting/template/report.pt b/src/privatim/reporting/template/report.pt index 0799ab7..71a5481 100644 --- a/src/privatim/reporting/template/report.pt +++ b/src/privatim/reporting/template/report.pt @@ -7,6 +7,122 @@ @@ -96,11 +205,8 @@ Logo
@@ -131,8 +237,8 @@

Agenda Items