olafn/infoscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(events): reliable holiday skipping for recurrences + UI badge; clean logs

Browse Source 
Backend: generate EventException on create/update when skip_holidays or recurrence changes; emit RecurrenceException (EXDATE) with exact occurrence start time (UTC)
API: return master events with RecurrenceRule + RecurrenceException
Frontend: map RecurrenceException → recurrenceException; ensure SkipHolidays instances never render on holidays; place TentTree icon (black) next to main event icon via template
Docs: update README and Copilot instructions for recurrence/holiday behavior
Cleanup: remove dataSource and debug console logs
This commit is contained in:
RobbStarkAustria
2025-10-12 12:00:43 +00:00
parent 7ab4ea14c4
commit 773628c324
15 changed files with 698 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
models/models.py
View File

@@ -143,34 +143,49 @@ class MediaType(enum.Enum):
class Event(Base):
__tablename__ = 'events'
id = Column(Integer, primary_key=True, autoincrement=True)
group_id = Column(Integer, ForeignKey(
'client_groups.id'), nullable=False, index=True)
academic_period_id = Column(Integer, ForeignKey(
# Optional für Rückwärtskompatibilität
'academic_periods.id'), nullable=True, index=True)
group_id = Column(Integer, ForeignKey('client_groups.id'), nullable=False, index=True)
academic_period_id = Column(Integer, ForeignKey('academic_periods.id'), nullable=True, index=True) # Optional für Rückwärtskompatibilität
title = Column(String(100), nullable=False)
description = Column(Text, nullable=True)
start = Column(TIMESTAMP(timezone=True), nullable=False, index=True)
end = Column(TIMESTAMP(timezone=True), nullable=False, index=True)
event_type = Column(Enum(EventType), nullable=False)
event_media_id = Column(Integer, ForeignKey(
'event_media.id'), nullable=True)
event_media_id = Column(Integer, ForeignKey('event_media.id'), nullable=True)
autoplay = Column(Boolean, nullable=True) # NEU
loop = Column(Boolean, nullable=True) # NEU
volume = Column(Float, nullable=True) # NEU
slideshow_interval = Column(Integer, nullable=True) # NEU
created_at = Column(TIMESTAMP(timezone=True),
server_default=func.current_timestamp())
updated_at = Column(TIMESTAMP(timezone=True), server_default=func.current_timestamp(
), onupdate=func.current_timestamp())
# Recurrence fields
recurrence_rule = Column(String(255), nullable=True, index=True) # iCalendar RRULE string
recurrence_end = Column(TIMESTAMP(timezone=True), nullable=True, index=True) # When recurrence ends
# Whether recurrences should skip school holidays
skip_holidays = Column(Boolean, nullable=False, server_default='0')
created_at = Column(TIMESTAMP(timezone=True), server_default=func.current_timestamp())
updated_at = Column(TIMESTAMP(timezone=True), server_default=func.current_timestamp(), onupdate=func.current_timestamp())
created_by = Column(Integer, ForeignKey('users.id'), nullable=False)
updated_by = Column(Integer, ForeignKey('users.id'), nullable=True)
is_active = Column(Boolean, default=True, nullable=False)
# Add relationships
academic_period = relationship(
"AcademicPeriod", foreign_keys=[academic_period_id])
academic_period = relationship("AcademicPeriod", foreign_keys=[academic_period_id])
event_media = relationship("EventMedia", foreign_keys=[event_media_id])
exceptions = relationship("EventException", back_populates="event", cascade="all, delete-orphan")
# --- EventException: Store exceptions/overrides for recurring events ---
class EventException(Base):
__tablename__ = 'event_exceptions'
id = Column(Integer, primary_key=True, autoincrement=True)
event_id = Column(Integer, ForeignKey('events.id', ondelete='CASCADE'), nullable=False, index=True)
exception_date = Column(Date, nullable=False, index=True) # Date of the exception/override
is_skipped = Column(Boolean, default=False, nullable=False) # If this occurrence is skipped
override_title = Column(String(100), nullable=True)
override_description = Column(Text, nullable=True)
override_start = Column(TIMESTAMP(timezone=True), nullable=True)
override_end = Column(TIMESTAMP(timezone=True), nullable=True)
created_at = Column(TIMESTAMP(timezone=True), server_default=func.current_timestamp())
updated_at = Column(TIMESTAMP(timezone=True), server_default=func.current_timestamp(), onupdate=func.current_timestamp())
event = relationship("Event", back_populates="exceptions")
class EventMedia(Base):