Skip to content

feat: add end date editing to task details #202

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 2 commits into from
Nov 18, 2025
Merged

feat: add end date editing to task details #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12da559
feat: add end date editing to task details
Hell1213 Nov 17, 2025
0754b7c
fix: resolve merge conflicts with wait field
Hell1213 Nov 18, 2025
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
3 changes: 2 additions & 1 deletion backend/controllers/edit_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
start := requestBody.Start
entry := requestBody.Entry
wait := requestBody.Wait
end := requestBody.End

if taskID == "" {
http.Error(w, "taskID is required", http.StatusBadRequest)
Expand All @@ -60,7 +61,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
Name: "Edit Task",
Execute: func() error {
logStore.AddLog("INFO", fmt.Sprintf("Editing task ID: %s", taskID), uuid, "Edit Task")
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID, tags, project, start, entry, wait)
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID, tags, project, start, entry, wait, end)
if err != nil {
logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskID, err), uuid, "Edit Task")
return err
Expand Down
1 change: 1 addition & 0 deletions backend/models/request_body.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type EditTaskRequestBody struct {
Start string `json:"start"`
Entry string `json:"entry"`
Wait string `json:"wait"`
End string `json:"end"`
}
type CompleteTaskRequestBody struct {
Email string `json:"email"`
Expand Down
9 changes: 8 additions & 1 deletion backend/utils/tw/edit_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
)

func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID string, tags []string, project string, start string, entry string, wait string) error {
func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID string, tags []string, project string, start string, entry string, wait string, end string) error {
if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
return fmt.Errorf("error deleting Taskwarrior data: %v", err)
}
Expand Down Expand Up @@ -87,6 +87,13 @@ func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID st
}
}

// Handle end date
if end != "" {
if err := utils.ExecCommand("task", taskID, "modify", "end:"+end); err != nil {
return fmt.Errorf("failed to set end date %s: %v", end, err)
}
}

// Sync Taskwarrior again
if err := SyncTaskwarrior(tempDir); err != nil {
return err
Expand Down
8 changes: 4 additions & 4 deletions backend/utils/tw/taskwarrior_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestSyncTaskwarrior(t *testing.T) {
}

func TestEditTaskInATaskwarrior(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", nil, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z")
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", nil, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior() failed: %v", err)
} else {
Expand Down Expand Up @@ -68,7 +68,7 @@ func TestAddTaskWithTags(t *testing.T) {
}

func TestEditTaskWithTagAddition(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "+important"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z")
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "+important"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with tag addition failed: %v", err)
} else {
Expand All @@ -77,7 +77,7 @@ func TestEditTaskWithTagAddition(t *testing.T) {
}

func TestEditTaskWithTagRemoval(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"-work", "-lowpriority"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z")
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"-work", "-lowpriority"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with tag removal failed: %v", err)
} else {
Expand All @@ -86,7 +86,7 @@ func TestEditTaskWithTagRemoval(t *testing.T) {
}

func TestEditTaskWithMixedTagOperations(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z")
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with mixed tag operations failed: %v", err)
} else {
Expand Down
132 changes: 124 additions & 8 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ export const Tasks = (
const [editedStartDate, setEditedStartDate] = useState('');
const [isEditingEntryDate, setIsEditingEntryDate] = useState(false);
const [editedEntryDate, setEditedEntryDate] = useState('');
const [isEditingEndDate, setIsEditingEndDate] = useState(false);
const [editedEndDate, setEditedEndDate] = useState('');
const [searchTerm, setSearchTerm] = useState('');
const [lastSyncTime, setLastSyncTime] = useState<number | null>(null);

Expand Down Expand Up @@ -327,7 +329,8 @@ export const Tasks = (
project: string,
start: string,
entry: string,
wait: string
wait: string,
end: string
) {
try {
await editTaskOnBackend({
Expand All @@ -342,6 +345,7 @@ export const Tasks = (
start,
entry,
wait,
end,
});

console.log('Task edited successfully!');
Expand Down Expand Up @@ -387,7 +391,8 @@ export const Tasks = (
task.project,
task.start,
task.entry || '',
task.wait
task.wait || '',
task.end || ''
);
setIsEditing(false);
};
Expand All @@ -404,7 +409,8 @@ export const Tasks = (
task.project,
task.start,
task.entry || '',
task.wait
task.wait || '',
task.end || ''
);
setIsEditingProject(false);
};
Expand All @@ -422,7 +428,8 @@ export const Tasks = (
task.project,
task.start,
task.entry || '',
task.wait
task.wait,
task.end || ''
);

setIsEditingWaitDate(false);
Expand All @@ -441,7 +448,8 @@ export const Tasks = (
task.project,
task.start,
task.entry || '',
task.wait
task.wait || '',
task.end || ''
);

setIsEditingStartDate(false);
Expand All @@ -460,12 +468,33 @@ export const Tasks = (
task.project,
task.start,
task.entry,
task.wait
task.wait,
task.end
);

setIsEditingEntryDate(false);
};

const handleEndDateSaveClick = (task: Task) => {
task.end = editedEndDate;

handleEditTaskOnBackend(
props.email,
props.encryptionSecret,
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.project,
task.start,
task.entry,
task.wait,
task.end
);

setIsEditingEndDate(false);
};

const handleCancelClick = () => {
setIsEditing(false);
};
Expand All @@ -483,6 +512,8 @@ export const Tasks = (
setEditedStartDate('');
setIsEditingEntryDate(false);
setEditedEntryDate('');
setIsEditingEndDate(false);
setEditedEndDate('');
} else {
setSelectedTask(task);
setEditedDescription(task?.description || '');
Expand Down Expand Up @@ -557,7 +588,8 @@ export const Tasks = (
task.project,
task.start,
task.entry || '',
task.wait
task.wait || '',
task.end || ''
);

setIsEditingTags(false); // Exit editing mode
Expand Down Expand Up @@ -1176,7 +1208,91 @@ export const Tasks = (
<TableRow>
<TableCell>End:</TableCell>
<TableCell>
{formattedDate(task.end)}
{isEditingEndDate ? (
<div className="flex items-center gap-2">
<DatePicker
date={
editedEndDate &&
editedEndDate !== ''
? (() => {
try {
const dateStr =
editedEndDate.includes(
'T'
)
? editedEndDate.split(
'T'
)[0]
: editedEndDate;
const parsed =
new Date(
dateStr +
'T00:00:00'
);
return isNaN(
parsed.getTime()
)
? undefined
: parsed;
} catch {
return undefined;
}
})()
: undefined
}
onDateChange={(date) =>
setEditedEndDate(
date
? format(
date,
'yyyy-MM-dd'
)
: ''
)
}
placeholder="Select end date"
/>
<Button
variant="ghost"
size="icon"
onClick={() =>
handleEndDateSaveClick(task)
}
>
<CheckIcon className="h-4 w-4 text-green-500" />
</Button>
<Button
variant="ghost"
size="icon"
onClick={() =>
setIsEditingEndDate(false)
}
>
<XIcon className="h-4 w-4 text-red-500" />
</Button>
</div>
) : (
<div className="flex items-center">
<span>
{formattedDate(task.end)}
</span>
<Button
variant="ghost"
size="icon"
onClick={() => {
setIsEditingEndDate(true);
const endDate = task.end
? task.end.includes('T')
? task.end.split('T')[0]
: task.end
: '';
setEditedEndDate(endDate);
}}
>
<PencilIcon className="h-4 w-4 text-gray-500" />
</Button>
</div>
)}
</TableCell>
</TableRow>
<TableRow>
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/HomeComponents/Tasks/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export const editTaskOnBackend = async ({
start,
entry,
wait,
end,
}: {
email: string;
encryptionSecret: string;
Expand All @@ -104,6 +105,7 @@ export const editTaskOnBackend = async ({
start: string;
entry: string;
wait: string;
end: string;
}) => {
const response = await fetch(`${backendURL}edit-task`, {
method: 'POST',
Expand All @@ -118,6 +120,7 @@ export const editTaskOnBackend = async ({
start,
entry,
wait,
end,
}),
headers: {
'Content-Type': 'application/json',
Expand Down
Loading