Pas: Allow decimal places in rate sets.

TYPE: Bugfix
LINK: OGC-3242

Author: cyrillkuettel

src/onegov/pas/forms/rate_set.py

@@ -63,7 +63,7 @@ class RateSetForm(Form):
         validators=[InputRequired()],
     )
 
-    study_normal_president_halfhour = IntegerField(
+    study_normal_president_halfhour = DecimalField(
         label=_('President: File study'),
         render_kw={
             'long_description': _('per 1/2h'),
@@ -95,7 +95,7 @@ class RateSetForm(Form):
         validators=[InputRequired()],
     )
 
-    study_normal_member_halfhour = IntegerField(
+    study_normal_member_halfhour = DecimalField(
         label=_('Member: File study'),
         render_kw={
             'long_description': _('per 1/2h'),
@@ -116,7 +116,7 @@ class RateSetForm(Form):
         validators=[InputRequired()],
     )
 
-    study_intercantonal_president_hour = IntegerField(
+    study_intercantonal_president_hour = DecimalField(
         label=_('President: File study'),
         render_kw={
             'long_description': _('per 1h'),
@@ -137,7 +137,7 @@ class RateSetForm(Form):
         validators=[InputRequired()],
     )
 
-    study_intercantonal_member_hour = IntegerField(
+    study_intercantonal_member_hour = DecimalField(
         label=_('Member: File study'),
         render_kw={
             'long_description': _('per 1h'),

src/onegov/pas/layouts/rate_set.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from decimal import Decimal
 from functools import cached_property
 from onegov.core.elements import Confirm
 from onegov.core.elements import Intercooler
@@ -52,6 +53,12 @@ class RateSetLayout(DefaultLayout):
     def collection(self) -> RateSetCollection:
         return RateSetCollection(self.request.session)
 
+    def format_rate(self, amount: float | int | Decimal) -> str:
+        value = Decimal(str(amount))
+        if value == value.to_integral_value():
+            return f'CHF {int(value)}.-'
+        return f'CHF {value:.2f}'
+
     @cached_property
     def title(self) -> str:
         return '{} {}'.format(

src/onegov/pas/models/rate_set.py

@@ -77,18 +77,18 @@ class RateSet(Base, ContentMixin, TimestampMixin):
 
     )
 
-    study_normal_president_halfhour: dict_property[int] = (
-        content_property(default=0)
+    study_normal_president_halfhour: dict_property[float] = content_property(
+        default=0.0
     )
 
-    study_normal_member_halfhour: dict_property[int] = (
-        content_property(default=0)
+    study_normal_member_halfhour: dict_property[float] = content_property(
+        default=0.0
     )
 
-    study_intercantonal_president_hour: dict_property[int] = (
-        content_property(default=0)
+    study_intercantonal_president_hour: dict_property[float] = (
+        content_property(default=0.0)
     )
 
-    study_intercantonal_member_hour: dict_property[int] = (
-        content_property(default=0)
+    study_intercantonal_member_hour: dict_property[float] = content_property(
+        default=0.0
     )

src/onegov/pas/templates/rate_set.pt

@@ -37,24 +37,24 @@
                             <td i18n:translate="">President</td>
                             <td>CHF ${rate_set.commission_normal_president_initial}.- <span i18n:translate="">first 2h</span></td>
                             <td>CHF ${rate_set.commission_normal_president_additional}.- <span i18n:translate="">per additional 1/2h</span></td>
-                            <td>CHF ${rate_set.study_normal_president_halfhour}.- <span i18n:translate="">per 1/2h</span></td>
+                            <td>${layout.format_rate(rate_set.study_normal_president_halfhour)} <span i18n:translate="">per 1/2h</span></td>
                         </tr>
                         <tr>
                             <td i18n:translate="">Member</td>
                             <td>CHF ${rate_set.commission_normal_member_initial}.- <span i18n:translate="">first 2h</span></td>
                             <td>CHF ${rate_set.commission_normal_member_additional}.- <span i18n:translate="">per additional 1/2h</span></td>
-                            <td>CHF ${rate_set.study_normal_member_halfhour}.- <span i18n:translate="">per 1/2h</span></td>
+                            <td>${layout.format_rate(rate_set.study_normal_member_halfhour)} <span i18n:translate="">per 1/2h</span></td>
                         </tr>
                         <tr>
                             <th rowspan="2" i18n:translate="">intercantonal commission</th>
                             <td i18n:translate="">President</td>
                             <td colspan="2">CHF ${rate_set.commission_intercantonal_president_halfday}.- <span i18n:translate="">half-day</span></td>
-                            <td>CHF ${rate_set.study_intercantonal_president_hour}.- <span i18n:translate="">per 1h</span></td>
+                            <td>${layout.format_rate(rate_set.study_intercantonal_president_hour)} <span i18n:translate="">per 1h</span></td>
                         </tr>
                         <tr>
                             <td i18n:translate="">Member</td>
                             <td colspan="2">CHF ${rate_set.commission_intercantonal_member_halfday}.- <span i18n:translate="">half-day</span></td>
-                            <td>CHF ${rate_set.study_intercantonal_member_hour}.- <span i18n:translate="">per 1h</span></td>
+                            <td>${layout.format_rate(rate_set.study_intercantonal_member_hour)} <span i18n:translate="">per 1h</span></td>
                         </tr>
                         <tr>
                             <th rowspan="2" i18n:translate="">Shortest meeting</th>

tests/onegov/pas/test_forms.py

@@ -423,6 +423,35 @@ def test_rate_set_form(session: Session, dummy_request: Any) -> None:
     assert not form.validate()
     assert 'year' not in form.errors
 
+    # study rates may have decimal places (e.g. 52.45 / 31.70)
+    data = {
+        'year': 2026,
+        'cost_of_living_adjustment': '1.5',
+        'plenary_none_president_halfday': '1000',
+        'plenary_none_member_halfday': '900',
+        'commission_normal_president_initial': '300',
+        'commission_normal_president_additional': '100',
+        'study_normal_president_halfhour': '52.45',
+        'commission_normal_member_initial': '250',
+        'commission_normal_member_additional': '80',
+        'study_normal_member_halfhour': '31.70',
+        'commission_intercantonal_president_halfday': '500',
+        'study_intercantonal_president_hour': '52.45',
+        'commission_intercantonal_member_halfday': '450',
+        'study_intercantonal_member_hour': '31.70',
+        'shortest_all_president_halfhour': '60',
+        'shortest_all_member_halfhour': '50',
+    }
+    form = RateSetForm(DummyPostData(data))
+    form.model = collection
+    form.request = dummy_request
+    assert form.validate(), form.errors
+
+    new_set = collection.add(year=2026)
+    form.populate_obj(new_set)
+    assert float(new_set.study_normal_president_halfhour) == 52.45
+    assert float(new_set.study_normal_member_halfhour) == 31.70
+
 
 def test_settlement_run_form(session: Session, dummy_request: Any) -> None:
     collection = SettlementRunCollection(session)