From b500c9244ba0f8204b5784db3641c56c71940718 Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Thu, 15 Feb 2024 13:59:42 +0700
Subject: [PATCH] optimize daily monitoring

---
 .../Api/DailyMonitoringController.php         |  1 -
 .../Components/DailyMonitoringList.tsx        | 31 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
index dcb25af4..0eef8570 100644
--- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
+++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
@@ -42,7 +42,6 @@ class DailyMonitoringController extends Controller
     {
         $memberList = DB::table('request_logs')
             ->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
-            ->leftJoin('member_plans', 'request_logs.member_id', '=', 'member_plans.member_id')
             ->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id')
             ->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' )
             ->where('request_logs.service_code', 'IP')
diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DailyMonitoringList.tsx b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DailyMonitoringList.tsx
index bd0fbfa4..30b755c1 100644
--- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DailyMonitoringList.tsx
+++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DailyMonitoringList.tsx
@@ -186,33 +186,26 @@ export default function DailyMonitoringList() {
                 </TableHead>
 
                 {/* Body Table */}
-                {dataTableIsLoading ?
-                (
+                {dataTableIsLoading ? (
                     <TableBody>
                         <TableRow>
                             <TableCell colSpan={7} align="center">Loading</TableCell>
                         </TableRow>
                     </TableBody>
-                )
-                :
-                (
-                    dataTableData.data.length == 0 ?
-                    (
-                        <TableBody>
-                            <TableRow>
-                                <TableCell colSpan={7} align="center">No Data</TableCell>
-                            </TableRow>
-                        </TableBody>
-                    )
-                    :
-                    (
-                        <TableBody>
+                ) : dataTableData.data.length == 0 ? (
+                    <TableBody>
+                        <TableRow>
+                            <TableCell colSpan={7} align="center">No Data</TableCell>
+                        </TableRow>
+                    </TableBody>
+                ) : dataTableData.data && dataTableData.data.length > 0 ? (
+                    <TableBody>
                         {dataTableData.data.map((row: DailyMonitoringListType, index) => (
                             <DailyMonitoringListRow key={index} number={index+1} row={row} />
                         ))}
-                        </TableBody>
-                    )
-                )}
+                    </TableBody>
+                ) : null}
+
             </Table>
         )
     }