From f91a4ade1eaa5ef910236559481879696ffcd853 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Thu, 26 Dec 2024 12:08:00 +0700
Subject: [PATCH] feat: update completed also cover ended

---
 src/controllers/06-request-list-controller.ts | 5 ++++-
 src/controllers/07-task-controller.ts         | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts
index 4379a20..c967efd 100644
--- a/src/controllers/06-request-list-controller.ts
+++ b/src/controllers/06-request-list-controller.ts
@@ -603,7 +603,10 @@ export class RequestListController extends Controller {
             )?.stepCount || 0;
 
           const completeCount = work.stepStatus.filter(
-            (v) => v.workStatus === RequestWorkStatus.Completed,
+            (v) =>
+              v.workStatus === RequestWorkStatus.Completed ||
+              v.workStatus === RequestWorkStatus.Ended ||
+              v.workStatus === RequestWorkStatus.Canceled,
           ).length;
 
           // NOTE: step found then check if complete count equals step count
diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts
index 323b34d..1e2a10e 100644
--- a/src/controllers/07-task-controller.ts
+++ b/src/controllers/07-task-controller.ts
@@ -601,7 +601,10 @@ export class TaskActionController extends Controller {
             )?.stepCount || 0;
 
           const completeCount = work.stepStatus.filter(
-            (v) => v.workStatus === RequestWorkStatus.Completed,
+            (v) =>
+              v.workStatus === RequestWorkStatus.Completed ||
+              v.workStatus === RequestWorkStatus.Ended ||
+              v.workStatus === RequestWorkStatus.Canceled,
           ).length;
 
           // NOTE: step found then check if complete count equals step count