From de8cea7d2e69d6024f8017244784a2ef1635d027 Mon Sep 17 00:00:00 2001 From: Timothy Cardoza Date: Mon, 23 Mar 2026 10:05:56 -0500 Subject: [PATCH] Fixed status circle checkmark for completed tasks --- src/components/StatusCircle.tsx | 3 ++- src/components/TaskCard.tsx | 4 ++-- src/components/TaskDetail.tsx | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/StatusCircle.tsx b/src/components/StatusCircle.tsx index c8600d3..45a3384 100644 --- a/src/components/StatusCircle.tsx +++ b/src/components/StatusCircle.tsx @@ -7,6 +7,7 @@ interface StatusCircleProps { size?: number; className?: string; recurrenceProgress?: number | null; + completed?: boolean; } export const StatusCircle: Component = (props) => { @@ -36,7 +37,7 @@ export const StatusCircle: Component = (props) => { return (
- {props.status >= 10 ? ( + {props.completed || props.status >= 10 ? ( props.recurrenceProgress != null ? ( diff --git a/src/components/TaskCard.tsx b/src/components/TaskCard.tsx index 95099dc..213d450 100644 --- a/src/components/TaskCard.tsx +++ b/src/components/TaskCard.tsx @@ -64,7 +64,7 @@ export const TaskCard: Component<{ task: Task, isShaking?: boolean }> = (props) ]; }); const recurrenceProgress = createMemo(() => { - if (props.task.status !== 10) return null; + if (!props.task.completed && props.task.status !== 10) return null; return getRecurrenceProgress(props.task.recurrence, props.task.updated, now()); }); const shouldQuickloadFade = createMemo(() => store.quickloadFadeTaskIds.includes(props.task.id)); @@ -141,7 +141,7 @@ export const TaskCard: Component<{ task: Task, isShaking?: boolean }> = (props) updateTask(props.task.id, { status: 10 }); }} > - + diff --git a/src/components/TaskDetail.tsx b/src/components/TaskDetail.tsx index 41663e9..f81f04d 100644 --- a/src/components/TaskDetail.tsx +++ b/src/components/TaskDetail.tsx @@ -221,7 +221,7 @@ export const TaskDetail: Component = (props) => { const statusOptions = createMemo(() => getStatusOptionsForTask(props.task.recurrence)); const recurrenceProgress = createMemo(() => { - if (props.task.status !== 10) return null; + if (!props.task.completed && props.task.status !== 10) return null; return getRecurrenceProgress(props.task.recurrence, props.task.updated, now()); }); @@ -267,7 +267,7 @@ export const TaskDetail: Component = (props) => { updateStatus("10"); }} > - +