update

Author: cyrillkuettel

src/onegov/pas/export_single_parliamentarian.py

@@ -17,7 +17,7 @@
     LOHNART_ALLOWANCE_TEXT,
     PresidentialAllowance,
 )
-from onegov.pas.utils import is_commission_president
+from onegov.pas.utils import is_president_for_attendance
 from onegov.pas.utils import format_swiss_number
 from onegov.core.utils import module_path
 from weasyprint import HTML, CSS  # type: ignore[import-untyped]
@@ -269,7 +269,7 @@ def _get_parliamentarian_settlement_data(
 
     result = []
     for attendence in attendences:
-        is_president = is_commission_president(
+        is_president = is_president_for_attendance(
             parliamentarian, attendence, settlement_run
         )
         compensation = calculate_attendance_compensation(

src/onegov/pas/models/attendence.py

@@ -143,7 +143,9 @@ def calculate_value(self) -> Decimal:
             raise ValueError('Duration cannot be negative')
 
         if self.type == 'plenary':
-            return Decimal(str(self.duration)) / Decimal('60')
+            return (Decimal(str(self.duration)) / Decimal('60')).quantize(
+                Decimal('0.01'), rounding=ROUND_HALF_UP
+            )
 
         if self.type in ('commission', 'study', 'shortest'):
             # Convert minutes to hours with Decimal for precise calculation

src/onegov/pas/utils.py

@@ -129,6 +129,38 @@ def format_swiss_number(value: Decimal | int) -> str:
     return format_decimal(value, format='#,##0.00', locale='de_CH')
 
 
+def is_kantonsrat_president(
+    parliamentarian: PASParliamentarian,
+    on_date: date,
+) -> bool:
+    """The Kantonsratspräsidium is a role on the parliamentarian and not a
+    commission membership.
+
+    """
+    return any(
+        role.role == 'president'
+        and _is_kantonsrat_role(role)
+        and (role.start is None or role.start <= on_date)
+        and (role.end is None or role.end >= on_date)
+        for role in parliamentarian.roles
+    )
+
+
+def is_president_for_attendance(
+    parliamentarian: PASParliamentarian,
+    attendance: Attendence,
+    settlement_run: SettlementRun,
+) -> bool:
+    """Whether the president rate applies. A plenary session has no
+    commission, there the Kantonsratspräsidium decides.
+
+    """
+    if attendance.type == 'plenary':
+        return is_kantonsrat_president(parliamentarian, attendance.date)
+
+    return is_commission_president(parliamentarian, attendance, settlement_run)
+
+
 def is_commission_president(
     parliamentarian: PASParliamentarian,
     attendance_or_commission_id: Attendence | UUID,

src/onegov/pas/views/abschlussliste.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from collections import defaultdict
 from io import BytesIO
-from decimal import Decimal, ROUND_HALF_UP
+from decimal import Decimal
 from operator import itemgetter
 import xlsxwriter
 
@@ -18,7 +18,7 @@
     LOHNART_ALLOWANCE_TEXT,
 )
 from onegov.pas.utils import get_parliamentarians_with_settlements
-from onegov.pas.utils import is_commission_president
+from onegov.pas.utils import is_president_for_attendance
 from onegov.pas.models.parliamentarian_role import PASParliamentarianRole
 from onegov.pas.models.party import Party
 from sqlalchemy import or_
@@ -133,7 +133,7 @@ def get_abschlussliste_data(
 
     for att in attendances:
         p = att.parliamentarian
-        is_president = is_commission_president(p, att, settlement_run)
+        is_president = is_president_for_attendance(p, att, settlement_run)
         compensation = calculate_attendance_compensation(
             rate_set=rate_set,
             attendence_type=att.type,
@@ -252,7 +252,7 @@ def generate_abschlussliste_xlsx(
     for details_row_num, att in enumerate(attendances, start=1):
         p = att.parliamentarian
         party = details_party_lookup[str(p.id)]
-        is_president = is_commission_president(p, att, settlement_run)
+        is_president = is_president_for_attendance(p, att, settlement_run)
         compensation = calculate_attendance_compensation(
             rate_set=rate_set,
             attendence_type=att.type,
@@ -349,7 +349,7 @@ def generate_buchungen_abrechnungslauf_xlsx(
         party_name = party.name if party else ''
 
         # Calculate rates
-        is_president = is_commission_president(
+        is_president = is_president_for_attendance(
             parliamentarian,
             att,
             settlement_run,
@@ -463,11 +463,7 @@ def generate_buchungen_abrechnungslauf_xlsx(
         worksheet.write(
             row_num,
             5,
-            float(
-                row_data['value'].quantize(
-                    Decimal('0.01'), rounding=ROUND_HALF_UP
-                )
-            ),
+            float(row_data['value']),
             cell_format,
         )
         worksheet.write(

src/onegov/pas/views/pas_excel_export_nr_3_lohnart_fibu.py

@@ -17,7 +17,7 @@
     LOHNART_ALLOWANCE_NR,
     LOHNART_ALLOWANCE_TEXT,
 )
-from onegov.pas.utils import is_commission_president
+from onegov.pas.utils import is_president_for_attendance
 
 
 from typing import TYPE_CHECKING
@@ -111,7 +111,7 @@ def generate_fibu_export_rows(
             lohnart_nr = lohnart_info['nr']
             lohnart_text = lohnart_info['text']
 
-        is_president = is_commission_president(
+        is_president = is_president_for_attendance(
             parliamentarian, attendance, settlement_run
         )
         compensation = calculate_attendance_compensation(

src/onegov/pas/views/settlement_run.py

@@ -45,6 +45,7 @@
     get_parliamentarians_with_settlements,
     get_parties_with_settlements,
     is_commission_president,
+    is_president_for_attendance,
 )
 from onegov.pas.views.abschlussliste import (
     generate_abschlussliste_xlsx,
@@ -541,13 +542,17 @@ def generate_settlement_pdf(
     else:
         raise ValueError(f'Unsupported entity type: {entity_type}')
 
+    # the Amtliche Mission belongs to the person, it shall only be listed
+    # on the parliamentarian export and on the overview across all parties
     allowances = (
         PresidentialAllowanceCollection(
             request.session,
             settlement_run_id=settlement_run.id,
         )
         .query()
         .all()
+        if entity_type == 'all'
+        else []
     )
 
     if allowances:
@@ -668,7 +673,8 @@ def _generate_settlement_html(
                <td>{settlement_row[0].strftime('%d.%m.%Y')}</td>
                <td>{name}</td>
                <td>{settlement_row[2]}</td>
-               <td class="numeric">{settlement_row[3]}</td>
+               <td class="numeric">{format_swiss_number(
+                   settlement_row[3])}</td>
                <td class="numeric">{format_swiss_number(
                    settlement_row[4])}</td>
                <td class="numeric">{format_swiss_number(
@@ -759,7 +765,7 @@ def _get_data_export_all(
     settlement_data: list[SettlementDataRow] = []
 
     for attendence in attendences.query():
-        is_president = is_commission_president(
+        is_president = is_president_for_attendance(
             attendence.parliamentarian, attendence, self
         )
 
@@ -838,7 +844,7 @@ def _get_party_settlement_data(
             continue
 
         # found an export
-        is_president = is_commission_president(
+        is_president = is_president_for_attendance(
             attendence.parliamentarian, attendence, settlement_run
         )