patrick
345002944e
Gap-1: Überziehschutz für Überstundenkonto
- Company.overtime_overdraft_allowed (default: true) – blockiert FZA wenn deaktiviert
- Company.overtime_warning_threshold_hours (default: 0) – Warnung wenn Konto unter Schwelle fällt
- warnings[] jetzt in approve_absence Response (AbsenceApproveOut)
- Migration 0028_overtime_fza_config.py
Gap-2: total_hours wird bei Zeiteintrag-Genehmigung neu berechnet
- time_service.approve_entry() ruft _recalculate_overtime_balance() auf
- last_calculated Timestamp wird gesetzt
Gap-3: Stornierung genehmigter FZA-Anträge bucht taken_hours zurück
- _refund_overtime() Helfer hinzugefügt
- cancel_absence() erlaubt jetzt HR/Admin auch genehmigte Abwesenheiten zu stornieren
- DELETE /absences/{id} gibt jetzt AbsenceOut zurück (statt 204)
- Mitarbeiter können genehmigte FZA-Anträge nicht selbst stornieren (409)
Frontend:
- CompanySettingsPage: neuer Abschnitt 'Freizeitausgleich' mit Toggle + Schwellwert-Eingabe
Tests: backend/tests/test_fza.py mit 6 Tests (alle 3 Gaps)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
65 lines
2.9 KiB
Python
65 lines
2.9 KiB
Python
import enum
|
|
import uuid
|
|
from datetime import datetime
|
|
from typing import TYPE_CHECKING
|
|
|
|
from sqlalchemy import Boolean, DateTime, Integer, String, Text
|
|
from sqlalchemy.dialects.postgresql import JSONB, UUID
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from app.core.database import Base
|
|
|
|
if TYPE_CHECKING:
|
|
from app.models.user import User
|
|
from app.models.department import Department
|
|
|
|
|
|
class PersonnelNumberMode(str, enum.Enum):
|
|
MANUAL = "manual"
|
|
AUTO = "auto"
|
|
|
|
|
|
class Company(Base):
|
|
__tablename__ = "companies"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
slug: Mapped[str] = mapped_column(String(100), unique=True, nullable=False)
|
|
plan: Mapped[str] = mapped_column(String(50), default="trial")
|
|
logo_url: Mapped[str | None] = mapped_column(Text)
|
|
country: Mapped[str] = mapped_column(String(10), default="DE")
|
|
state: Mapped[str | None] = mapped_column(String(10))
|
|
settings: Mapped[dict] = mapped_column(JSONB, default=dict)
|
|
|
|
# Personalnummern-Konfiguration
|
|
personnel_number_required: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
|
personnel_number_mode: Mapped[str] = mapped_column(String(10), nullable=False, default=PersonnelNumberMode.MANUAL.value)
|
|
personnel_number_next: Mapped[int] = mapped_column(Integer, nullable=False, default=1)
|
|
|
|
# Krankmeldungs-Konfiguration: Default-Schwelle für AU-Pflicht (in Tagen).
|
|
# Pro AbsenceType via certificate_after_days überschreibbar.
|
|
sick_note_required_after_days: Mapped[int] = mapped_column(Integer, nullable=False, default=3)
|
|
|
|
# Busylight-Pull: SHA-256-Hash des per-Firma-Tokens (Klartext nie in DB).
|
|
busylight_pull_token_hash: Mapped[str | None] = mapped_column(String(64), unique=True)
|
|
busylight_token_created_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
|
|
|
# Kiosk-Konfiguration
|
|
kiosk_require_approval: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
kiosk_track_current_user: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
kiosk_heartbeat_interval_sec: Mapped[int] = mapped_column(Integer, nullable=False, default=30)
|
|
|
|
# Mobile-Konfiguration
|
|
mobile_stamping_enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
|
|
# Freizeitausgleich-Konfiguration
|
|
overtime_overdraft_allowed: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
overtime_warning_threshold_hours: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
|
|
|
|
# Relationships
|
|
users: Mapped[list["User"]] = relationship("User", back_populates="company", lazy="noload")
|
|
departments: Mapped[list["Department"]] = relationship("Department", back_populates="company", lazy="noload")
|
|
|
|
def __repr__(self) -> str:
|
|
return f"<Company {self.name}>"
|