@@ -432,19 +432,17 @@ export const TaskDialog = ({
432432 < TableCell >
433433 { editState . isEditingEndDate ? (
434434 < div className = "flex items-center gap-2" >
435- < DatePicker
435+ < DateTimePicker
436436 date = {
437437 editState . editedEndDate &&
438438 editState . editedEndDate !== ''
439439 ? ( ( ) => {
440440 try {
441441 const dateStr =
442442 editState . editedEndDate . includes ( 'T' )
443- ? editState . editedEndDate . split ( 'T' ) [ 0 ]
444- : editState . editedEndDate ;
445- const parsed = new Date (
446- dateStr + 'T00:00:00'
447- ) ;
443+ ? editState . editedEndDate
444+ : editState . editedEndDate + 'T00:00:00' ;
445+ const parsed = new Date ( dateStr ) ;
448446 return isNaN ( parsed . getTime ( ) )
449447 ? undefined
450448 : parsed ;
@@ -454,14 +452,16 @@ export const TaskDialog = ({
454452 } ) ( )
455453 : undefined
456454 }
457- onDateChange = { ( date ) =>
455+ onDateTimeChange = { ( date , hasTime ) =>
458456 onUpdateState ( {
459457 editedEndDate : date
460- ? format ( date , 'yyyy-MM-dd' )
458+ ? hasTime
459+ ? date . toISOString ( )
460+ : format ( date , 'yyyy-MM-dd' )
461461 : '' ,
462462 } )
463463 }
464- placeholder = "Select end date"
464+ placeholder = "Select end date and time "
465465 />
466466 < Button
467467 variant = "ghost"
@@ -498,11 +498,7 @@ export const TaskDialog = ({
498498 onClick = { ( ) => {
499499 onUpdateState ( {
500500 isEditingEndDate : true ,
501- editedEndDate : task . end
502- ? task . end . includes ( 'T' )
503- ? task . end . split ( 'T' ) [ 0 ]
504- : task . end
505- : '' ,
501+ editedEndDate : task . end || '' ,
506502 } ) ;
507503 } }
508504 >
0 commit comments