diff --git a/backend/controllers/add_task.go b/backend/controllers/add_task.go
index b4ec8c7e..0bd367ef 100644
--- a/backend/controllers/add_task.go
+++ b/backend/controllers/add_task.go
@@ -47,6 +47,7 @@ func AddTaskHandler(w http.ResponseWriter, r *http.Request) {
priority := requestBody.Priority
dueDate := requestBody.DueDate
tags := requestBody.Tags
+ annotations := requestBody.Annotations
if description == "" {
http.Error(w, "Description is required, and cannot be empty!", http.StatusBadRequest)
@@ -62,7 +63,7 @@ func AddTaskHandler(w http.ResponseWriter, r *http.Request) {
Name: "Add Task",
Execute: func() error {
logStore.AddLog("INFO", fmt.Sprintf("Adding task: %s", description), uuid, "Add Task")
- err := tw.AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDateStr, tags)
+ err := tw.AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDateStr, tags, annotations)
if err != nil {
logStore.AddLog("ERROR", fmt.Sprintf("Failed to add task: %v", err), uuid, "Add Task")
return err
diff --git a/backend/models/request_body.go b/backend/models/request_body.go
index 32290070..f62b684a 100644
--- a/backend/models/request_body.go
+++ b/backend/models/request_body.go
@@ -2,14 +2,15 @@ package models
// Request body for task related request handlers
type AddTaskRequestBody struct {
- Email string `json:"email"`
- EncryptionSecret string `json:"encryptionSecret"`
- UUID string `json:"UUID"`
- Description string `json:"description"`
- Project string `json:"project"`
- Priority string `json:"priority"`
- DueDate *string `json:"due"`
- Tags []string `json:"tags"`
+ Email string `json:"email"`
+ EncryptionSecret string `json:"encryptionSecret"`
+ UUID string `json:"UUID"`
+ Description string `json:"description"`
+ Project string `json:"project"`
+ Priority string `json:"priority"`
+ DueDate *string `json:"due"`
+ Tags []string `json:"tags"`
+ Annotations []Annotation `json:"annotations"`
}
type ModifyTaskRequestBody struct {
Email string `json:"email"`
diff --git a/backend/utils/tw/add_task.go b/backend/utils/tw/add_task.go
index 16105f7b..b4f644a8 100644
--- a/backend/utils/tw/add_task.go
+++ b/backend/utils/tw/add_task.go
@@ -1,14 +1,16 @@
package tw
import (
+ "ccsync_backend/models"
"ccsync_backend/utils"
+ "encoding/json"
"fmt"
"os"
"strings"
)
// add task to the user's tw client
-func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDate string, tags []string) error {
+func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDate string, tags []string, annotations []models.Annotation) error {
if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
return fmt.Errorf("error deleting Taskwarrior data: %v", err)
}
@@ -53,6 +55,34 @@ func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, p
return fmt.Errorf("failed to add task: %v\n %v", err, cmdArgs)
}
+ if len(annotations) > 0 {
+ output, err := utils.ExecCommandForOutputInDir(tempDir, "task", "export")
+ if err != nil {
+ return fmt.Errorf("failed to export tasks: %v", err)
+ }
+
+ var tasks []models.Task
+ if err := json.Unmarshal(output, &tasks); err != nil {
+ return fmt.Errorf("failed to parse exported tasks: %v", err)
+ }
+
+ if len(tasks) == 0 {
+ return fmt.Errorf("no tasks found after creation")
+ }
+
+ lastTask := tasks[len(tasks)-1]
+ taskID := fmt.Sprintf("%d", lastTask.ID)
+
+ for _, annotation := range annotations {
+ if annotation.Description != "" {
+ annotateArgs := []string{"rc.confirmation=off", taskID, "annotate", annotation.Description}
+ if err := utils.ExecCommandInDir(tempDir, "task", annotateArgs...); err != nil {
+ return fmt.Errorf("failed to add annotation to task %s: %v", taskID, err)
+ }
+ }
+ }
+ }
+
// Sync Taskwarrior again
if err := SyncTaskwarrior(tempDir); err != nil {
return err
diff --git a/backend/utils/tw/taskwarrior_test.go b/backend/utils/tw/taskwarrior_test.go
index cf35a627..efeba382 100644
--- a/backend/utils/tw/taskwarrior_test.go
+++ b/backend/utils/tw/taskwarrior_test.go
@@ -1,6 +1,7 @@
package tw
import (
+ "ccsync_backend/models"
"fmt"
"testing"
)
@@ -41,7 +42,7 @@ func TestExportTasks(t *testing.T) {
}
func TestAddTaskToTaskwarrior(t *testing.T) {
- err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", nil)
+ err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", nil, []models.Annotation{{Description: "note"}})
if err != nil {
t.Errorf("AddTaskToTaskwarrior failed: %v", err)
} else {
@@ -59,7 +60,7 @@ func TestCompleteTaskInTaskwarrior(t *testing.T) {
}
func TestAddTaskWithTags(t *testing.T) {
- err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", []string{"work", "important"})
+ err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", []string{"work", "important"}, []models.Annotation{{Description: "note"}})
if err != nil {
t.Errorf("AddTaskToTaskwarrior with tags failed: %v", err)
} else {
diff --git a/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx b/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
index ff2d47ef..209270cd 100644
--- a/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
@@ -1,3 +1,4 @@
+import { useState, useEffect } from 'react';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { DatePicker } from '@/components/ui/date-picker';
@@ -35,6 +36,40 @@ export const AddTaskdialog = ({
setIsCreatingNewProject,
uniqueProjects = [],
}: AddTaskDialogProps) => {
+ const [annotationInput, setAnnotationInput] = useState('');
+
+ useEffect(() => {
+ if (!isOpen) {
+ setAnnotationInput('');
+ }
+ }, [isOpen]);
+
+ const handleAddAnnotation = () => {
+ if (annotationInput.trim()) {
+ const newAnnotation = {
+ entry: new Date().toISOString(),
+ description: annotationInput.trim(),
+ };
+ setNewTask({
+ ...newTask,
+ annotations: [...newTask.annotations, newAnnotation],
+ });
+ setAnnotationInput('');
+ }
+ };
+
+ const handleRemoveAnnotation = (annotationToRemove: {
+ entry: string;
+ description: string;
+ }) => {
+ setNewTask({
+ ...newTask,
+ annotations: newTask.annotations.filter(
+ (annotation) => annotation !== annotationToRemove
+ ),
+ });
+ };
+
const handleAddTag = () => {
if (tagInput && !newTask.tags.includes(tagInput, 0)) {
setNewTask({ ...newTask, tags: [...newTask.tags, tagInput] });
@@ -228,6 +263,42 @@ export const AddTaskdialog = ({
)}
+
+
+ setAnnotationInput(e.target.value)}
+ onKeyDown={(e) => e.key === 'Enter' && handleAddAnnotation()}
+ className="col-span-3"
+ />
+
+
+
+ {newTask.annotations.length > 0 && (
+
+
+
+ {newTask.annotations.map((annotation, index) => (
+
+ {annotation.description}
+
+
+ ))}
+
+
+ )}
+