Skip to content

feat(TaskDialog): add datetime picker for wait field #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
its-me-abhishek merged 1 commit into from
Jan 1, 2026
+17 −10
Merged

feat(TaskDialog): add datetime picker for wait field #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions backend/controllers/edit_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
return
}

wait, err = utils.ConvertISOToTaskwarriorFormat(wait)
if err != nil {
http.Error(w, fmt.Sprintf("Invalid wait date format: %v", err), http.StatusBadRequest)
return
}

logStore := models.GetLogStore()
job := Job{
Name: "Edit Task",
Expand Down
19 changes: 10 additions & 9 deletions frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { EditTaskDialogProps } from '../../utils/types';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { DatePicker } from '@/components/ui/date-picker';
import { DateTimePicker } from '@/components/ui/date-time-picker';
import {
Dialog,
Expand Down Expand Up @@ -513,19 +512,18 @@ export const TaskDialog = ({
<TableCell>
{editState.isEditingWaitDate ? (
<div className="flex items-center gap-2">
<DatePicker
<DateTimePicker
date={
editState.editedWaitDate &&
editState.editedWaitDate !== ''
? (() => {
try {
const dateStr =
editState.editedWaitDate.includes('T')
? editState.editedWaitDate.split('T')[0]
: editState.editedWaitDate;
const parsed = new Date(
dateStr + 'T00:00:00'
);
? editState.editedWaitDate
: editState.editedWaitDate +
'T00:00:00';
const parsed = new Date(dateStr);
return isNaN(parsed.getTime())
? undefined
: parsed;
Expand All @@ -535,13 +533,16 @@ export const TaskDialog = ({
})()
: undefined
}
onDateChange={(date) =>
onDateTimeChange={(date, hasTime) =>
onUpdateState({
editedWaitDate: date
? format(date, 'yyyy-MM-dd')
? hasTime
? date.toISOString()
: format(date, 'yyyy-MM-dd')
: '',
})
}
placeholder="Select wait date and time"
/>

<Button
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ describe('Tasks Component', () => {
});

test.each([
['Wait', 'Wait:', 'Pick a date'],
['Wait', 'Wait:', 'Select wait date and time'],
['End', 'End:', 'Select end date and time'],
['Due', 'Due:', 'Select due date and time'],
['Start', 'Start:', 'Select start date and time'],
Expand Down
Loading