From c92157eaa0040e6b79179bc2e3b751e5bd558f3b Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 04:38:31 +0100
Subject: [PATCH 1/9] feat: add task priority and estimated time

- Add priority field (P1-P4) with color coding similar to Todoist
- Add estimated_time field (in minutes) for task duration estimation
- Both fields are optional
- Update backend: model, migration, GraphQL types, resolvers
- Update frontend: UI components, queries, display with color coding
- Priority colors: P1 (red), P2 (orange), P3 (yellow), P4 (blue)

Implements #30 and #31
---
 backend/api/inputs.py                         | 12 ++++
 backend/api/resolvers/task.py                 |  8 +++
 backend/api/types/task.py                     |  2 +
 .../add_task_priority_and_estimated_time.py   | 33 ++++++++++
 backend/database/models/task.py               |  4 +-
 web/api/gql/generated.ts                      | 33 ++++++++--
 web/api/graphql/GetMyTasks.graphql            |  2 +
 web/api/graphql/GetPatient.graphql            |  2 +
 web/api/graphql/GetPatients.graphql           |  2 +
 web/api/graphql/GetTask.graphql               |  2 +
 web/api/graphql/GetTasks.graphql              |  2 +
 web/components/tasks/TaskCardView.tsx         | 49 +++++++++++----
 web/components/tasks/TaskDetailView.tsx       | 50 +++++++++++++++-
 web/components/tasks/TaskList.tsx             | 60 ++++++++++++++++---
 web/pages/location/[id].tsx                   |  2 +
 web/pages/tasks/index.tsx                     |  2 +
 web/pages/teams/[id].tsx                      |  2 +
 web/pages/wards/[id].tsx                      |  2 +
 18 files changed, 240 insertions(+), 29 deletions(-)
 create mode 100644 backend/database/migrations/versions/add_task_priority_and_estimated_time.py

diff --git a/backend/api/inputs.py b/backend/api/inputs.py
index 4936f82..1f7e80a 100644
--- a/backend/api/inputs.py
+++ b/backend/api/inputs.py
@@ -49,6 +49,14 @@ class PatientState(Enum):
     DEAD = "DEAD"
 
 
+@strawberry.enum
+class TaskPriority(Enum):
+    P1 = "P1"
+    P2 = "P2"
+    P3 = "P3"
+    P4 = "P4"
+
+
 @strawberry.input
 class PropertyValueInput:
     definition_id: strawberry.ID
@@ -104,6 +112,8 @@ class CreateTaskInput:
     assignee_id: strawberry.ID | None = None
     previous_task_ids: list[strawberry.ID] | None = None
     properties: list[PropertyValueInput] | None = None
+    priority: TaskPriority | None = None
+    estimated_time: int | None = None
 
 
 @strawberry.input
@@ -116,6 +126,8 @@ class UpdateTaskInput:
     previous_task_ids: list[strawberry.ID] | None = None
     properties: list[PropertyValueInput] | None = None
     checksum: str | None = None
+    priority: TaskPriority | None = None
+    estimated_time: int | None = None
 
 
 @strawberry.input
diff --git a/backend/api/resolvers/task.py b/backend/api/resolvers/task.py
index fef46d2..b32ba53 100644
--- a/backend/api/resolvers/task.py
+++ b/backend/api/resolvers/task.py
@@ -224,6 +224,8 @@ async def create_task(self, info: Info, data: CreateTaskInput) -> TaskType:
             patient_id=data.patient_id,
             assignee_id=data.assignee_id,
             due_date=normalize_datetime_to_utc(data.due_date),
+            priority=data.priority.value if data.priority else None,
+            estimated_time=data.estimated_time,
         )
 
         if data.properties is not None:
@@ -284,6 +286,12 @@ async def update_task(
                 else None
             )
 
+        if data.priority is not strawberry.UNSET:
+            task.priority = data.priority.value if data.priority else None
+
+        if data.estimated_time is not strawberry.UNSET:
+            task.estimated_time = data.estimated_time
+
         if data.properties is not None:
             property_service = TaskMutation._get_property_service(db)
             await property_service.process_properties(
diff --git a/backend/api/types/task.py b/backend/api/types/task.py
index 6f57304..f7c445d 100644
--- a/backend/api/types/task.py
+++ b/backend/api/types/task.py
@@ -25,6 +25,8 @@ class TaskType:
     update_date: datetime | None
     assignee_id: strawberry.ID | None
     patient_id: strawberry.ID
+    priority: str | None
+    estimated_time: int | None
 
     @strawberry.field
     async def assignee(
diff --git a/backend/database/migrations/versions/add_task_priority_and_estimated_time.py b/backend/database/migrations/versions/add_task_priority_and_estimated_time.py
new file mode 100644
index 0000000..cc9d965
--- /dev/null
+++ b/backend/database/migrations/versions/add_task_priority_and_estimated_time.py
@@ -0,0 +1,33 @@
+"""Add priority and estimated_time to tasks.
+
+Revision ID: add_task_priority_time
+Revises: 0de3078888ba
+Create Date: 2025-12-19 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision: str = "add_task_priority_time"
+down_revision: Union[str, Sequence[str], None] = "0de3078888ba"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "tasks",
+        sa.Column("priority", sa.String(), nullable=True),
+    )
+    op.add_column(
+        "tasks",
+        sa.Column("estimated_time", sa.Integer(), nullable=True),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("tasks", "estimated_time")
+    op.drop_column("tasks", "priority")
diff --git a/backend/database/models/task.py b/backend/database/models/task.py
index 8625e1e..79d8e64 100644
--- a/backend/database/models/task.py
+++ b/backend/database/models/task.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 from database.models.base import Base
-from sqlalchemy import Boolean, Column, ForeignKey, String, Table
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, Table
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 if TYPE_CHECKING:
@@ -44,6 +44,8 @@ class Task(Base):
         nullable=True,
     )
     patient_id: Mapped[str] = mapped_column(ForeignKey("patients.id"))
+    priority: Mapped[str | None] = mapped_column(String, nullable=True)
+    estimated_time: Mapped[int | None] = mapped_column(Integer, nullable=True)
 
     assignee: Mapped[User | None] = relationship(
         "User",
diff --git a/web/api/gql/generated.ts b/web/api/gql/generated.ts
index f6d0c5f..1660388 100644
--- a/web/api/gql/generated.ts
+++ b/web/api/gql/generated.ts
@@ -51,8 +51,10 @@ export type CreateTaskInput = {
   assigneeId?: InputMaybe<Scalars['ID']['input']>;
   description?: InputMaybe<Scalars['String']['input']>;
   dueDate?: InputMaybe<Scalars['DateTime']['input']>;
+  estimatedTime?: InputMaybe<Scalars['Int']['input']>;
   patientId: Scalars['ID']['input'];
   previousTaskIds?: InputMaybe<Array<Scalars['ID']['input']>>;
+  priority?: InputMaybe<TaskPriority>;
   properties?: InputMaybe<Array<PropertyValueInput>>;
   title: Scalars['String']['input'];
 };
@@ -403,6 +405,13 @@ export type SubscriptionTaskUpdatedArgs = {
   taskId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+export enum TaskPriority {
+  P1 = 'P1',
+  P2 = 'P2',
+  P3 = 'P3',
+  P4 = 'P4'
+}
+
 export type TaskType = {
   __typename?: 'TaskType';
   assignee?: Maybe<UserType>;
@@ -412,9 +421,11 @@ export type TaskType = {
   description?: Maybe<Scalars['String']['output']>;
   done: Scalars['Boolean']['output'];
   dueDate?: Maybe<Scalars['DateTime']['output']>;
+  estimatedTime?: Maybe<Scalars['Int']['output']>;
   id: Scalars['ID']['output'];
   patient: PatientType;
   patientId: Scalars['ID']['output'];
+  priority?: Maybe<Scalars['String']['output']>;
   properties: Array<PropertyValueType>;
   title: Scalars['String']['output'];
   updateDate?: Maybe<Scalars['DateTime']['output']>;
@@ -454,7 +465,9 @@ export type UpdateTaskInput = {
   description?: InputMaybe<Scalars['String']['input']>;
   done?: InputMaybe<Scalars['Boolean']['input']>;
   dueDate?: InputMaybe<Scalars['DateTime']['input']>;
+  estimatedTime?: InputMaybe<Scalars['Int']['input']>;
   previousTaskIds?: InputMaybe<Array<Scalars['ID']['input']>>;
+  priority?: InputMaybe<TaskPriority>;
   properties?: InputMaybe<Array<PropertyValueInput>>;
   title?: InputMaybe<Scalars['String']['input']>;
 };
@@ -489,7 +502,7 @@ export type GetLocationsQuery = { __typename?: 'Query', locationNodes: Array<{ _
 export type GetMyTasksQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetMyTasksQuery = { __typename?: 'Query', me?: { __typename?: 'UserType', id: string, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, creationDate: any, updateDate?: any | null, patient: { __typename?: 'PatientType', id: string, name: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }> }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }> } | null };
+export type GetMyTasksQuery = { __typename?: 'Query', me?: { __typename?: 'UserType', id: string, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, patient: { __typename?: 'PatientType', id: string, name: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }> }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }> } | null };
 
 export type GetOverviewDataQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -501,7 +514,7 @@ export type GetPatientQueryVariables = Exact<{
 }>;
 
 
-export type GetPatientQuery = { __typename?: 'Query', patient?: { __typename?: 'PatientType', id: string, firstname: string, lastname: string, birthdate: any, sex: Sex, state: PatientState, checksum: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string }>, clinic: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null } | null, teams: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }>, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, updateDate?: any | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }>, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> } | null };
+export type GetPatientQuery = { __typename?: 'Query', patient?: { __typename?: 'PatientType', id: string, firstname: string, lastname: string, birthdate: any, sex: Sex, state: PatientState, checksum: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string }>, clinic: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null } | null, teams: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }>, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, updateDate?: any | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }>, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> } | null };
 
 export type GetPatientsQueryVariables = Exact<{
   locationId?: InputMaybe<Scalars['ID']['input']>;
@@ -510,14 +523,14 @@ export type GetPatientsQueryVariables = Exact<{
 }>;
 
 
-export type GetPatientsQuery = { __typename?: 'Query', patients: Array<{ __typename?: 'PatientType', id: string, name: string, firstname: string, lastname: string, birthdate: any, sex: Sex, state: PatientState, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null }>, clinic: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null } | null, teams: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }>, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, creationDate: any, updateDate?: any | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }>, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, definition: { __typename?: 'PropertyDefinitionType', name: string } }> }> };
+export type GetPatientsQuery = { __typename?: 'Query', patients: Array<{ __typename?: 'PatientType', id: string, name: string, firstname: string, lastname: string, birthdate: any, sex: Sex, state: PatientState, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null }>, clinic: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null } | null, teams: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }>, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }>, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, definition: { __typename?: 'PropertyDefinitionType', name: string } }> }> };
 
 export type GetTaskQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type GetTaskQuery = { __typename?: 'Query', task?: { __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, checksum: string, patient: { __typename?: 'PatientType', id: string, name: string }, assignee?: { __typename?: 'UserType', id: string, name: string } | null, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> } | null };
+export type GetTaskQuery = { __typename?: 'Query', task?: { __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, checksum: string, patient: { __typename?: 'PatientType', id: string, name: string }, assignee?: { __typename?: 'UserType', id: string, name: string } | null, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> } | null };
 
 export type GetTasksQueryVariables = Exact<{
   rootLocationIds?: InputMaybe<Array<Scalars['ID']['input']> | Scalars['ID']['input']>;
@@ -525,7 +538,7 @@ export type GetTasksQueryVariables = Exact<{
 }>;
 
 
-export type GetTasksQuery = { __typename?: 'Query', tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, creationDate: any, updateDate?: any | null, patient: { __typename?: 'PatientType', id: string, name: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }> }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }> };
+export type GetTasksQuery = { __typename?: 'Query', tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, patient: { __typename?: 'PatientType', id: string, name: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }> }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null }> };
 
 export type GetUsersQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -811,6 +824,8 @@ export const GetMyTasksDocument = `
       description
       done
       dueDate
+      priority
+      estimatedTime
       creationDate
       updateDate
       patient {
@@ -1016,6 +1031,8 @@ export const GetPatientDocument = `
       description
       done
       dueDate
+      priority
+      estimatedTime
       updateDate
       assignee {
         id
@@ -1169,6 +1186,8 @@ export const GetPatientsDocument = `
       description
       done
       dueDate
+      priority
+      estimatedTime
       creationDate
       updateDate
       assignee {
@@ -1211,6 +1230,8 @@ export const GetTaskDocument = `
     description
     done
     dueDate
+    priority
+    estimatedTime
     checksum
     patient {
       id
@@ -1266,6 +1287,8 @@ export const GetTasksDocument = `
     description
     done
     dueDate
+    priority
+    estimatedTime
     creationDate
     updateDate
     patient {
diff --git a/web/api/graphql/GetMyTasks.graphql b/web/api/graphql/GetMyTasks.graphql
index 8ea0c6d..2342e52 100644
--- a/web/api/graphql/GetMyTasks.graphql
+++ b/web/api/graphql/GetMyTasks.graphql
@@ -7,6 +7,8 @@ query GetMyTasks {
       description
       done
       dueDate
+      priority
+      estimatedTime
       creationDate
       updateDate
       patient {
diff --git a/web/api/graphql/GetPatient.graphql b/web/api/graphql/GetPatient.graphql
index f05cf6d..258e2da 100644
--- a/web/api/graphql/GetPatient.graphql
+++ b/web/api/graphql/GetPatient.graphql
@@ -84,6 +84,8 @@ query GetPatient($id: ID!) {
       description
       done
       dueDate
+      priority
+      estimatedTime
       updateDate
       assignee {
         id
diff --git a/web/api/graphql/GetPatients.graphql b/web/api/graphql/GetPatients.graphql
index 17bc1a0..1fbff92 100644
--- a/web/api/graphql/GetPatients.graphql
+++ b/web/api/graphql/GetPatients.graphql
@@ -101,6 +101,8 @@ query GetPatients($locationId: ID, $rootLocationIds: [ID!], $states: [PatientSta
       description
       done
       dueDate
+      priority
+      estimatedTime
       creationDate
       updateDate
       assignee {
diff --git a/web/api/graphql/GetTask.graphql b/web/api/graphql/GetTask.graphql
index 3c8c2d3..12c14aa 100644
--- a/web/api/graphql/GetTask.graphql
+++ b/web/api/graphql/GetTask.graphql
@@ -5,6 +5,8 @@ query GetTask($id: ID!) {
     description
     done
     dueDate
+    priority
+    estimatedTime
     checksum
     patient {
       id
diff --git a/web/api/graphql/GetTasks.graphql b/web/api/graphql/GetTasks.graphql
index ec6f7b8..ffcff1c 100644
--- a/web/api/graphql/GetTasks.graphql
+++ b/web/api/graphql/GetTasks.graphql
@@ -5,6 +5,8 @@ query GetTasks($rootLocationIds: [ID!], $assigneeId: ID) {
     description
     done
     dueDate
+    priority
+    estimatedTime
     creationDate
     updateDate
     patient {
diff --git a/web/components/tasks/TaskCardView.tsx b/web/components/tasks/TaskCardView.tsx
index 1f7a44a..b923429 100644
--- a/web/components/tasks/TaskCardView.tsx
+++ b/web/components/tasks/TaskCardView.tsx
@@ -14,6 +14,8 @@ type FlexibleTask = {
   description?: string | null,
   done: boolean,
   dueDate?: Date | string | null,
+  priority?: string | null,
+  estimatedTime?: number | null,
   updateDate?: Date | string | null,
   patient?: {
     id: string,
@@ -111,13 +113,24 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
         </div>
         <div className={clsx('flex-1 min-w-0 overflow-hidden', { 'pb-16': showPatient })}>
           <div className="flex items-center justify-between gap-2 mb-2 flex-wrap min-w-0">
-            <div
-              className={clsx(
-                'font-semibold text-lg min-w-0 flex-1 truncate',
-                { 'line-through text-description': task.done }
+            <div className="flex items-center gap-2 min-w-0 flex-1">
+              {(task as FlexibleTask).priority && (
+                <div className={clsx(
+                  'w-2 h-2 rounded-full shrink-0',
+                  (task as FlexibleTask).priority === 'P1' ? 'bg-red-500' :
+                  (task as FlexibleTask).priority === 'P2' ? 'bg-orange-500' :
+                  (task as FlexibleTask).priority === 'P3' ? 'bg-yellow-500' :
+                  (task as FlexibleTask).priority === 'P4' ? 'bg-blue-500' : ''
+                )} />
               )}
-            >
-              {taskName}
+              <div
+                className={clsx(
+                  'font-semibold text-lg min-w-0 flex-1 truncate',
+                  { 'line-through text-description': task.done }
+                )}
+              >
+                {taskName}
+              </div>
             </div>
             {task.assignee && (
               <div className="flex items-center gap-1.5 text-base text-description shrink-0 min-w-0">
@@ -156,12 +169,24 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
           )}
         </div>
       )}
-      {dueDate && (
-        <div className={clsx('absolute bottom-5 right-5 flex items-center gap-2 text-sm text-description', dueDateColorClass)}>
-          <Clock className="size-4" />
-          <SmartDate date={dueDate} mode="relative" showTime={true} />
-        </div>
-      )}
+      <div className="absolute bottom-5 right-5 flex items-center gap-3 text-sm text-description">
+        {(task as FlexibleTask).estimatedTime && (
+          <div className="flex items-center gap-1">
+            <Clock className="size-4" />
+            <span>
+              {(task as FlexibleTask).estimatedTime! < 60
+                ? `${(task as FlexibleTask).estimatedTime}m`
+                : `${Math.floor((task as FlexibleTask).estimatedTime! / 60)}h ${(task as FlexibleTask).estimatedTime! % 60}m`}
+            </span>
+          </div>
+        )}
+        {dueDate && (
+          <div className={clsx('flex items-center gap-2', dueDateColorClass)}>
+            <Clock className="size-4" />
+            <SmartDate date={dueDate} mode="relative" showTime={true} />
+          </div>
+        )}
+      </div>
     </button>
   )
 }
diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 16ebd68..9711fe5 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState, useMemo } from 'react'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
-import type { CreateTaskInput, UpdateTaskInput } from '@/api/gql/generated'
+import type { CreateTaskInput, UpdateTaskInput, TaskPriority } from '@/api/gql/generated'
 import {
   useAssignTaskMutation,
   useCreateTaskMutation,
@@ -122,6 +122,8 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
     patientId: initialPatientId || '',
     assigneeId: null,
     dueDate: null,
+    priority: null,
+    estimatedTime: null,
     done: false,
   })
 
@@ -133,6 +135,8 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
         patientId: taskData.task.patient?.id || '',
         assigneeId: taskData.task.assignee?.id || null,
         dueDate: taskData.task.dueDate ? new Date(taskData.task.dueDate) : null,
+        priority: (taskData.task.priority as TaskPriority | null) || null,
+        estimatedTime: taskData.task.estimatedTime ?? null,
         done: taskData.task.done || false
       })
     } else if (initialPatientId && !taskId) {
@@ -209,8 +213,10 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
         description: formData.description,
         assigneeId: formData.assigneeId,
         dueDate: formData.dueDate,
+        priority: (formData.priority as TaskPriority | null) || undefined,
+        estimatedTime: formData.estimatedTime,
         properties: formData.properties
-      } as CreateTaskInput
+      } as CreateTaskInput & { priority?: TaskPriority | null, estimatedTime?: number | null }
     })
   }
 
@@ -354,6 +360,46 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                 )}
               </FormElementWrapper>
 
+              <FormElementWrapper label="Priority">
+                {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => (
+                  <Select
+                    {...bag}
+                    value={formData.priority || 'none'}
+                    onValueChanged={(value) => {
+                      const priorityValue = value === 'none' ? null : (value as TaskPriority)
+                      updateLocalState({ priority: priorityValue })
+                      persistChanges({ priority: priorityValue })
+                    }}
+                  >
+                    <SelectOption value="none">None</SelectOption>
+                    <SelectOption value="P1">P1</SelectOption>
+                    <SelectOption value="P2">P2</SelectOption>
+                    <SelectOption value="P3">P3</SelectOption>
+                    <SelectOption value="P4">P4</SelectOption>
+                  </Select>
+                )}
+              </FormElementWrapper>
+
+              <FormElementWrapper label="Estimated Time (minutes)">
+                {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => (
+                  <Input
+                    {...bag}
+                    type="number"
+                    min="0"
+                    step="1"
+                    value={formData.estimatedTime?.toString() || ''}
+                    placeholder="e.g. 30"
+                    onChange={(e) => {
+                      const value = e.target.value === '' ? null : parseInt(e.target.value, 10)
+                      updateLocalState({ estimatedTime: isNaN(value as number) ? null : value })
+                    }}
+                    onBlur={() => {
+                      persistChanges({ estimatedTime: formData.estimatedTime })
+                    }}
+                  />
+                )}
+              </FormElementWrapper>
+
               <FormElementWrapper label={translation('description')}>
                 {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => (
                   <Textarea
diff --git a/web/components/tasks/TaskList.tsx b/web/components/tasks/TaskList.tsx
index a3b3aeb..5f5c0d2 100644
--- a/web/components/tasks/TaskList.tsx
+++ b/web/components/tasks/TaskList.tsx
@@ -20,6 +20,8 @@ export type TaskViewModel = {
   description?: string,
   updateDate: Date,
   dueDate?: Date,
+  priority?: string | null,
+  estimatedTime?: number | null,
   patient?: {
     id: string,
     name: string,
@@ -64,6 +66,38 @@ const isCloseToDueDate = (dueDate: Date | undefined, done: boolean): boolean =>
   return dueTime > now && dueTime - now <= oneHour
 }
 
+const getPriorityColor = (priority: string | null | undefined): string => {
+  if (!priority) return ''
+  switch (priority) {
+    case 'P1':
+      return 'border-l-4 border-l-red-500'
+    case 'P2':
+      return 'border-l-4 border-l-orange-500'
+    case 'P3':
+      return 'border-l-4 border-l-yellow-500'
+    case 'P4':
+      return 'border-l-4 border-l-blue-500'
+    default:
+      return ''
+  }
+}
+
+const getPriorityDotColor = (priority: string | null | undefined): string => {
+  if (!priority) return ''
+  switch (priority) {
+    case 'P1':
+      return 'bg-red-500'
+    case 'P2':
+      return 'bg-orange-500'
+    case 'P3':
+      return 'bg-yellow-500'
+    case 'P4':
+      return 'bg-blue-500'
+    default:
+      return ''
+  }
+}
+
 const STORAGE_KEY_SHOW_DONE = 'task-show-done'
 
 export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initialTasks, onRefetch, showAssignee = false, initialTaskId, onInitialTaskOpened }, ref) => {
@@ -181,7 +215,14 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
           header: translation('title'),
           accessorKey: 'name',
           cell: ({ row }) => {
-            return row.original.name
+            return (
+              <div className="flex items-center gap-2">
+                {row.original.priority && (
+                  <div className={clsx('w-2 h-2 rounded-full shrink-0', getPriorityDotColor(row.original.priority))} />
+                )}
+                <span>{row.original.name}</span>
+              </div>
+            )
           },
           minSize: 200,
           size: Number.MAX_SAFE_INTEGER,
@@ -372,14 +413,15 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
             </div>
           ) : (
             tasks.map((task) => (
-              <TaskCardView
-                key={task.id}
-                task={task}
-                onToggleDone={handleToggleDone}
-                onClick={(t) => setTaskDialogState({ isOpen: true, taskId: t.id })}
-                showAssignee={showAssignee}
-                onRefetch={onRefetch}
-              />
+              <div key={task.id} className={clsx(getPriorityColor(task.priority))}>
+                <TaskCardView
+                  task={task}
+                  onToggleDone={handleToggleDone}
+                  onClick={(t) => setTaskDialogState({ isOpen: true, taskId: t.id })}
+                  showAssignee={showAssignee}
+                  onRefetch={onRefetch}
+                />
+              </div>
             ))
           )}
         </div>
diff --git a/web/pages/location/[id].tsx b/web/pages/location/[id].tsx
index f0fa46b..02e1ca3 100644
--- a/web/pages/location/[id].tsx
+++ b/web/pages/location/[id].tsx
@@ -68,6 +68,8 @@ const LocationPage: NextPage = () => {
         description: task.description || undefined,
         updateDate: task.updateDate ? new Date(task.updateDate) : new Date(task.creationDate),
         dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+        priority: task.priority || null,
+        estimatedTime: task.estimatedTime ?? null,
         done: task.done,
         patient: {
           id: patient.id,
diff --git a/web/pages/tasks/index.tsx b/web/pages/tasks/index.tsx
index 0eb6a82..584ccab 100644
--- a/web/pages/tasks/index.tsx
+++ b/web/pages/tasks/index.tsx
@@ -35,6 +35,8 @@ const TasksPage: NextPage = () => {
       description: task.description || undefined,
       updateDate: task.updateDate ? new Date(task.updateDate) : new Date(task.creationDate),
       dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+      priority: task.priority || null,
+      estimatedTime: task.estimatedTime ?? null,
       done: task.done,
       patient: task.patient
         ? {
diff --git a/web/pages/teams/[id].tsx b/web/pages/teams/[id].tsx
index 53fc7a7..1ddedcb 100644
--- a/web/pages/teams/[id].tsx
+++ b/web/pages/teams/[id].tsx
@@ -46,6 +46,8 @@ const TeamPage: NextPage = () => {
         description: task.description || undefined,
         updateDate: task.updateDate ? new Date(task.updateDate) : new Date(task.creationDate),
         dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+        priority: task.priority || null,
+        estimatedTime: task.estimatedTime ?? null,
         done: task.done,
         patient: {
           id: patient.id,
diff --git a/web/pages/wards/[id].tsx b/web/pages/wards/[id].tsx
index 20f54a0..ccd8c7e 100644
--- a/web/pages/wards/[id].tsx
+++ b/web/pages/wards/[id].tsx
@@ -46,6 +46,8 @@ const WardPage: NextPage = () => {
         description: task.description || undefined,
         updateDate: task.updateDate ? new Date(task.updateDate) : new Date(task.creationDate),
         dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+        priority: task.priority || null,
+        estimatedTime: task.estimatedTime ?? null,
         done: task.done,
         patient: {
           id: patient.id,

From fce45408716ce39ad129857f8aa5f7e33bc3c2bb Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 04:49:14 +0100
Subject: [PATCH 2/9] fix: preserve priority when updating estimated time

- Include priority and estimatedTime in UpdateTask mutation response
- Include current priority value when persisting estimatedTime changes
- Prevents priority from being reset when updating estimated time
---
 web/api/gql/generated.ts                | 4 +++-
 web/api/graphql/TaskMutations.graphql   | 2 ++
 web/components/tasks/TaskDetailView.tsx | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/api/gql/generated.ts b/web/api/gql/generated.ts
index 1660388..9962a6d 100644
--- a/web/api/gql/generated.ts
+++ b/web/api/gql/generated.ts
@@ -696,7 +696,7 @@ export type UpdateTaskMutationVariables = Exact<{
 }>;
 
 
-export type UpdateTaskMutation = { __typename?: 'Mutation', updateTask: { __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, updateDate?: any | null, checksum: string, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null } };
+export type UpdateTaskMutation = { __typename?: 'Mutation', updateTask: { __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, updateDate?: any | null, checksum: string, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null } };
 
 export type AssignTaskMutationVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1842,6 +1842,8 @@ export const UpdateTaskDocument = `
     description
     done
     dueDate
+    priority
+    estimatedTime
     updateDate
     checksum
     assignee {
diff --git a/web/api/graphql/TaskMutations.graphql b/web/api/graphql/TaskMutations.graphql
index ea5e944..4d2c188 100644
--- a/web/api/graphql/TaskMutations.graphql
+++ b/web/api/graphql/TaskMutations.graphql
@@ -25,6 +25,8 @@ mutation UpdateTask($id: ID!, $data: UpdateTaskInput!) {
     description
     done
     dueDate
+    priority
+    estimatedTime
     updateDate
     checksum
     assignee {
diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 9711fe5..407e229 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -394,7 +394,10 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                       updateLocalState({ estimatedTime: isNaN(value as number) ? null : value })
                     }}
                     onBlur={() => {
-                      persistChanges({ estimatedTime: formData.estimatedTime })
+                      persistChanges({ 
+                        estimatedTime: formData.estimatedTime,
+                        priority: formData.priority 
+                      })
                     }}
                   />
                 )}

From 874c238c1572ff585502b182ef6d0c319229e29b Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 04:51:52 +0100
Subject: [PATCH 3/9] fix: prevent form reset when updating task fields

- Update formData directly from mutation response instead of relying on refetch
- Remove refetch() call from persistChanges to avoid race conditions
- Make useEffect smarter to only update when data actually changes
- Prevents input fields from resetting after updates
---
 web/components/tasks/TaskDetailView.tsx | 61 ++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 407e229..1322e0f 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -128,21 +128,40 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
   })
 
   useEffect(() => {
-    if (taskData?.task) {
-      setFormData({
-        title: taskData.task.title,
-        description: taskData.task.description || '',
-        patientId: taskData.task.patient?.id || '',
-        assigneeId: taskData.task.assignee?.id || null,
-        dueDate: taskData.task.dueDate ? new Date(taskData.task.dueDate) : null,
-        priority: (taskData.task.priority as TaskPriority | null) || null,
-        estimatedTime: taskData.task.estimatedTime ?? null,
-        done: taskData.task.done || false
+    if (taskData?.task && isEditMode) {
+      setFormData(prev => {
+        const newPriority = (taskData.task.priority as TaskPriority | null) || null
+        const newEstimatedTime = taskData.task.estimatedTime ?? null
+        const newDueDate = taskData.task.dueDate ? new Date(taskData.task.dueDate) : null
+        
+        if (
+          prev.title === taskData.task.title &&
+          prev.description === (taskData.task.description || '') &&
+          prev.patientId === (taskData.task.patient?.id || '') &&
+          prev.assigneeId === (taskData.task.assignee?.id || null) &&
+          prev.dueDate?.getTime() === newDueDate?.getTime() &&
+          prev.priority === newPriority &&
+          prev.estimatedTime === newEstimatedTime &&
+          prev.done === taskData.task.done
+        ) {
+          return prev
+        }
+        
+        return {
+          title: taskData.task.title,
+          description: taskData.task.description || '',
+          patientId: taskData.task.patient?.id || '',
+          assigneeId: taskData.task.assignee?.id || null,
+          dueDate: newDueDate,
+          priority: newPriority,
+          estimatedTime: newEstimatedTime,
+          done: taskData.task.done || false
+        }
       })
     } else if (initialPatientId && !taskId) {
       setFormData(prev => ({ ...prev, patientId: initialPatientId }))
     }
-  }, [taskData, initialPatientId, taskId])
+  }, [taskData?.task?.updateDate, isEditMode, initialPatientId, taskId])
 
   const updateLocalState = (updates: Partial<CreateTaskInput>) => {
     setFormData(prev => ({ ...prev, ...updates }))
@@ -180,6 +199,26 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
       updateTask({
         id: taskId,
         data: updates as UpdateTaskInput
+      }, {
+        onSuccess: (data) => {
+          if (data?.updateTask) {
+            setFormData(prev => ({
+              ...prev,
+              ...(updates.title !== undefined && { title: data.updateTask.title }),
+              ...(updates.description !== undefined && { description: data.updateTask.description || '' }),
+              ...(updates.dueDate !== undefined && { 
+                dueDate: data.updateTask.dueDate ? new Date(data.updateTask.dueDate) : null 
+              }),
+              ...(updates.priority !== undefined && { 
+                priority: (data.updateTask.priority as TaskPriority | null) || null 
+              }),
+              ...(updates.estimatedTime !== undefined && { 
+                estimatedTime: data.updateTask.estimatedTime ?? null 
+              }),
+              ...(updates.done !== undefined && { done: data.updateTask.done || false }),
+            }))
+          }
+        }
       })
     }
   }

From 327692177448d72922545914159951421fbe0e27 Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 14:46:06 +0100
Subject: [PATCH 4/9] fix: resolve TypeScript and linting errors

- Fix null/undefined checks in TaskDetailView useEffect
- Remove trailing spaces
- Fix React Hook dependency array
- All linting errors resolved
---
 web/components/tasks/TaskDetailView.tsx | 49 +++++++++++++------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 1322e0f..4b6a532 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -129,39 +129,40 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
 
   useEffect(() => {
     if (taskData?.task && isEditMode) {
+      const task = taskData.task
       setFormData(prev => {
-        const newPriority = (taskData.task.priority as TaskPriority | null) || null
-        const newEstimatedTime = taskData.task.estimatedTime ?? null
-        const newDueDate = taskData.task.dueDate ? new Date(taskData.task.dueDate) : null
-        
+        const newPriority = (task.priority as TaskPriority | null) || null
+        const newEstimatedTime = task.estimatedTime ?? null
+        const newDueDate = task.dueDate ? new Date(task.dueDate) : null
+
         if (
-          prev.title === taskData.task.title &&
-          prev.description === (taskData.task.description || '') &&
-          prev.patientId === (taskData.task.patient?.id || '') &&
-          prev.assigneeId === (taskData.task.assignee?.id || null) &&
+          prev.title === task.title &&
+          prev.description === (task.description || '') &&
+          prev.patientId === (task.patient?.id || '') &&
+          prev.assigneeId === (task.assignee?.id || null) &&
           prev.dueDate?.getTime() === newDueDate?.getTime() &&
           prev.priority === newPriority &&
           prev.estimatedTime === newEstimatedTime &&
-          prev.done === taskData.task.done
+          prev.done === task.done
         ) {
           return prev
         }
-        
+
         return {
-          title: taskData.task.title,
-          description: taskData.task.description || '',
-          patientId: taskData.task.patient?.id || '',
-          assigneeId: taskData.task.assignee?.id || null,
+          title: task.title,
+          description: task.description || '',
+          patientId: task.patient?.id || '',
+          assigneeId: task.assignee?.id || null,
           dueDate: newDueDate,
           priority: newPriority,
           estimatedTime: newEstimatedTime,
-          done: taskData.task.done || false
+          done: task.done || false
         }
       })
     } else if (initialPatientId && !taskId) {
       setFormData(prev => ({ ...prev, patientId: initialPatientId }))
     }
-  }, [taskData?.task?.updateDate, isEditMode, initialPatientId, taskId])
+  }, [taskData?.task, isEditMode, initialPatientId, taskId])
 
   const updateLocalState = (updates: Partial<CreateTaskInput>) => {
     setFormData(prev => ({ ...prev, ...updates }))
@@ -206,14 +207,14 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
               ...prev,
               ...(updates.title !== undefined && { title: data.updateTask.title }),
               ...(updates.description !== undefined && { description: data.updateTask.description || '' }),
-              ...(updates.dueDate !== undefined && { 
-                dueDate: data.updateTask.dueDate ? new Date(data.updateTask.dueDate) : null 
+              ...(updates.dueDate !== undefined && {
+                dueDate: data.updateTask.dueDate ? new Date(data.updateTask.dueDate) : null
               }),
-              ...(updates.priority !== undefined && { 
-                priority: (data.updateTask.priority as TaskPriority | null) || null 
+              ...(updates.priority !== undefined && {
+                priority: (data.updateTask.priority as TaskPriority | null) || null
               }),
-              ...(updates.estimatedTime !== undefined && { 
-                estimatedTime: data.updateTask.estimatedTime ?? null 
+              ...(updates.estimatedTime !== undefined && {
+                estimatedTime: data.updateTask.estimatedTime ?? null
               }),
               ...(updates.done !== undefined && { done: data.updateTask.done || false }),
             }))
@@ -433,9 +434,9 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                       updateLocalState({ estimatedTime: isNaN(value as number) ? null : value })
                     }}
                     onBlur={() => {
-                      persistChanges({ 
+                      persistChanges({
                         estimatedTime: formData.estimatedTime,
-                        priority: formData.priority 
+                        priority: formData.priority
                       })
                     }}
                   />

From 5fae97aff619e3186ab545c57e39b210cdde3d9a Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 14:53:16 +0100
Subject: [PATCH 5/9] fix: prevent form state reset when updating task fields

Root cause: refetchInterval and useEffect were overwriting local edits

Solution:
- Track dirty fields with useRef to prevent overwriting fields being edited
- Use React Query cache updates instead of refetch() to avoid race conditions
- Update cache directly from mutation responses
- Only merge server data with local state, preserving dirty fields
- Mark fields as dirty when user starts editing
- Clear dirty flags after successful mutation

This ensures:
- Every field update persists immediately to backend
- Form state never resets when moving between fields
- Server updates don't overwrite local edits in progress
---
 web/components/tasks/TaskDetailView.tsx | 68 +++++++++++++++++++++----
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 4b6a532..c55bedc 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useState, useMemo } from 'react'
+import { useEffect, useState, useMemo, useRef } from 'react'
+import { useQueryClient } from '@tanstack/react-query'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import type { CreateTaskInput, UpdateTaskInput, TaskPriority } from '@/api/gql/generated'
 import {
@@ -45,6 +46,7 @@ interface TaskDetailViewProps {
 export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }: TaskDetailViewProps) => {
   const translation = useTasksTranslation()
   const { selectedLocationId } = useTasksContext()
+  const queryClient = useQueryClient()
   const [isShowingPatientDialog, setIsShowingPatientDialog] = useState<boolean>(false)
   const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState<boolean>(false)
   const isEditMode = !!taskId
@@ -52,6 +54,9 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
   const [titleError, setTitleError] = useState<string | null>(null)
   const [patientIdError, setPatientIdError] = useState<string | null>(null)
 
+  const dirtyFieldsRef = useRef<Set<string>>(new Set())
+  const lastServerUpdateRef = useRef<number>(0)
+
   const { data: taskData, isLoading: isLoadingTask, refetch } = useGetTaskQuery(
     { id: taskId! },
     {
@@ -95,8 +100,15 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
   })
 
   const { mutate: updateTask } = useUpdateTaskMutation({
-    onSuccess: () => {
-      refetch()
+    onSuccess: (data) => {
+      if (data?.updateTask && taskId) {
+        queryClient.setQueryData(
+          ['GetTask', { id: taskId }],
+          { task: data.updateTask }
+        )
+        lastServerUpdateRef.current = Date.now()
+        dirtyFieldsRef.current.clear()
+      }
       onSuccess()
     }
   })
@@ -130,11 +142,32 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
   useEffect(() => {
     if (taskData?.task && isEditMode) {
       const task = taskData.task
+      const updateTime = Date.now()
+
+      if (updateTime <= lastServerUpdateRef.current + 100) {
+        return
+      }
+
       setFormData(prev => {
         const newPriority = (task.priority as TaskPriority | null) || null
         const newEstimatedTime = task.estimatedTime ?? null
         const newDueDate = task.dueDate ? new Date(task.dueDate) : null
 
+        const hasDirtyFields = dirtyFieldsRef.current.size > 0
+        if (hasDirtyFields) {
+          const merged: Partial<CreateTaskInput & { done: boolean }> = {
+            title: dirtyFieldsRef.current.has('title') ? prev.title : task.title,
+            description: dirtyFieldsRef.current.has('description') ? prev.description : (task.description || ''),
+            patientId: dirtyFieldsRef.current.has('patientId') ? prev.patientId : (task.patient?.id || ''),
+            assigneeId: dirtyFieldsRef.current.has('assigneeId') ? prev.assigneeId : (task.assignee?.id || null),
+            dueDate: dirtyFieldsRef.current.has('dueDate') ? prev.dueDate : newDueDate,
+            priority: dirtyFieldsRef.current.has('priority') ? prev.priority : newPriority,
+            estimatedTime: dirtyFieldsRef.current.has('estimatedTime') ? prev.estimatedTime : newEstimatedTime,
+            done: dirtyFieldsRef.current.has('done') ? prev.done : (task.done || false),
+          }
+          return { ...prev, ...merged }
+        }
+
         if (
           prev.title === task.title &&
           prev.description === (task.description || '') &&
@@ -164,7 +197,14 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
     }
   }, [taskData?.task, isEditMode, initialPatientId, taskId])
 
-  const updateLocalState = (updates: Partial<CreateTaskInput>) => {
+  const updateLocalState = (updates: Partial<CreateTaskInput>, markDirty = false) => {
+    if (markDirty) {
+      Object.keys(updates).forEach(key => {
+        if (updates[key as keyof CreateTaskInput] !== undefined) {
+          dirtyFieldsRef.current.add(key)
+        }
+      })
+    }
     setFormData(prev => ({ ...prev, ...updates }))
   }
 
@@ -197,12 +237,21 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
     if (isEditMode && taskId) {
       if (updates.title !== undefined && !updates.title?.trim()) return
 
+      Object.keys(updates).forEach(key => {
+        if (updates[key as keyof UpdateTaskInput] !== undefined) {
+          dirtyFieldsRef.current.add(key)
+        }
+      })
+
       updateTask({
         id: taskId,
         data: updates as UpdateTaskInput
       }, {
         onSuccess: (data) => {
           if (data?.updateTask) {
+            const updatedFields = Object.keys(updates)
+            updatedFields.forEach(field => dirtyFieldsRef.current.delete(field))
+
             setFormData(prev => ({
               ...prev,
               ...(updates.title !== undefined && { title: data.updateTask.title }),
@@ -218,6 +267,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
               }),
               ...(updates.done !== undefined && { done: data.updateTask.done || false }),
             }))
+            lastServerUpdateRef.current = Date.now()
           }
         }
       })
@@ -305,7 +355,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                         placeholder={translation('taskTitlePlaceholder')}
                         required
                         onChange={e => {
-                          updateLocalState({ title: e.target.value })
+                          updateLocalState({ title: e.target.value }, true)
                           if (isShowingError) {
                             validateTitle(e.target.value)
                           }
@@ -386,7 +436,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                     date={formData.dueDate ? new Date(formData.dueDate) : undefined}
                     mode="dateTime"
                     onValueChange={(date) => {
-                      updateLocalState({ dueDate: date })
+                      updateLocalState({ dueDate: date }, true)
                     }}
                     onEditCompleted={(date) => {
                       updateLocalState({ dueDate: date })
@@ -407,7 +457,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                     value={formData.priority || 'none'}
                     onValueChanged={(value) => {
                       const priorityValue = value === 'none' ? null : (value as TaskPriority)
-                      updateLocalState({ priority: priorityValue })
+                      updateLocalState({ priority: priorityValue }, true)
                       persistChanges({ priority: priorityValue })
                     }}
                   >
@@ -431,7 +481,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                     placeholder="e.g. 30"
                     onChange={(e) => {
                       const value = e.target.value === '' ? null : parseInt(e.target.value, 10)
-                      updateLocalState({ estimatedTime: isNaN(value as number) ? null : value })
+                      updateLocalState({ estimatedTime: isNaN(value as number) ? null : value }, true)
                     }}
                     onBlur={() => {
                       persistChanges({
@@ -449,7 +499,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                     {...bag}
                     value={formData.description || ''}
                     placeholder={translation('descriptionPlaceholder')}
-                    onChange={e => updateLocalState({ description: e.target.value })}
+                    onChange={e => updateLocalState({ description: e.target.value }, true)}
                     onBlur={() => persistChanges({ description: formData.description })}
                     minLength={4}
                   />

From f045c60721c48bb17d22b4591393618c45385d03 Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 14:57:33 +0100
Subject: [PATCH 6/9] fix: preserve patient data when updating task fields

- Add patient field to UpdateTask mutation response
- Fix cache update to merge instead of replace, preserving all fields
- Ensure formData preserves patientId when updating other fields
- Fix TypeScript types for cache update function

This fixes the issue where patient name disappeared when updating priority
---
 web/api/gql/generated.ts                |  6 +++++-
 web/api/graphql/TaskMutations.graphql   |  4 ++++
 web/components/tasks/TaskDetailView.tsx | 22 +++++++++++++++++++---
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/web/api/gql/generated.ts b/web/api/gql/generated.ts
index 9962a6d..85059d8 100644
--- a/web/api/gql/generated.ts
+++ b/web/api/gql/generated.ts
@@ -696,7 +696,7 @@ export type UpdateTaskMutationVariables = Exact<{
 }>;
 
 
-export type UpdateTaskMutation = { __typename?: 'Mutation', updateTask: { __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, updateDate?: any | null, checksum: string, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null } };
+export type UpdateTaskMutation = { __typename?: 'Mutation', updateTask: { __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, updateDate?: any | null, checksum: string, patient: { __typename?: 'PatientType', id: string, name: string }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null } | null } };
 
 export type AssignTaskMutationVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1846,6 +1846,10 @@ export const UpdateTaskDocument = `
     estimatedTime
     updateDate
     checksum
+    patient {
+      id
+      name
+    }
     assignee {
       id
       name
diff --git a/web/api/graphql/TaskMutations.graphql b/web/api/graphql/TaskMutations.graphql
index 4d2c188..9e6d30f 100644
--- a/web/api/graphql/TaskMutations.graphql
+++ b/web/api/graphql/TaskMutations.graphql
@@ -29,6 +29,10 @@ mutation UpdateTask($id: ID!, $data: UpdateTaskInput!) {
     estimatedTime
     updateDate
     checksum
+    patient {
+      id
+      name
+    }
     assignee {
       id
       name
diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index c55bedc..4e32d2f 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -12,7 +12,8 @@ import {
   useGetUsersQuery,
   useUnassignTaskMutation,
   useUpdateTaskMutation,
-  PropertyEntity
+  PropertyEntity,
+  type GetTaskQuery
 } from '@/api/gql/generated'
 import {
   Button,
@@ -102,9 +103,23 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
   const { mutate: updateTask } = useUpdateTaskMutation({
     onSuccess: (data) => {
       if (data?.updateTask && taskId) {
-        queryClient.setQueryData(
+        queryClient.setQueryData<GetTaskQuery>(
           ['GetTask', { id: taskId }],
-          { task: data.updateTask }
+          (oldData) => {
+            if (!oldData?.task) {
+              return { task: data.updateTask } as GetTaskQuery
+            }
+            const mergedTask = {
+              ...oldData.task,
+              ...data.updateTask,
+              patient: data.updateTask.patient || oldData.task.patient,
+              assignee: data.updateTask.assignee || oldData.task.assignee,
+            }
+            if (oldData.task.properties) {
+              mergedTask.properties = oldData.task.properties
+            }
+            return { task: mergedTask } as GetTaskQuery
+          }
         )
         lastServerUpdateRef.current = Date.now()
         dirtyFieldsRef.current.clear()
@@ -266,6 +281,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
                 estimatedTime: data.updateTask.estimatedTime ?? null
               }),
               ...(updates.done !== undefined && { done: data.updateTask.done || false }),
+              patientId: data.updateTask.patient?.id || prev.patientId,
             }))
             lastServerUpdateRef.current = Date.now()
           }

From 5ba07c9580caf2ba112d5ac931815fb9a05ca99e Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 15:02:55 +0100
Subject: [PATCH 7/9] fix: prevent priority and estimatedTime from resetting
 after cache invalidation

Root cause: Cache invalidation and refetchInterval were overwriting recently updated fields

Solution:
- Track field update timestamps with fieldUpdateTimestampsRef
- Add 5-second grace period to preserve recently updated fields
- Enhance shouldPreserveField to check both dirty flags and timestamps
- Explicitly preserve priority and estimatedTime in cache merge (even if null)
- Set timestamps before mutation and in mutation onSuccess

This prevents:
- Priority/estimatedTime reset when queryClient.invalidateQueries() is called
- Fields being overwritten by refetchInterval (3s) after updates
- Race conditions between mutations and refetches
---
 web/components/tasks/TaskDetailView.tsx | 55 ++++++++++++++++++-------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 4e32d2f..3406e8c 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -57,6 +57,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
 
   const dirtyFieldsRef = useRef<Set<string>>(new Set())
   const lastServerUpdateRef = useRef<number>(0)
+  const fieldUpdateTimestampsRef = useRef<Map<string, number>>(new Map())
 
   const { data: taskData, isLoading: isLoadingTask, refetch } = useGetTaskQuery(
     { id: taskId! },
@@ -101,7 +102,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
   })
 
   const { mutate: updateTask } = useUpdateTaskMutation({
-    onSuccess: (data) => {
+    onSuccess: (data, variables) => {
       if (data?.updateTask && taskId) {
         queryClient.setQueryData<GetTaskQuery>(
           ['GetTask', { id: taskId }],
@@ -114,6 +115,8 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
               ...data.updateTask,
               patient: data.updateTask.patient || oldData.task.patient,
               assignee: data.updateTask.assignee || oldData.task.assignee,
+              priority: data.updateTask.priority !== undefined ? data.updateTask.priority : oldData.task.priority,
+              estimatedTime: data.updateTask.estimatedTime !== undefined ? data.updateTask.estimatedTime : oldData.task.estimatedTime,
             }
             if (oldData.task.properties) {
               mergedTask.properties = oldData.task.properties
@@ -121,8 +124,16 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
             return { task: mergedTask } as GetTaskQuery
           }
         )
-        lastServerUpdateRef.current = Date.now()
-        dirtyFieldsRef.current.clear()
+        const now = Date.now()
+        lastServerUpdateRef.current = now
+        if (variables?.data) {
+          Object.keys(variables.data).forEach(key => {
+            if (variables.data[key as keyof UpdateTaskInput] !== undefined) {
+              fieldUpdateTimestampsRef.current.set(key, now)
+              dirtyFieldsRef.current.delete(key)
+            }
+          })
+        }
       }
       onSuccess()
     }
@@ -158,6 +169,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
     if (taskData?.task && isEditMode) {
       const task = taskData.task
       const updateTime = Date.now()
+      const GRACE_PERIOD_MS = 5000
 
       if (updateTime <= lastServerUpdateRef.current + 100) {
         return
@@ -168,17 +180,25 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
         const newEstimatedTime = task.estimatedTime ?? null
         const newDueDate = task.dueDate ? new Date(task.dueDate) : null
 
-        const hasDirtyFields = dirtyFieldsRef.current.size > 0
+        const shouldPreserveField = (fieldName: string): boolean => {
+          const lastUpdate = fieldUpdateTimestampsRef.current.get(fieldName)
+          if (lastUpdate && (updateTime - lastUpdate) < GRACE_PERIOD_MS) {
+            return true
+          }
+          return dirtyFieldsRef.current.has(fieldName)
+        }
+
+        const hasDirtyFields = dirtyFieldsRef.current.size > 0 || Array.from(fieldUpdateTimestampsRef.current.values()).some(ts => (updateTime - ts) < GRACE_PERIOD_MS)
         if (hasDirtyFields) {
           const merged: Partial<CreateTaskInput & { done: boolean }> = {
-            title: dirtyFieldsRef.current.has('title') ? prev.title : task.title,
-            description: dirtyFieldsRef.current.has('description') ? prev.description : (task.description || ''),
-            patientId: dirtyFieldsRef.current.has('patientId') ? prev.patientId : (task.patient?.id || ''),
-            assigneeId: dirtyFieldsRef.current.has('assigneeId') ? prev.assigneeId : (task.assignee?.id || null),
-            dueDate: dirtyFieldsRef.current.has('dueDate') ? prev.dueDate : newDueDate,
-            priority: dirtyFieldsRef.current.has('priority') ? prev.priority : newPriority,
-            estimatedTime: dirtyFieldsRef.current.has('estimatedTime') ? prev.estimatedTime : newEstimatedTime,
-            done: dirtyFieldsRef.current.has('done') ? prev.done : (task.done || false),
+            title: shouldPreserveField('title') ? prev.title : task.title,
+            description: shouldPreserveField('description') ? prev.description : (task.description || ''),
+            patientId: shouldPreserveField('patientId') ? prev.patientId : (task.patient?.id || ''),
+            assigneeId: shouldPreserveField('assigneeId') ? prev.assigneeId : (task.assignee?.id || null),
+            dueDate: shouldPreserveField('dueDate') ? prev.dueDate : newDueDate,
+            priority: shouldPreserveField('priority') ? prev.priority : newPriority,
+            estimatedTime: shouldPreserveField('estimatedTime') ? prev.estimatedTime : newEstimatedTime,
+            done: shouldPreserveField('done') ? prev.done : (task.done || false),
           }
           return { ...prev, ...merged }
         }
@@ -258,15 +278,19 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
         }
       })
 
+      const now = Date.now()
+      Object.keys(updates).forEach(key => {
+        if (updates[key as keyof UpdateTaskInput] !== undefined) {
+          fieldUpdateTimestampsRef.current.set(key, now)
+        }
+      })
+
       updateTask({
         id: taskId,
         data: updates as UpdateTaskInput
       }, {
         onSuccess: (data) => {
           if (data?.updateTask) {
-            const updatedFields = Object.keys(updates)
-            updatedFields.forEach(field => dirtyFieldsRef.current.delete(field))
-
             setFormData(prev => ({
               ...prev,
               ...(updates.title !== undefined && { title: data.updateTask.title }),
@@ -283,7 +307,6 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
               ...(updates.done !== undefined && { done: data.updateTask.done || false }),
               patientId: data.updateTask.patient?.id || prev.patientId,
             }))
-            lastServerUpdateRef.current = Date.now()
           }
         }
       })

From 9abfa7fa59cc027712faf50a815f34d5bf601719 Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 15:08:59 +0100
Subject: [PATCH 8/9] fix: prevent optional fields (priority/estimatedTime)
 from resetting to null

Root cause: When optional fields are null, server returns null and we overwrite form state

Solution:
- Always check shouldPreserveField before overwriting priority/estimatedTime
- Preserve fields in final return statement even when hasDirtyFields is false
- Improve cache merge to explicitly check for field presence
- Handle null values correctly in comparisons

This ensures:
- Priority/estimatedTime never reset to null after being set
- Grace period protection works even when server returns null
- Fields are preserved during refetch/cache invalidation cycles
---
 web/components/tasks/TaskDetailView.tsx | 26 +++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 3406e8c..dba8b16 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -115,8 +115,16 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
               ...data.updateTask,
               patient: data.updateTask.patient || oldData.task.patient,
               assignee: data.updateTask.assignee || oldData.task.assignee,
-              priority: data.updateTask.priority !== undefined ? data.updateTask.priority : oldData.task.priority,
-              estimatedTime: data.updateTask.estimatedTime !== undefined ? data.updateTask.estimatedTime : oldData.task.estimatedTime,
+            }
+            if ('priority' in data.updateTask) {
+              mergedTask.priority = data.updateTask.priority
+            } else {
+              mergedTask.priority = oldData.task.priority
+            }
+            if ('estimatedTime' in data.updateTask) {
+              mergedTask.estimatedTime = data.updateTask.estimatedTime
+            } else {
+              mergedTask.estimatedTime = oldData.task.estimatedTime
             }
             if (oldData.task.properties) {
               mergedTask.properties = oldData.task.properties
@@ -189,6 +197,7 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
         }
 
         const hasDirtyFields = dirtyFieldsRef.current.size > 0 || Array.from(fieldUpdateTimestampsRef.current.values()).some(ts => (updateTime - ts) < GRACE_PERIOD_MS)
+
         if (hasDirtyFields) {
           const merged: Partial<CreateTaskInput & { done: boolean }> = {
             title: shouldPreserveField('title') ? prev.title : task.title,
@@ -203,14 +212,19 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
           return { ...prev, ...merged }
         }
 
+        const priorityChanged = prev.priority !== newPriority
+        const estimatedTimeChanged = prev.estimatedTime !== newEstimatedTime
+        const shouldPreservePriority = shouldPreserveField('priority')
+        const shouldPreserveEstimatedTime = shouldPreserveField('estimatedTime')
+
         if (
           prev.title === task.title &&
           prev.description === (task.description || '') &&
           prev.patientId === (task.patient?.id || '') &&
           prev.assigneeId === (task.assignee?.id || null) &&
           prev.dueDate?.getTime() === newDueDate?.getTime() &&
-          prev.priority === newPriority &&
-          prev.estimatedTime === newEstimatedTime &&
+          (priorityChanged ? shouldPreservePriority : prev.priority === newPriority) &&
+          (estimatedTimeChanged ? shouldPreserveEstimatedTime : prev.estimatedTime === newEstimatedTime) &&
           prev.done === task.done
         ) {
           return prev
@@ -222,8 +236,8 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
           patientId: task.patient?.id || '',
           assigneeId: task.assignee?.id || null,
           dueDate: newDueDate,
-          priority: newPriority,
-          estimatedTime: newEstimatedTime,
+          priority: shouldPreservePriority ? prev.priority : newPriority,
+          estimatedTime: shouldPreserveEstimatedTime ? prev.estimatedTime : newEstimatedTime,
           done: task.done || false
         }
       })

From a9207de2558d963a40716c224ae932da273e96b4 Mon Sep 17 00:00:00 2001
From: Felix Evers <git@felixevers.de>
Date: Sun, 28 Dec 2025 15:10:54 +0100
Subject: [PATCH 9/9] fix: use strawberry.UNSET for priority and estimated_time
 in UpdateTaskInput

Root cause: Optional fields defaulted to None, making it impossible to distinguish
between 'field not provided' and 'field set to null'

Solution:
- Change priority and estimated_time defaults to strawberry.UNSET in UpdateTaskInput
- This allows backend to correctly handle:
  - Field not provided: strawberry.UNSET -> don't update
  - Field set to null: None -> update to null
  - Field set to value: TaskPriority/int -> update to value

This ensures:
- Priority/estimatedTime persist correctly when set
- Fields can be explicitly cleared by setting to null
- Other fields can be updated without affecting priority/estimatedTime
---
 backend/api/inputs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/api/inputs.py b/backend/api/inputs.py
index 1f7e80a..f8f4891 100644
--- a/backend/api/inputs.py
+++ b/backend/api/inputs.py
@@ -126,8 +126,8 @@ class UpdateTaskInput:
     previous_task_ids: list[strawberry.ID] | None = None
     properties: list[PropertyValueInput] | None = None
     checksum: str | None = None
-    priority: TaskPriority | None = None
-    estimated_time: int | None = None
+    priority: TaskPriority | None = strawberry.UNSET
+    estimated_time: int | None = strawberry.UNSET
 
 
 @strawberry.input