diff --git a/backend/alembic/versions/cfe638817921_add_function_type_and_group_dates.py b/backend/alembic/versions/cfe638817921_add_function_type_and_group_dates.py new file mode 100644 index 0000000..1909317 --- /dev/null +++ b/backend/alembic/versions/cfe638817921_add_function_type_and_group_dates.py @@ -0,0 +1,42 @@ +"""add_function_type_and_group_dates + +Revision ID: cfe638817921 +Revises: f5772dd5cd55 +Create Date: 2026-05-31 21:17:13.064051 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = 'cfe638817921' +down_revision: Union[str, None] = 'f5772dd5cd55' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('project_function_groups', schema=None) as batch_op: + batch_op.add_column(sa.Column('start_date', sa.DateTime(timezone=True), nullable=True)) + batch_op.add_column(sa.Column('end_date', sa.DateTime(timezone=True), nullable=True)) + + with op.batch_alter_table('project_functions', schema=None) as batch_op: + batch_op.add_column(sa.Column('function_type', sa.String(length=50), nullable=False)) + + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('project_functions', schema=None) as batch_op: + batch_op.drop_column('function_type') + + with op.batch_alter_table('project_function_groups', schema=None) as batch_op: + batch_op.drop_column('end_date') + batch_op.drop_column('start_date') + + # ### end Alembic commands ### diff --git a/backend/app/models/project.py b/backend/app/models/project.py index 2e2bebe..af21e44 100644 --- a/backend/app/models/project.py +++ b/backend/app/models/project.py @@ -108,6 +108,8 @@ class ProjectFunctionGroup(Base): String(36), ForeignKey("projects.id", ondelete="CASCADE"), nullable=False ) sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0) + start_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True) + end_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True) # Relationships project: Mapped["Project"] = relationship( @@ -135,6 +137,7 @@ class ProjectFunction(Base): ForeignKey("project_function_groups.id", ondelete="CASCADE"), nullable=False, ) + function_type: Mapped[str] = mapped_column(String(50), nullable=False, default='crew') quantity: Mapped[float] = mapped_column(Float, nullable=False, default=1.0) daily_costs: Mapped[float] = mapped_column(Float, nullable=False, default=0.0) total_costs: Mapped[float] = mapped_column(Float, nullable=False, default=0.0) diff --git a/backend/app/schemas/project.py b/backend/app/schemas/project.py index 1e97309..2d6e609 100644 --- a/backend/app/schemas/project.py +++ b/backend/app/schemas/project.py @@ -103,12 +103,16 @@ class ProjectFunctionGroupCreateRequest(BaseModel): """Request body for creating a function group.""" name: str = Field(..., max_length=255) sort_order: int = 0 + start_date: datetime | None = None + end_date: datetime | None = None class ProjectFunctionGroupUpdateRequest(BaseModel): """Request body for updating a function group.""" name: str | None = Field(None, max_length=255) sort_order: int | None = None + start_date: datetime | None = None + end_date: datetime | None = None class ProjectFunctionGroupResponse(BaseModel): @@ -117,6 +121,8 @@ class ProjectFunctionGroupResponse(BaseModel): name: str project_id: str sort_order: int = 0 + start_date: datetime | None = None + end_date: datetime | None = None model_config = {"from_attributes": True} @@ -134,6 +140,7 @@ class ProjectFunctionGroupListResponse(BaseModel): class ProjectFunctionCreateRequest(BaseModel): """Request body for creating a project function.""" name: str = Field(..., max_length=255) + function_type: str = "crew" quantity: float = 1.0 daily_costs: float = 0.0 total_costs: float = 0.0 @@ -143,6 +150,7 @@ class ProjectFunctionCreateRequest(BaseModel): class ProjectFunctionUpdateRequest(BaseModel): """Request body for updating a project function.""" name: str | None = Field(None, max_length=255) + function_type: str | None = None quantity: float | None = None daily_costs: float | None = None total_costs: float | None = None @@ -154,6 +162,7 @@ class ProjectFunctionResponse(BaseModel): id: str name: str function_group_id: str + function_type: str = "crew" quantity: float = 1.0 daily_costs: float = 0.0 total_costs: float = 0.0 diff --git a/frontend/src/components/FunctionGroupEditor.tsx b/frontend/src/components/FunctionGroupEditor.tsx index 3b35140..f240060 100644 --- a/frontend/src/components/FunctionGroupEditor.tsx +++ b/frontend/src/components/FunctionGroupEditor.tsx @@ -17,12 +17,15 @@ interface FunctionGroupItem { name: string; project_id: string; sort_order: number; + start_date: string | null; + end_date: string | null; } interface FunctionItem { id: string; name: string; function_group_id: string; + function_type: string; quantity: number; daily_costs: number; total_costs: number; @@ -49,18 +52,24 @@ export default function FunctionGroupEditor({ const [expandedGroups, setExpandedGroups] = useState>(new Set()); const [editingGroupId, setEditingGroupId] = useState(null); const [editingGroupName, setEditingGroupName] = useState(''); + const [editingGroupStartDate, setEditingGroupStartDate] = useState(''); + const [editingGroupEndDate, setEditingGroupEndDate] = useState(''); const [editingFuncId, setEditingFuncId] = useState(null); const [editingFuncData, setEditingFuncData] = useState<{ name: string; + function_type: string; quantity: number; daily_costs: number; total_costs: number; } | null>(null); const [newGroupName, setNewGroupName] = useState(''); + const [newGroupStartDate, setNewGroupStartDate] = useState(''); + const [newGroupEndDate, setNewGroupEndDate] = useState(''); const [showNewGroup, setShowNewGroup] = useState(false); const [newFuncMap, setNewFuncMap] = useState>({}); const [newFuncData, setNewFuncData] = useState { setEditingGroupId(fg.id); setEditingGroupName(fg.name); + setEditingGroupStartDate(fg.start_date ? fg.start_date.split('T')[0] : ''); + setEditingGroupEndDate(fg.end_date ? fg.end_date.split('T')[0] : ''); }; const cancelEditGroup = () => { setEditingGroupId(null); setEditingGroupName(''); + setEditingGroupStartDate(''); + setEditingGroupEndDate(''); }; const saveGroup = async (fgId: string) => { @@ -95,6 +108,8 @@ export default function FunctionGroupEditor({ try { await api.put(`/projects/${projectId}/function-groups/${fgId}`, { name: editingGroupName.trim(), + start_date: editingGroupStartDate || null, + end_date: editingGroupEndDate || null, }); setEditingGroupId(null); onReload(); @@ -128,6 +143,7 @@ export default function FunctionGroupEditor({ setEditingFuncId(fn.id); setEditingFuncData({ name: fn.name, + function_type: fn.function_type || 'crew', quantity: fn.quantity, daily_costs: fn.daily_costs, total_costs: fn.total_costs, @@ -145,6 +161,7 @@ export default function FunctionGroupEditor({ try { await api.put(`/projects/${projectId}/function-groups/${fgId}/functions/${funcId}`, { name: editingFuncData.name.trim(), + function_type: editingFuncData.function_type, quantity: editingFuncData.quantity, daily_costs: editingFuncData.daily_costs, total_costs: editingFuncData.total_costs, @@ -179,8 +196,12 @@ export default function FunctionGroupEditor({ await api.post(`/projects/${projectId}/function-groups`, { name: newGroupName.trim(), sort_order: functionGroups.length, + start_date: newGroupStartDate || null, + end_date: newGroupEndDate || null, }); setNewGroupName(''); + setNewGroupStartDate(''); + setNewGroupEndDate(''); setShowNewGroup(false); onReload(); } catch (err: any) { @@ -194,7 +215,7 @@ export default function FunctionGroupEditor({ setNewFuncMap(prev => ({ ...prev, [fgId]: true })); setNewFuncData(prev => ({ ...prev, - [fgId]: { name: '', quantity: 1, daily_costs: 0, total_costs: 0 }, + [fgId]: { name: '', function_type: 'crew', quantity: 1, daily_costs: 0, total_costs: 0 }, })); }; @@ -218,6 +239,7 @@ export default function FunctionGroupEditor({ try { await api.post(`/projects/${projectId}/function-groups/${fgId}/functions`, { name: data.name.trim(), + function_type: data.function_type, quantity: data.quantity, daily_costs: data.daily_costs, total_costs: data.total_costs, @@ -241,40 +263,58 @@ export default function FunctionGroupEditor({ {canWrite && (
{showNewGroup ? ( -
- setNewGroupName(e.target.value)} - placeholder="New function group name..." - className={inputClass} - autoFocus - onKeyDown={e => { - if (e.key === 'Enter') addNewGroup(); - if (e.key === 'Escape') { +
+
+ setNewGroupName(e.target.value)} + placeholder="New function group name..." + className={inputClass} + autoFocus + onKeyDown={e => { + if (e.key === 'Enter') addNewGroup(); + if (e.key === 'Escape') { + setShowNewGroup(false); + setNewGroupName(''); + } + }} + /> + setNewGroupStartDate(e.target.value)} + className={inputClass + ' w-auto'} + title="Start date" + /> + setNewGroupEndDate(e.target.value)} + className={inputClass + ' w-auto'} + title="End date" + /> + + - + setNewGroupStartDate(''); + setNewGroupEndDate(''); + }} + className="flex items-center gap-1 px-3 py-1.5 bg-surface border border-border rounded-lg hover:bg-gray-50 text-xs" + > + + Cancel + +
) : (
) : ( - {fg.name} + <> + {fg.name} + {(fg.start_date || fg.end_date) && ( + + {fg.start_date && new Date(fg.start_date).toLocaleDateString('de-DE', {day:'2-digit', month:'2-digit', year:'numeric'})} + {fg.start_date && fg.end_date && ' – '} + {fg.end_date && new Date(fg.end_date).toLocaleDateString('de-DE', {day:'2-digit', month:'2-digit', year:'numeric'})} + + )} + )} Sort: {fg.sort_order} @@ -384,7 +447,7 @@ export default function FunctionGroupEditor({ className="px-4 py-3 flex items-center justify-between hover:bg-gray-50" > {isEditingFunc && editingFuncData ? ( -
+
+
+ + +
-
+