diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma index eec48d8..69b0a1f 100644 --- a/backend/prisma/schema.prisma +++ b/backend/prisma/schema.prisma @@ -52,6 +52,7 @@ model Task { issueNote String? startDate DateTime? dueDate DateTime? + showDate Boolean @default(true) creatorId String assigneeId String? createdAt DateTime @default(now()) diff --git a/frontend/src/components/common/TaskModal.tsx b/frontend/src/components/common/TaskModal.tsx index b423442..19e824a 100644 --- a/frontend/src/components/common/TaskModal.tsx +++ b/frontend/src/components/common/TaskModal.tsx @@ -23,6 +23,7 @@ export interface TaskFormData { quarter: string; startDate: string; dueDate: string; + showDate: boolean; } interface TaskModalProps { @@ -53,6 +54,7 @@ export function TaskModal({ mode, task, defaultSection = 'HR', defaultQuarter = quarter: task?.quarter ?? defaultQuarter, startDate: toDateInput(task?.startDate), dueDate: toDateInput(task?.dueDate), + showDate: task?.showDate ?? true, }); const set = (field: K, value: TaskFormData[K]) => @@ -201,18 +203,26 @@ export function TaskModal({ mode, task, defaultSection = 'HR', defaultQuarter = {/* 프로젝트 기간 */} -
-
- +
+
+ + +
+
set('startDate', e.target.value)} className="w-full border border-gray-200 rounded-xl px-4 py-2.5 outline-none focus:border-blue-400 focus:ring-2 focus:ring-blue-100 transition" /> -
-
- - {(task.startDate || task.dueDate) + {task.showDate && (task.startDate || task.dueDate) ? `${task.startDate ? fmtDate(task.startDate) : '?'} ~ ${task.dueDate ? fmtDate(task.dueDate) : '?'}` : ''} diff --git a/frontend/src/components/dashboard/TaskManager.tsx b/frontend/src/components/dashboard/TaskManager.tsx index 6b79fea..591b3d6 100644 --- a/frontend/src/components/dashboard/TaskManager.tsx +++ b/frontend/src/components/dashboard/TaskManager.tsx @@ -59,6 +59,7 @@ export function TaskManager({ tasks, sectionOptions, quarter, onClose }: TaskMan taskType: data.taskType || null, status: data.status, progress: data.progress, description: data.description || null, issueNote: data.issueNote || null, startDate: data.startDate || null, dueDate: data.dueDate || null, + showDate: data.showDate, quarter: data.quarter, priority: 'MEDIUM', creatorId: 'system', }); setModalMode(null); @@ -73,6 +74,7 @@ export function TaskManager({ tasks, sectionOptions, quarter, onClose }: TaskMan taskType: data.taskType || null, status: data.status, progress: data.progress, description: data.description || null, issueNote: data.issueNote || null, startDate: data.startDate || null, dueDate: data.dueDate || null, + showDate: data.showDate, }, }); setModalMode(null); diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts index 9b38e6f..dc4cdfd 100644 --- a/frontend/src/types/index.ts +++ b/frontend/src/types/index.ts @@ -27,6 +27,7 @@ export interface Task { issueNote: string | null; startDate: string | null; dueDate: string | null; + showDate: boolean; creatorId: string; assigneeId: string | null; createdAt: string;