diff --git a/internal/repositories/task_repo.go b/internal/repositories/task_repo.go index 6ff1952..231fd2e 100644 --- a/internal/repositories/task_repo.go +++ b/internal/repositories/task_repo.go @@ -203,6 +203,15 @@ func (r *TaskRepository) GetKanbanData(residenceID uint, daysThreshold int) (*mo Tasks: overdue, Count: len(overdue), }, + { + Name: "in_progress_tasks", + DisplayName: "In Progress", + ButtonTypes: []string{"edit", "complete", "cancel"}, + Icons: map[string]string{"ios": "hammer", "android": "Build"}, + Color: "#5856D6", + Tasks: inProgress, + Count: len(inProgress), + }, { Name: "due_soon_tasks", DisplayName: "Due Soon", @@ -221,15 +230,6 @@ func (r *TaskRepository) GetKanbanData(residenceID uint, daysThreshold int) (*mo Tasks: upcoming, Count: len(upcoming), }, - { - Name: "in_progress_tasks", - DisplayName: "In Progress", - ButtonTypes: []string{"edit", "complete", "cancel"}, - Icons: map[string]string{"ios": "hammer", "android": "Build"}, - Color: "#5856D6", - Tasks: inProgress, - Count: len(inProgress), - }, { Name: "completed_tasks", DisplayName: "Completed", @@ -330,6 +330,15 @@ func (r *TaskRepository) GetKanbanDataForMultipleResidences(residenceIDs []uint, Tasks: overdue, Count: len(overdue), }, + { + Name: "in_progress_tasks", + DisplayName: "In Progress", + ButtonTypes: []string{"edit", "complete", "cancel"}, + Icons: map[string]string{"ios": "hammer", "android": "Build"}, + Color: "#5856D6", + Tasks: inProgress, + Count: len(inProgress), + }, { Name: "due_soon_tasks", DisplayName: "Due Soon", @@ -348,15 +357,6 @@ func (r *TaskRepository) GetKanbanDataForMultipleResidences(residenceIDs []uint, Tasks: upcoming, Count: len(upcoming), }, - { - Name: "in_progress_tasks", - DisplayName: "In Progress", - ButtonTypes: []string{"edit", "complete", "cancel"}, - Icons: map[string]string{"ios": "hammer", "android": "Build"}, - Color: "#5856D6", - Tasks: inProgress, - Count: len(inProgress), - }, { Name: "completed_tasks", DisplayName: "Completed", diff --git a/internal/repositories/task_repo_test.go b/internal/repositories/task_repo_test.go index df3c34b..5814a05 100644 --- a/internal/repositories/task_repo_test.go +++ b/internal/repositories/task_repo_test.go @@ -770,9 +770,9 @@ func TestKanbanBoard_ColumnMetadata(t *testing.T) { androidIcon string }{ {"overdue_tasks", "Overdue", "#FF3B30", []string{"edit", "complete", "cancel", "mark_in_progress"}, "exclamationmark.triangle", "Warning"}, + {"in_progress_tasks", "In Progress", "#5856D6", []string{"edit", "complete", "cancel"}, "hammer", "Build"}, {"due_soon_tasks", "Due Soon", "#FF9500", []string{"edit", "complete", "cancel", "mark_in_progress"}, "clock", "Schedule"}, {"upcoming_tasks", "Upcoming", "#007AFF", []string{"edit", "complete", "cancel", "mark_in_progress"}, "calendar", "Event"}, - {"in_progress_tasks", "In Progress", "#5856D6", []string{"edit", "complete", "cancel"}, "hammer", "Build"}, {"completed_tasks", "Completed", "#34C759", []string{"view"}, "checkmark.circle", "CheckCircle"}, {"cancelled_tasks", "Cancelled", "#8E8E93", []string{"uncancel", "delete"}, "xmark.circle", "Cancel"}, }