Add editable status column and submission markers to the Gantt chart
Adds a second frozen "Task Status" column (EditableTaskStatus) next to the task name, and small white dot markers on each bar showing submission dates - backed by a new lightweight GET /tasks/submission-dates endpoint (task_id + submitted_at only, to avoid an N+1 fetch across potentially hundreds of scheduled tasks). Restructures the chart's scroll handling from a single scrolling container with sticky-positioned columns to two independently-scrolled panes (frozen name/status columns, and the timeline), synced on vertical scroll. This fixes several issues that came with the sticky approach - transparency bleed-through on hover and on group-header rows, row heights not matching between columns, and the horizontal scrollbar spanning the frozen columns instead of just the timeline. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -67,129 +67,180 @@
|
||||
<div v-else-if="error" class="flex-1 flex items-center justify-center text-sm text-destructive">
|
||||
{{ error }}
|
||||
</div>
|
||||
<div v-else class="flex-1 overflow-auto">
|
||||
<div v-if="unscheduledCount > 0" class="px-4 sm:px-6 py-2 text-xs text-muted-foreground border-b bg-muted/30">
|
||||
<div v-else class="flex-1 flex flex-col overflow-hidden">
|
||||
<div v-if="unscheduledCount > 0" class="flex-shrink-0 px-4 sm:px-6 py-2 text-xs text-muted-foreground border-b bg-muted/30">
|
||||
{{ unscheduledCount }} task{{ unscheduledCount === 1 ? '' : 's' }} without both a start date and deadline
|
||||
{{ unscheduledCount === 1 ? "isn't" : "aren't" }} shown on the chart.
|
||||
</div>
|
||||
|
||||
<div v-if="taskTypeGroups.length === 0" class="p-12 text-center text-sm text-muted-foreground">
|
||||
<div v-if="taskTypeGroups.length === 0" class="flex-1 p-12 text-center text-sm text-muted-foreground">
|
||||
No scheduled tasks to display yet. Set a start date and deadline on a task to see it here.
|
||||
</div>
|
||||
|
||||
<div v-else class="relative min-w-max">
|
||||
<!-- Date axis header: month row on top, date-number row below -->
|
||||
<div class="flex sticky top-0 z-30 bg-background border-b">
|
||||
<div class="w-56 h-11 flex-shrink-0 border-r sticky left-0 z-10 bg-background px-3 flex items-center text-xs font-medium text-muted-foreground">
|
||||
Task Type / Task
|
||||
<div v-else class="flex-1 flex overflow-hidden">
|
||||
<!-- Frozen pane: Task Type/Task + Task Status columns, vertical scroll only -->
|
||||
<div
|
||||
ref="frozenPaneRef"
|
||||
class="no-scrollbar overflow-y-auto overflow-x-hidden flex-shrink-0 border-r"
|
||||
:style="{ width: FROZEN_WIDTH + 'px' }"
|
||||
@scroll="handleFrozenScroll"
|
||||
>
|
||||
<div class="flex sticky top-0 z-10 bg-background border-b" :style="{ height: HEADER_HEIGHT + 'px' }">
|
||||
<div class="border-r px-3 flex items-center text-xs font-medium text-muted-foreground flex-shrink-0" :style="{ width: LABEL_COLUMN_WIDTH + 'px' }">
|
||||
Task Type / Task
|
||||
</div>
|
||||
<div class="px-3 flex items-center text-xs font-medium text-muted-foreground flex-shrink-0" :style="{ width: STATUS_COLUMN_WIDTH + 'px' }">
|
||||
Task Status
|
||||
</div>
|
||||
</div>
|
||||
<div class="relative flex-1" :style="{ width: chartWidth + 'px', minWidth: chartWidth + 'px' }">
|
||||
<div class="relative h-5 border-b">
|
||||
<div
|
||||
v-for="marker in topAxisMarkers"
|
||||
:key="'month-' + marker.left"
|
||||
class="absolute top-0 bottom-0 border-l px-1.5 flex items-center overflow-hidden text-[10px] font-medium text-muted-foreground whitespace-nowrap"
|
||||
:style="{ left: marker.left + 'px', width: marker.width + 'px' }"
|
||||
>
|
||||
{{ marker.label }}
|
||||
|
||||
<div v-for="group in taskTypeGroups" :key="group.taskType">
|
||||
<div
|
||||
class="flex items-center border-b bg-muted/40 cursor-pointer select-none"
|
||||
:style="{ height: GROUP_ROW_HEIGHT + 'px' }"
|
||||
@click="toggleGroup(group.taskType)"
|
||||
>
|
||||
<div class="border-r px-3 text-xs font-medium flex items-center gap-1 self-stretch flex-shrink-0" :style="{ width: LABEL_COLUMN_WIDTH + 'px' }">
|
||||
<component
|
||||
:is="isCollapsed(group.taskType) ? ChevronRight : ChevronDown"
|
||||
class="h-3.5 w-3.5 flex-shrink-0 text-muted-foreground"
|
||||
/>
|
||||
<span class="truncate">{{ formatTaskType(group.taskType) }}</span>
|
||||
<span class="text-muted-foreground flex-shrink-0">({{ group.tasks.length }})</span>
|
||||
</div>
|
||||
<div class="flex-shrink-0" :style="{ width: STATUS_COLUMN_WIDTH + 'px' }"></div>
|
||||
</div>
|
||||
<div class="relative h-6">
|
||||
|
||||
<template v-if="!isCollapsed(group.taskType)">
|
||||
<div
|
||||
v-for="marker in axisMarkers"
|
||||
:key="'day-' + marker.left"
|
||||
class="absolute top-0 bottom-0 border-l flex items-center overflow-hidden text-[10px] text-muted-foreground px-1.5 whitespace-nowrap"
|
||||
:style="{ left: marker.left + 'px', width: marker.width ? marker.width + 'px' : undefined }"
|
||||
v-for="task in group.tasks"
|
||||
:key="task.id"
|
||||
class="group flex items-center border-b hover:bg-muted/30"
|
||||
:style="{ height: TASK_ROW_HEIGHT + 'px' }"
|
||||
>
|
||||
{{ marker.label }}
|
||||
<div class="border-r pl-8 pr-3 text-xs truncate self-stretch flex items-center flex-shrink-0" :style="{ width: LABEL_COLUMN_WIDTH + 'px' }">
|
||||
{{ task.shot_name || task.asset_name || task.name }}
|
||||
</div>
|
||||
<div class="border-r px-3 flex items-center self-stretch flex-shrink-0" :style="{ width: STATUS_COLUMN_WIDTH + 'px' }">
|
||||
<EditableTaskStatus
|
||||
:task-id="task.id"
|
||||
:status="task.status"
|
||||
:project-id="projectId"
|
||||
@status-updated="handleStatusUpdated"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Weekend shading -->
|
||||
<div
|
||||
v-for="col in weekendColumns"
|
||||
:key="col.left"
|
||||
class="absolute top-0 bottom-0 pointer-events-none"
|
||||
:style="{ left: (LABEL_COLUMN_WIDTH + col.left) + 'px', width: pixelsPerDay + 'px', backgroundColor: 'hsl(var(--muted))' }"
|
||||
></div>
|
||||
|
||||
<!-- Rows -->
|
||||
<div v-for="group in taskTypeGroups" :key="group.taskType">
|
||||
<div
|
||||
class="flex items-center border-b bg-muted/40 cursor-pointer select-none"
|
||||
@click="toggleGroup(group.taskType)"
|
||||
>
|
||||
<div class="w-56 flex-shrink-0 border-r px-3 py-2 text-xs font-medium flex items-center gap-1 sticky left-0 z-10 bg-muted/40">
|
||||
<component
|
||||
:is="isCollapsed(group.taskType) ? ChevronRight : ChevronDown"
|
||||
class="h-3.5 w-3.5 flex-shrink-0 text-muted-foreground"
|
||||
/>
|
||||
<span class="truncate">{{ formatTaskType(group.taskType) }}</span>
|
||||
<span class="text-muted-foreground flex-shrink-0">({{ group.tasks.length }})</span>
|
||||
</div>
|
||||
<div class="relative flex-1" :style="{ width: chartWidth + 'px', minWidth: chartWidth + 'px', height: '32px' }">
|
||||
<div
|
||||
v-if="group.barLeft !== null"
|
||||
class="absolute top-1/2 -translate-y-1/2 h-1.5 rounded-full"
|
||||
:style="{ left: group.barLeft + 'px', width: group.barWidth + 'px', backgroundColor: 'rgba(100, 116, 139, 0.5)' }"
|
||||
></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="!isCollapsed(group.taskType)">
|
||||
<div
|
||||
v-for="task in group.tasks"
|
||||
:key="task.id"
|
||||
class="group flex items-center border-b hover:bg-muted/30"
|
||||
>
|
||||
<div class="w-56 flex-shrink-0 border-r pl-8 pr-3 py-1.5 text-xs truncate sticky left-0 z-10 bg-background group-hover:bg-muted/30">
|
||||
{{ task.shot_name || task.asset_name || task.name }}
|
||||
</div>
|
||||
<div class="relative flex-1" :style="{ width: chartWidth + 'px', minWidth: chartWidth + 'px', height: '32px' }">
|
||||
<!-- Timeline pane: date axis + bars, scrolls both ways -->
|
||||
<div ref="timelinePaneRef" class="flex-1 overflow-auto" @scroll="handleTimelineScroll">
|
||||
<div class="relative" :style="{ width: chartWidth + 'px', minWidth: chartWidth + 'px' }">
|
||||
<!-- Date axis header: month row on top, date-number row below -->
|
||||
<div class="sticky top-0 z-10 bg-background border-b" :style="{ height: HEADER_HEIGHT + 'px' }">
|
||||
<div class="relative h-5 border-b">
|
||||
<div
|
||||
class="group absolute top-1/2 -translate-y-1/2 h-4 rounded hover:brightness-90 transition-[filter]"
|
||||
:class="{ 'ring-2 ring-primary': isTaskActive(task) }"
|
||||
:style="taskBarStyle(task)"
|
||||
:title="taskBarTitle(task)"
|
||||
v-for="marker in topAxisMarkers"
|
||||
:key="'month-' + marker.left"
|
||||
class="absolute top-0 bottom-0 border-l px-1.5 flex items-center overflow-hidden text-[10px] font-medium text-muted-foreground whitespace-nowrap"
|
||||
:style="{ left: marker.left + 'px', width: marker.width + 'px' }"
|
||||
>
|
||||
<div
|
||||
class="absolute inset-y-0 left-0 cursor-grab active:cursor-grabbing"
|
||||
style="right: 6px;"
|
||||
@mousedown="startDrag($event, task, 'move')"
|
||||
></div>
|
||||
<div
|
||||
class="absolute inset-y-0 left-0 w-1.5 cursor-ew-resize opacity-0 group-hover:opacity-100 rounded-l"
|
||||
style="background-color: rgba(0, 0, 0, 0.2);"
|
||||
@mousedown="startDrag($event, task, 'resize-start')"
|
||||
></div>
|
||||
<div
|
||||
class="absolute inset-y-0 right-0 w-1.5 cursor-ew-resize opacity-0 group-hover:opacity-100 rounded-r"
|
||||
style="background-color: rgba(0, 0, 0, 0.2);"
|
||||
@mousedown="startDrag($event, task, 'resize-end')"
|
||||
></div>
|
||||
<span
|
||||
class="absolute left-full top-1/2 -translate-y-1/2 ml-1.5 text-[10px] text-foreground whitespace-nowrap pointer-events-none transition-opacity"
|
||||
:class="isTaskActive(task) ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'"
|
||||
>
|
||||
{{ task.shot_name || task.asset_name || task.name }}
|
||||
</span>
|
||||
{{ marker.label }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="relative h-6">
|
||||
<div
|
||||
v-for="marker in axisMarkers"
|
||||
:key="'day-' + marker.left"
|
||||
class="absolute top-0 bottom-0 border-l flex items-center overflow-hidden text-[10px] text-muted-foreground px-1.5 whitespace-nowrap"
|
||||
:style="{ left: marker.left + 'px', width: marker.width ? marker.width + 'px' : undefined }"
|
||||
>
|
||||
{{ marker.label }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- Today marker -->
|
||||
<div
|
||||
v-if="todayLeft !== null"
|
||||
class="absolute top-0 bottom-0 w-px pointer-events-none"
|
||||
:style="{ left: (LABEL_COLUMN_WIDTH + todayLeft) + 'px', backgroundColor: 'rgba(239, 68, 68, 0.7)' }"
|
||||
>
|
||||
<span class="absolute top-0 left-1/2 -translate-x-1/2 text-[9px] text-red-500 bg-background px-0.5 whitespace-nowrap">
|
||||
Today
|
||||
</span>
|
||||
<!-- Weekend shading -->
|
||||
<div
|
||||
v-for="col in weekendColumns"
|
||||
:key="col.left"
|
||||
class="absolute top-0 bottom-0 pointer-events-none"
|
||||
:style="{ left: col.left + 'px', width: pixelsPerDay + 'px', backgroundColor: 'hsl(var(--muted))' }"
|
||||
></div>
|
||||
|
||||
<!-- Rows -->
|
||||
<div v-for="group in taskTypeGroups" :key="group.taskType">
|
||||
<div
|
||||
class="relative border-b bg-muted/40 cursor-pointer"
|
||||
:style="{ height: GROUP_ROW_HEIGHT + 'px' }"
|
||||
@click="toggleGroup(group.taskType)"
|
||||
>
|
||||
<div
|
||||
v-if="group.barLeft !== null"
|
||||
class="absolute top-1/2 -translate-y-1/2 h-1.5 rounded-full"
|
||||
:style="{ left: group.barLeft + 'px', width: group.barWidth + 'px', backgroundColor: 'rgba(100, 116, 139, 0.5)' }"
|
||||
></div>
|
||||
</div>
|
||||
|
||||
<template v-if="!isCollapsed(group.taskType)">
|
||||
<div
|
||||
v-for="task in group.tasks"
|
||||
:key="task.id"
|
||||
class="relative border-b hover:bg-muted/30"
|
||||
:style="{ height: TASK_ROW_HEIGHT + 'px' }"
|
||||
>
|
||||
<div
|
||||
class="group absolute top-1/2 -translate-y-1/2 h-4 rounded hover:brightness-90 transition-[filter]"
|
||||
:class="{ 'ring-2 ring-primary': isTaskActive(task) }"
|
||||
:style="taskBarStyle(task)"
|
||||
:title="taskBarTitle(task)"
|
||||
>
|
||||
<div
|
||||
class="absolute inset-y-0 left-0 cursor-grab active:cursor-grabbing"
|
||||
style="right: 6px;"
|
||||
@mousedown="startDrag($event, task, 'move')"
|
||||
></div>
|
||||
<div
|
||||
class="absolute inset-y-0 left-0 w-1.5 cursor-ew-resize opacity-0 group-hover:opacity-100 rounded-l"
|
||||
style="background-color: rgba(0, 0, 0, 0.2);"
|
||||
@mousedown="startDrag($event, task, 'resize-start')"
|
||||
></div>
|
||||
<div
|
||||
class="absolute inset-y-0 right-0 w-1.5 cursor-ew-resize opacity-0 group-hover:opacity-100 rounded-r"
|
||||
style="background-color: rgba(0, 0, 0, 0.2);"
|
||||
@mousedown="startDrag($event, task, 'resize-end')"
|
||||
></div>
|
||||
<span
|
||||
class="absolute left-full top-1/2 -translate-y-1/2 ml-1.5 text-[10px] text-foreground whitespace-nowrap pointer-events-none transition-opacity"
|
||||
:class="isTaskActive(task) ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'"
|
||||
>
|
||||
{{ task.shot_name || task.asset_name || task.name }}
|
||||
</span>
|
||||
</div>
|
||||
<!-- Submission date markers -->
|
||||
<div
|
||||
v-for="date in submissionDatesFor(task.id)"
|
||||
:key="date"
|
||||
class="absolute top-1/2 h-2 w-2 rounded-full bg-white border border-slate-500 pointer-events-none"
|
||||
:style="{ left: dateToLeft(parseDate(date)) + 'px', transform: 'translate(-50%, -50%)' }"
|
||||
:title="`Submitted ${formatDate(date)}`"
|
||||
></div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- Today marker -->
|
||||
<div
|
||||
v-if="todayLeft !== null"
|
||||
class="absolute top-0 bottom-0 w-px pointer-events-none"
|
||||
:style="{ left: todayLeft + 'px', backgroundColor: 'rgba(239, 68, 68, 0.7)' }"
|
||||
>
|
||||
<span class="absolute top-0 left-1/2 -translate-x-1/2 text-[9px] text-red-500 bg-background px-0.5 whitespace-nowrap">
|
||||
Today
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -213,7 +264,8 @@ import { DatePicker } from '@/components/ui/date-picker'
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
||||
import DetailPanelOverlay from '@/components/shared/DetailPanelOverlay.vue'
|
||||
import TaskDetailPanel from '@/components/task/TaskDetailPanel.vue'
|
||||
import { taskService, type TaskListItem } from '@/services/task'
|
||||
import EditableTaskStatus from '@/components/task/EditableTaskStatus.vue'
|
||||
import { taskService, type TaskListItem, type SubmissionDateInfo } from '@/services/task'
|
||||
import { useTaskStatusesStore } from '@/stores/taskStatuses'
|
||||
import { useDetailPanel } from '@/composables/useDetailPanel'
|
||||
import { useToast } from '@/components/ui/toast/use-toast'
|
||||
@@ -236,10 +288,37 @@ const {
|
||||
const isLoading = ref(false)
|
||||
const error = ref<string | null>(null)
|
||||
const tasks = ref<TaskListItem[]>([])
|
||||
const submissionDates = ref<SubmissionDateInfo[]>([])
|
||||
const episodeFilter = ref<number | null>(null)
|
||||
const collapsedGroups = ref<Set<string>>(new Set())
|
||||
|
||||
const LABEL_COLUMN_WIDTH = 224 // matches w-56
|
||||
const STATUS_COLUMN_WIDTH = 176 // matches w-44
|
||||
const FROZEN_WIDTH = LABEL_COLUMN_WIDTH + STATUS_COLUMN_WIDTH
|
||||
const HEADER_HEIGHT = 44
|
||||
const GROUP_ROW_HEIGHT = 32
|
||||
const TASK_ROW_HEIGHT = 36
|
||||
|
||||
// The frozen (Task Type/Task Status) pane and the timeline pane are two
|
||||
// independently-scrolled elements so the horizontal scrollbar only ever
|
||||
// spans the timeline. Vertical scroll position is kept in sync between them.
|
||||
const frozenPaneRef = ref<HTMLElement | null>(null)
|
||||
const timelinePaneRef = ref<HTMLElement | null>(null)
|
||||
let syncingScroll = false
|
||||
|
||||
function handleFrozenScroll() {
|
||||
if (syncingScroll || !frozenPaneRef.value || !timelinePaneRef.value) return
|
||||
syncingScroll = true
|
||||
timelinePaneRef.value.scrollTop = frozenPaneRef.value.scrollTop
|
||||
syncingScroll = false
|
||||
}
|
||||
|
||||
function handleTimelineScroll() {
|
||||
if (syncingScroll || !frozenPaneRef.value || !timelinePaneRef.value) return
|
||||
syncingScroll = true
|
||||
frozenPaneRef.value.scrollTop = timelinePaneRef.value.scrollTop
|
||||
syncingScroll = false
|
||||
}
|
||||
|
||||
const SCALES = ['day', 'week', 'month'] as const
|
||||
type ViewScale = typeof SCALES[number]
|
||||
@@ -290,6 +369,33 @@ async function loadTasks() {
|
||||
}
|
||||
}
|
||||
|
||||
async function loadSubmissionDates() {
|
||||
try {
|
||||
submissionDates.value = await taskService.getSubmissionDates(props.projectId)
|
||||
} catch (err) {
|
||||
console.error('Failed to load submission dates:', err)
|
||||
}
|
||||
}
|
||||
|
||||
// task_id -> deduplicated YYYY-MM-DD submission dates, for the white dot markers on each bar.
|
||||
const submissionDatesByTask = computed(() => {
|
||||
const map = new Map<number, string[]>()
|
||||
for (const s of submissionDates.value) {
|
||||
const day = s.submitted_at.slice(0, 10)
|
||||
const existing = map.get(s.task_id)
|
||||
if (existing) {
|
||||
if (!existing.includes(day)) existing.push(day)
|
||||
} else {
|
||||
map.set(s.task_id, [day])
|
||||
}
|
||||
}
|
||||
return map
|
||||
})
|
||||
|
||||
function submissionDatesFor(taskId: number): string[] {
|
||||
return submissionDatesByTask.value.get(taskId) || []
|
||||
}
|
||||
|
||||
const episodeOptions = computed(() => {
|
||||
const map = new Map<number, string>()
|
||||
for (const t of tasks.value) {
|
||||
@@ -497,6 +603,11 @@ function isTaskActive(task: TaskListItem): boolean {
|
||||
return selectedTask.value?.id === task.id
|
||||
}
|
||||
|
||||
function handleStatusUpdated(taskId: number, newStatus: string) {
|
||||
const task = tasks.value.find(t => t.id === taskId)
|
||||
if (task) task.status = newStatus
|
||||
}
|
||||
|
||||
// --- Drag to reschedule ---
|
||||
|
||||
interface DragState {
|
||||
@@ -620,6 +731,7 @@ function openTask(taskId: number) {
|
||||
|
||||
onMounted(() => {
|
||||
loadTasks()
|
||||
loadSubmissionDates()
|
||||
taskStatusesStore.fetchProjectStatuses(props.projectId)
|
||||
})
|
||||
|
||||
@@ -634,6 +746,18 @@ watch(() => props.projectId, () => {
|
||||
manualRangeStart.value = ''
|
||||
manualRangeEnd.value = ''
|
||||
loadTasks()
|
||||
loadSubmissionDates()
|
||||
taskStatusesStore.fetchProjectStatuses(props.projectId)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
/* Frozen pane scrolls vertically (kept in sync with the timeline pane) but
|
||||
shouldn't show its own scrollbar - the timeline pane's scrollbar is enough. */
|
||||
.no-scrollbar {
|
||||
scrollbar-width: none;
|
||||
}
|
||||
.no-scrollbar::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -109,6 +109,11 @@ export interface Submission {
|
||||
stream_url?: string
|
||||
}
|
||||
|
||||
export interface SubmissionDateInfo {
|
||||
task_id: number
|
||||
submitted_at: string
|
||||
}
|
||||
|
||||
export interface TaskFilters {
|
||||
projectId?: number
|
||||
shotId?: number
|
||||
@@ -249,6 +254,11 @@ class TaskService {
|
||||
return response.data
|
||||
}
|
||||
|
||||
async getSubmissionDates(projectId: number): Promise<SubmissionDateInfo[]> {
|
||||
const response = await apiClient.get(`/tasks/submission-dates?project_id=${projectId}`)
|
||||
return response.data
|
||||
}
|
||||
|
||||
async submitWork(taskId: number, file: File, notes?: string): Promise<Submission> {
|
||||
const formData = new FormData()
|
||||
formData.append('file', file)
|
||||
|
||||
Reference in New Issue
Block a user