derekc
c9441a9c9a
Subject options: - New subject_options table (auto-created on startup) - SubjectOut now includes options list; all eager-loading chains updated - Admin: Options panel per subject with add, inline edit, and delete - WS broadcast and dashboard API include options in block subject data TV dashboard: - Three equal columns: Timer | Activities | Schedule - Activities column shows current subject's options in large readable text - Activities area has subject-colored border and tinted background - Subject name and label displayed correctly using embedded subject data Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
40 lines
1.7 KiB
Python
40 lines
1.7 KiB
Python
from sqlalchemy import String, Boolean, ForeignKey, Text, Integer
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
from app.models.base import Base, TimestampMixin
|
|
|
|
|
|
class Subject(TimestampMixin, Base):
|
|
__tablename__ = "subjects"
|
|
|
|
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
|
|
user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
|
|
name: Mapped[str] = mapped_column(String(100), nullable=False)
|
|
color: Mapped[str] = mapped_column(String(7), default="#10B981") # hex color
|
|
icon: Mapped[str] = mapped_column(String(10), default="📚") # emoji
|
|
is_active: Mapped[bool] = mapped_column(Boolean, default=True)
|
|
|
|
user: Mapped["User"] = relationship("User", back_populates="subjects") # noqa: F821
|
|
schedule_blocks: Mapped[list["ScheduleBlock"]] = relationship( # noqa: F821
|
|
"ScheduleBlock", back_populates="subject"
|
|
)
|
|
activity_logs: Mapped[list["ActivityLog"]] = relationship( # noqa: F821
|
|
"ActivityLog", back_populates="subject"
|
|
)
|
|
options: Mapped[list["SubjectOption"]] = relationship(
|
|
"SubjectOption", back_populates="subject", cascade="all, delete-orphan",
|
|
order_by="SubjectOption.order_index"
|
|
)
|
|
|
|
|
|
class SubjectOption(Base):
|
|
__tablename__ = "subject_options"
|
|
|
|
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
|
|
subject_id: Mapped[int] = mapped_column(
|
|
ForeignKey("subjects.id", ondelete="CASCADE"), nullable=False
|
|
)
|
|
text: Mapped[str] = mapped_column(Text, nullable=False)
|
|
order_index: Mapped[int] = mapped_column(Integer, default=0)
|
|
|
|
subject: Mapped["Subject"] = relationship("Subject", back_populates="options")
|