@@ -2,6 +2,7 @@ import { EditTaskDialogProps } from '../../utils/types';
22import { Badge } from '@/components/ui/badge' ;
33import { Button } from '@/components/ui/button' ;
44import { DatePicker } from '@/components/ui/date-picker' ;
5+ import { DateTimePicker } from '@/components/ui/date-time-picker' ;
56import {
67 Dialog ,
78 DialogClose ,
@@ -350,7 +351,7 @@ export const TaskDialog = ({
350351 < TableCell >
351352 { editState . isEditingStartDate ? (
352353 < div className = "flex items-center gap-2" >
353- < DatePicker
354+ < DateTimePicker
354355 date = {
355356 editState . editedStartDate &&
356357 editState . editedStartDate !== ''
@@ -359,13 +360,10 @@ export const TaskDialog = ({
359360 // Handle YYYY-MM-DD format
360361 const dateStr =
361362 editState . editedStartDate . includes ( 'T' )
362- ? editState . editedStartDate . split (
363- 'T'
364- ) [ 0 ]
365- : editState . editedStartDate ;
366- const parsed = new Date (
367- dateStr + 'T00:00:00'
368- ) ;
363+ ? editState . editedStartDate
364+ : editState . editedStartDate +
365+ 'T00:00:00' ;
366+ const parsed = new Date ( dateStr ) ;
369367 return isNaN ( parsed . getTime ( ) )
370368 ? undefined
371369 : parsed ;
@@ -375,13 +373,16 @@ export const TaskDialog = ({
375373 } ) ( )
376374 : undefined
377375 }
378- onDateChange = { ( date ) =>
376+ onDateTimeChange = { ( date , hasTime ) =>
379377 onUpdateState ( {
380378 editedStartDate : date
381- ? format ( date , 'yyyy-MM-dd' )
379+ ? hasTime
380+ ? date . toISOString ( )
381+ : format ( date , 'yyyy-MM-dd' )
382382 : '' ,
383383 } )
384384 }
385+ placeholder = "Select start date and time"
385386 />
386387
387388 < Button
@@ -420,11 +421,7 @@ export const TaskDialog = ({
420421 onClick = { ( ) => {
421422 onUpdateState ( {
422423 isEditingStartDate : true ,
423- editedStartDate : task . start
424- ? task . start . includes ( 'T' )
425- ? task . start . split ( 'T' ) [ 0 ]
426- : task . start
427- : '' ,
424+ editedStartDate : task . start || '' ,
428425 } ) ;
429426 } }
430427 >
0 commit comments