bonamin
e5b8ef32be
- Users: add hourly_rate (Float, nullable) — manager-only, not shown to waiter - WaiterShift: add hourly_rate_snapshot — copied from user.hourly_rate at shift open, never updated - Shift start (both /start and /manager/start): snapshot rate at shift creation - compute_shift_pay(): calculates worked hours (minus breaks) × rate_snapshot; returns None if unset - _enrich_shift(): now includes hourly_rate_snapshot, duration_hours, shift_pay - shifts_report in reports.py: delegates to _enrich_shift so all shift endpoints are consistent - Shifts CSV export: adds duration_hours, hourly_rate, shift_pay columns - StaffTab: hourly_rate field in waiter edit modal (Μισθοδοσία section, col 3) - ShiftsOverview report: Αμοιβή/ώρα + Αποδοχές columns; untracked shows 'Δεν παρακολουθείται' Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
39 lines
1.6 KiB
Python
39 lines
1.6 KiB
Python
from sqlalchemy import Column, Integer, Float, DateTime, ForeignKey, Text
|
|
from sqlalchemy.orm import relationship
|
|
from datetime import datetime, timezone
|
|
from database import Base
|
|
|
|
|
|
def _utcnow():
|
|
return datetime.now(timezone.utc)
|
|
|
|
|
|
class WaiterShift(Base):
|
|
__tablename__ = "waiter_shifts"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
waiter_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
business_day_id = Column(Integer, ForeignKey("business_days.id"), nullable=False)
|
|
started_at = Column(DateTime(timezone=True), default=_utcnow, nullable=False)
|
|
ended_at = Column(DateTime(timezone=True), nullable=True)
|
|
starting_cash = Column(Float, nullable=True)
|
|
total_collected = Column(Float, nullable=True) # snapshot written at shift end
|
|
notes = Column(Text, nullable=True)
|
|
# Phase 2B — payroll snapshot (copied from user.hourly_rate at shift start, never updated)
|
|
hourly_rate_snapshot = Column(Float, nullable=True)
|
|
|
|
waiter = relationship("User", foreign_keys=[waiter_id])
|
|
business_day = relationship("BusinessDay", back_populates="shifts")
|
|
breaks = relationship("ShiftBreak", back_populates="shift", cascade="all, delete-orphan")
|
|
|
|
|
|
class ShiftBreak(Base):
|
|
__tablename__ = "shift_breaks"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
shift_id = Column(Integer, ForeignKey("waiter_shifts.id"), nullable=False)
|
|
started_at = Column(DateTime(timezone=True), default=_utcnow, nullable=False)
|
|
ended_at = Column(DateTime(timezone=True), nullable=True)
|
|
|
|
shift = relationship("WaiterShift", back_populates="breaks")
|