From e85c62de06fd29121ac7908aa369860c567d4fba Mon Sep 17 00:00:00 2001 From: Muhammad Fajar Date: Sat, 13 Jan 2024 14:11:44 +0700 Subject: [PATCH] [Client Portal] Fix Alarm Center --- app/Services/CorporateMemberService.php | 1 + frontend/client-portal/src/pages/AlarmCenter/List.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Services/CorporateMemberService.php b/app/Services/CorporateMemberService.php index f77f9f61..94db6738 100644 --- a/app/Services/CorporateMemberService.php +++ b/app/Services/CorporateMemberService.php @@ -201,6 +201,7 @@ class CorporateMemberService 'plans.service_code' ]) ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`") + ->groupBy('member_id') ->paginate($limit); } diff --git a/frontend/client-portal/src/pages/AlarmCenter/List.tsx b/frontend/client-portal/src/pages/AlarmCenter/List.tsx index b049f229..7c711714 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/List.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/List.tsx @@ -147,7 +147,7 @@ export default function List() { const handleStartDateChanges = async (event: React.FormEvent) => { event.preventDefault(); - console.log(startDateValue); + if (startDateValue === '') { searchParams.delete('start_date'); const params = Object.fromEntries([...searchParams.entries()]);