mirror of
https://git.hiabuto.net/C3MA/CCMA.git
synced 2026-07-05 05:00:02 +02:00
Update member UI and related app changes
This commit is contained in:
@@ -203,6 +203,7 @@ def _template_values(
|
||||
"member.number": member.member_number,
|
||||
"member.first_name": member.first_name,
|
||||
"member.last_name": member.last_name,
|
||||
"member.nickname": member.nickname,
|
||||
"member.full_name": member.display_name,
|
||||
"member.email": member.email,
|
||||
"member.phone": member.phone,
|
||||
|
||||
@@ -12,7 +12,7 @@ from pathlib import Path
|
||||
from typing import Any
|
||||
from uuid import uuid4
|
||||
|
||||
from ccma.domain.models import HousekeeperFinding
|
||||
from ccma.domain.models import DEFAULT_OPTIONAL_MEMBER_FIELDS, HousekeeperFinding
|
||||
from ccma.rules.api import RuleAction, RuleContext
|
||||
from ccma.rules.loader import LoadedRule, load_rules
|
||||
from ccma.services.intervals import AnniversaryInterval, parse_anniversary_intervals
|
||||
@@ -29,6 +29,8 @@ class HousekeeperSettings:
|
||||
anniversary_intervals: tuple[AnniversaryInterval, ...] = field(
|
||||
default_factory=lambda: tuple(parse_anniversary_intervals("1Y;5Y;10Y;25Y;50Y"))
|
||||
)
|
||||
retroactive_claims: bool = False
|
||||
optional_member_fields: tuple[str, ...] = DEFAULT_OPTIONAL_MEMBER_FIELDS
|
||||
|
||||
@classmethod
|
||||
def from_values(
|
||||
@@ -39,6 +41,8 @@ class HousekeeperSettings:
|
||||
anniversary_days_before: int,
|
||||
anniversary_days_after: int,
|
||||
anniversary_intervals: str,
|
||||
retroactive_claims: bool = False,
|
||||
optional_member_fields: tuple[str, ...] = (),
|
||||
) -> HousekeeperSettings:
|
||||
return cls(
|
||||
birthday_days_before=min(365, max(0, birthday_days_before)),
|
||||
@@ -46,6 +50,8 @@ class HousekeeperSettings:
|
||||
anniversary_days_before=min(365, max(0, anniversary_days_before)),
|
||||
anniversary_days_after=min(365, max(0, anniversary_days_after)),
|
||||
anniversary_intervals=tuple(parse_anniversary_intervals(anniversary_intervals)),
|
||||
retroactive_claims=bool(retroactive_claims),
|
||||
optional_member_fields=tuple(optional_member_fields),
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user