Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 1 deletion backend/utils/tw/add_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ func AddTaskToTaskwarrior(req models.AddTaskRequestBody, dueDate string) error {
cmdArgs = append(cmdArgs, "entry:"+req.EntryDate)
}
if req.WaitDate != "" {
cmdArgs = append(cmdArgs, "wait:"+req.WaitDate)
wait, err := utils.ConvertISOToTaskwarriorFormat(req.WaitDate)
if err != nil {
return fmt.Errorf("unexpected date format error: %v", err)
}
cmdArgs = append(cmdArgs, "wait:"+wait)
}
if req.End != "" {
cmdArgs = append(cmdArgs, "end:"+req.End)
Expand Down
22 changes: 17 additions & 5 deletions frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,27 @@ export const AddTaskdialog = ({
Wait
</Label>
<div className="col-span-3">
<DatePicker
date={newTask.wait ? new Date(newTask.wait) : undefined}
onDateChange={(date) => {
<DateTimePicker
date={
newTask.wait
? new Date(
newTask.wait.includes('T')
? newTask.wait
: `${newTask.wait}T00:00:00`
)
: undefined
}
onDateTimeChange={(date, hasTime) => {
setNewTask({
...newTask,
wait: date ? format(date, 'yyyy-MM-dd') : '',
wait: date
? hasTime
? date.toISOString()
: format(date, 'yyyy-MM-dd')
: '',
});
}}
placeholder="Select a wait date"
placeholder="Select wait date and time"
/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,11 @@ describe('AddTaskDialog Component', () => {
label: 'Start',
placeholder: 'Select start date and time',
},
{
name: 'wait',
label: 'Wait',
placeholder: 'Select wait date and time',
},
];

test.each(dateTimeFields)(
Expand Down Expand Up @@ -507,7 +512,6 @@ describe('AddTaskDialog Component', () => {
const dateOnlyFields = [
{ name: 'end', label: 'End', placeholder: 'Select an end date' },
{ name: 'entry', label: 'Entry', placeholder: 'Select an entry date' },
{ name: 'wait', label: 'Wait', placeholder: 'Select a wait date' },
];

test.each(dateOnlyFields)(
Expand Down
Loading