}){kind=spacer}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/privatim/static/css/custom.css b/src/privatim/static/css/custom.css
index a22efd7..44cc040 100644
--- a/src/privatim/static/css/custom.css
+++ b/src/privatim/static/css/custom.css
@@ -86,6 +86,7 @@
:root {
--primary-color: #FF545F; /* privatim's primary color used globally*/
--hover-color: #e64c56; /* hover = 10% darker */
+ --secondary-hover-color: #e9ecef;
}
.btn-primary {
@@ -103,6 +104,17 @@ a {
color: var(--primary-color);
}
+
+.btn-secondary {
+ background: white;
+ color: var(--primary-color);
+ border-color: var(--primary-color);
+}
+.btn-secondary:hover {
+ background: var(--secondary-hover-color);
+ color: white;
+}
+
a:hover {
color: var(--hover-color) !important;
text-decoration: none;
@@ -216,9 +228,11 @@ main {
display: flex;
align-items: center;
}
+
.fas {
margin-right: 10px; /* Add space between the icon and the text */
}
+
.icon-container {
display: flex; /* Makes the file icon be on the same height as the text */
align-items: center; /* Ensure the icon is centered vertically */
diff --git a/src/privatim/static/css/report.css b/src/privatim/static/css/report.css
new file mode 100644
index 0000000..9c3e70d
--- /dev/null
+++ b/src/privatim/static/css/report.css
@@ -0,0 +1,103 @@
+/*
+ * CSS stylesheet for the printable report.
+ *
+ * Uses the CSS Paged Media Module (https://www.w3.org/TR/css-page-3/). This
+ * module allows to design documents for a paged presentation (unlike the web,
+ * where the content is mostly continuous). Most regular CSS directives apply
+ * here too, but there are some extra directives.
+ *
+ * In addition, Weasyprint might not (yet) support all Paged Media Module
+ * extensions. A good overview can be found here: https://print-css.rocks/lessons
+ *
+ * For further reading and reference:
+ * - Live Preview: https://printcss.live/
+ * - Header and footers: https://css4.pub/2022/running-headers/
+ * - CSS at-rules: https://www.qhmit.com/css/at-rules/
+ */
+
+/* dm-sans-regular - latin-ext_latin */
+@font-face {
+ font-family: 'DM Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: local(''),
+ url(../fonts/dm-sans-v6-latin-ext_latin-regular.woff2) format('woff2'),
+ url(../fonts/dm-sans-v6-latin-ext_latin-regular.woff) format('woff');
+}
+
+/* dm-sans-italic - latin-ext_latin */
+@font-face {
+ font-family: 'DM Sans';
+ font-style: italic;
+ font-weight: 400;
+ src: local(''),
+ url(../fonts/dm-sans-v6-latin-ext_latin-italic.woff2) format('woff2'),
+ url(../fonts/dm-sans-v6-latin-ext_latin-italic.woff) format('woff');
+}
+
+/* dm-sans-500 - latin-ext_latin */
+@font-face {
+ font-family: 'DM Sans';
+ font-style: normal;
+ font-weight: 500;
+ src: local(''),
+ url(../fonts/dm-sans-v6-latin-ext_latin-500.woff2) format('woff2'),
+ url(../fonts/dm-sans-v6-latin-ext_latin-500.woff) format('woff');
+}
+
+/* Global page settings. */
+@page {
+ size: A4;
+
+ /* Configure inner margins */
+ margin: 2cm;
+
+ /* Font for the headers and footers. */
+ font-family: DM Sans;
+
+ /* Setup header and footer */
+ @top-left {
+ /* NOTE: We use a running element, i.e., taking an element from the page
+ * and display it in the header. Alternatively, you can set the logo as
+ * the background-image and scale it down, however, we have experienced
+ * image quality loss when doing that.
+ */
+ content: element(header);
+ }
+
+ @top-center {
+ font-weight: bold;
+ font-size: 16pt;
+ content: string(title);
+ }
+
+ @top-right {
+ font-size: 10pt;
+ content: string(doc-creation-date);
+ }
+
+ @bottom-right {
+ font-size: 10pt;
+ content: "Seite " counter(page) "/" counter(pages);
+ }
+}
+
+
+/* || CSS resets and global styles */
+* {
+ /*padding: 0;*/
+ /*margin: 0;*/
+}
+
+img {
+ min-width: 5cm;
+ max-width: 5cm;
+ max-height: 3.5cm;
+
+}
+
+body {
+ font-family: DM Sans;
+ font-size: 10pt;
+}
+
diff --git a/src/privatim/types.py b/src/privatim/types.py
index e5df569..c1019a9 100644
--- a/src/privatim/types.py
+++ b/src/privatim/types.py
@@ -4,7 +4,12 @@
from decimal import Decimal
from fractions import Fraction
- from pyramid.httpexceptions import HTTPFound, HTTPForbidden, HTTPError
+ from pyramid.httpexceptions import (
+ HTTPFound,
+ HTTPForbidden,
+ HTTPError,
+ HTTPNotFound
+ )
from pyramid.interfaces import IResponse, IRequest
from typing import Any, Literal, TypeVar, Protocol
@@ -40,10 +45,12 @@
RenderData: TypeAlias = dict[str, Any]
RenderDataOrRedirect: TypeAlias = RenderData | HTTPFound
+ RenderDataOrNotFound: TypeAlias = RenderData | HTTPNotFound
RenderDataOrRedirectOrForbidden: TypeAlias = (
RenderData | HTTPFound | HTTPForbidden | HTTPError
)
RenderDataOrResponse: TypeAlias = RenderData | IResponse
+ ResponseOrNotFound: TypeAlias = IResponse | HTTPNotFound
# NOTE: For now we only allow complex return types if we return JSON
# If you want to return a scalar type as JSON you need to be
diff --git a/src/privatim/utils.py b/src/privatim/utils.py
index f4b3ffa..e735bf9 100644
--- a/src/privatim/utils.py
+++ b/src/privatim/utils.py
@@ -4,9 +4,12 @@
from PIL import Image
import magic
from io import BytesIO
+from pytz import timezone, BaseTzInfo
from sedate import to_timezone
from markupsafe import escape
+from privatim.layouts.layout import DEFAULT_TIMEZONE
+
from typing import Any, TYPE_CHECKING, overload
if TYPE_CHECKING:
@@ -16,6 +19,19 @@
from privatim.models.commentable import Comment
+def datetime_format(
+ dt: 'datetime',
+ format: str = '%d.%m.%y %H:%M',
+ tz: BaseTzInfo = DEFAULT_TIMEZONE
+) -> str:
+
+ if not dt.tzinfo:
+ # If passed datetime does not carry any timezone information, we
+ # assume (and force) it to be UTC, as all timestamps should be.
+ dt = timezone('UTC').localize(dt)
+ return dt.astimezone(tz).strftime(format)
+
+
def first(iterable: 'Iterable[Any] | None', default: Any | None = None) -> Any:
"""
Returns first item in given iterable or a default value.
diff --git a/src/privatim/views/__init__.py b/src/privatim/views/__init__.py
index fe7c2b5..6cb5e8d 100644
--- a/src/privatim/views/__init__.py
+++ b/src/privatim/views/__init__.py
@@ -24,7 +24,8 @@
from privatim.views.home import home_view
from privatim.views.login import login_view
from privatim.views.logout import logout_view
-from privatim.views.meetings import add_meeting_view
+from privatim.views.meetings import add_meeting_view, \
+ export_meeting_as_pdf_view
from privatim.views.meetings import delete_meeting_view
from privatim.views.meetings import edit_meeting_view
from privatim.views.meetings import meeting_view
@@ -219,6 +220,17 @@ def includeme(config: 'Configurator') -> None:
request_method='DELETE',
xhr=True
)
+ # download the meeting report
+ config.add_route(
+ 'export_meeting_as_pdf_view',
+ '/meetings/{id}/export',
+ factory=meeting_factory
+ )
+ config.add_view(
+ export_meeting_as_pdf_view,
+ route_name='export_meeting_as_pdf_view',
+ request_method='GET',
+ )
# Agenda items
diff --git a/src/privatim/views/meetings.py b/src/privatim/views/meetings.py
index e6b5b66..72ef8eb 100644
--- a/src/privatim/views/meetings.py
+++ b/src/privatim/views/meetings.py
@@ -1,12 +1,15 @@
-from pytz import timezone
from markupsafe import Markup, escape
-from pyramid.httpexceptions import HTTPFound
-
+from pyramid.httpexceptions import HTTPFound, HTTPNotFound
+from pyramid.response import Response
+from privatim.reporting.report import (
+ MeetingReport,
+ ReportOptions,
+ HTMLReportRenderer,
+)
from privatim.controls.controls import Button, Icon, IconStyle
-from privatim.utils import maybe_escape
+from privatim.utils import maybe_escape, datetime_format
from sqlalchemy import select
-from privatim.layouts.layout import DEFAULT_TIMEZONE
from privatim.utils import fix_utc_to_local_time
from privatim.forms.meeting_form import MeetingForm
from privatim.models import Meeting, User, WorkingGroup
@@ -19,25 +22,10 @@
from pyramid.interfaces import IRequest
from sqlalchemy.orm import Query
from privatim.types import RenderData, XHRDataOrRedirect
- from datetime import datetime
- from pytz import BaseTzInfo
_Q = TypeVar("_Q", bound=Query[Any])
from privatim.types import MixedDataOrRedirect
-def datetime_format(
- dt: 'datetime',
- format: str = '%d.%m.%y %H:%M',
- tz: 'BaseTzInfo' = DEFAULT_TIMEZONE
-) -> str:
-
- if not dt.tzinfo:
- # If passed datetime does not carry any timezone information, we
- # assume (and force) it to be UTC, as all timestamps should be.
- dt = timezone('UTC').localize(dt)
- return dt.astimezone(tz).strftime(format)
-
-
def meeting_view(
context: Meeting,
request: 'IRequest'
@@ -47,6 +35,11 @@ def meeting_view(
assert isinstance(context, Meeting)
formatted_time = datetime_format(context.time)
+ request.add_action_menu_entry(
+ translate(_('Export meeting protocol')),
+ request.route_url('export_meeting_as_pdf_view', id=context.id),
+ )
+
items = []
for item in context.agenda_items:
items.append(
@@ -113,8 +106,7 @@ def get_generic_user_list(
users: Sequence[User],
title: str
) -> Markup:
- """Returns an HTML list of users with links to their profiles within a
- container."""
+ """Returns an HTML list of users with links to their profiles """
user_items = tuple(
Markup(
'
+
+
+Protocol of meeting ${document.title}
+ ++ Date / Time: ${meeting_time} +
++ Working Group ${meeting.working_group.name} +
++ Attendees: +
+ +-
+
- + ${user.first_name} ${user.last_name} + ${user.email} + +
Agenda Items
+-
+
-
+
${item.title}
+${item.description}
+
+
-
-
-
-
-
- Sitzung ${meeting.name}
-
-
-
+
+ - Date / Time: ${time} -
-- Attendees: -
-
-
- - ${user.first_name} ${user.last_name} - ${user.email} - -
- Working Group: ${meeting.working_group.name} -
-
+
+
+
+ Sitzung ${meeting.name}
+
+ ${panel('action_menu')}
+
+
+
+
+
-
+
+ + Date / Time: ${time} +
++ Attendees: +
-
+
- + ${user.first_name} ${user.last_name} + ${user.email} + +
+ Working Group: ${meeting.working_group.name} +
+
-
Agenda Items
+Agenda Items
-
-
diff --git a/tests/reporting/__init__.py b/tests/reporting/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/reporting/test_report.py b/tests/reporting/test_report.py
new file mode 100644
index 0000000..0387f26
--- /dev/null
+++ b/tests/reporting/test_report.py
@@ -0,0 +1,37 @@
+from io import BytesIO
+import pypdf
+from privatim.reporting.report import (
+ MeetingReport,
+ ReportOptions,
+ HTMLReportRenderer,
+)
+from weasyprint import HTML, CSS
+from weasyprint.text.fonts import FontConfiguration
+
+from shared.utils import create_meeting
+
+
+def test_simple_report():
+
+ font_config = FontConfiguration()
+ html = HTML(string='
-