Merge branch 'main' of github.com:Rustix69/CCSync into feat/percentage-tracker-filter

Author: Rustix69

backend/controllers/edit_task.go

@@ -49,6 +49,8 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
 		start := requestBody.Start
 		entry := requestBody.Entry
 		wait := requestBody.Wait
+		end := requestBody.End
+		depends := requestBody.Depends
 
 		if taskID == "" {
 			http.Error(w, "taskID is required", http.StatusBadRequest)
@@ -60,7 +62,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, depends)
 				if err != nil {
 					logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskID, err), uuid, "Edit Task")
 					return err

backend/models/request_body.go

@@ -34,6 +34,8 @@ type EditTaskRequestBody struct {
 	Start            string   `json:"start"`
 	Entry            string   `json:"entry"`
 	Wait             string   `json:"wait"`
+	End              string   `json:"end"`
+	Depends          []string `json:"depends"`
 }
 type CompleteTaskRequestBody struct {
 	Email            string `json:"email"`

backend/utils/tw/edit_task.go

@@ -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, depends []string) error {
 	if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
 		return fmt.Errorf("error deleting Taskwarrior data: %v", err)
 	}
@@ -87,6 +87,21 @@ 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)
+		}
+	}
+
+	// Handle depends
+	if len(depends) > 0 {
+		dependsStr := strings.Join(depends, ",")
+		if err := utils.ExecCommand("task", taskID, "modify", "depends:"+dependsStr); err != nil {
+			return fmt.Errorf("failed to set depends %s: %v", dependsStr, err)
+		}
+	}
+
 	// Sync Taskwarrior again
 	if err := SyncTaskwarrior(tempDir); err != nil {
 		return err

backend/utils/tw/taskwarrior_test.go

@@ -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", nil)
 	if err != nil {
 		t.Errorf("EditTaskInTaskwarrior() failed: %v", err)
 	} else {
@@ -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", nil)
 	if err != nil {
 		t.Errorf("EditTaskInTaskwarrior with tag addition failed: %v", err)
 	} else {
@@ -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", nil)
 	if err != nil {
 		t.Errorf("EditTaskInTaskwarrior with tag removal failed: %v", err)
 	} else {
@@ -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", nil)
 	if err != nil {
 		t.Errorf("EditTaskInTaskwarrior with mixed tag operations failed: %v", err)
 	} else {

frontend/package-lock.json

@@ -129,6 +129,7 @@
     "framer-motion": "^11.3.8",
     "fs.realpath": "^1.0.0",
     "function-bind": "^1.1.2",
+    "fuse.js": "^7.1.0",
     "gensync": "^1.0.0-beta.2",
     "get-caller-file": "^2.0.5",
     "get-nonce": "^1.0.1",

frontend/package.json

@@ -38,7 +38,7 @@ import { url } from '@/components/utils/URLs';
 import { exportTasksAsJSON, exportTasksAsTXT } from '@/exports-tasks';
 import { useState } from 'react';
 import { DevLogs } from '../DevLogs/DevLogs';
-import { useTaskAutoSync } from '@/Task-AutoSync';
+import { useTaskAutoSync } from '@/components/utils/Task-AutoSync';
 import { Label } from '@/components/ui/label';
 
 export const NavbarDesktop = (

frontend/src/components/HomeComponents/Navbar/NavbarDesktop.tsx

@@ -37,7 +37,7 @@ import {
 import { Button } from '@/components/ui/button';
 import { exportTasksAsJSON, exportTasksAsTXT } from '@/exports-tasks';
 import { DevLogs } from '../DevLogs/DevLogs';
-import { useTaskAutoSync } from '@/Task-AutoSync';
+import { useTaskAutoSync } from '@/components/utils/Task-AutoSync';
 import { Label } from '@/components/ui/label';
 import { Switch } from '@/components/ui/switch';
 import { Slider } from '@/components/ui/slider';

frontend/src/components/HomeComponents/Navbar/NavbarMobile.tsx

@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button';
 
 export const SetupGuide = (props: Props) => {
   const downloadConfigFile = () => {
-    const configContent = exportConfigSetup(props); // already a string
+    const configContent = exportConfigSetup(props);
     const blob = new Blob([configContent], {
       type: 'text/plain;charset=utf-8',
     });