From 96381e4a8273dca938f83e38a4b7bbe116a92007 Mon Sep 17 00:00:00 2001
From: ivan-sim <ivan@sismedika.com>
Date: Tue, 16 Jan 2024 17:20:36 +0700
Subject: [PATCH] Update Export

---
 .../Http/Controllers/Api/ClaimController.php   | 18 +++++++++++-------
 .../src/pages/AlarmCenter/List.tsx             |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Modules/Client/Http/Controllers/Api/ClaimController.php b/Modules/Client/Http/Controllers/Api/ClaimController.php
index 0f35c96a..4c2c9e72 100644
--- a/Modules/Client/Http/Controllers/Api/ClaimController.php
+++ b/Modules/Client/Http/Controllers/Api/ClaimController.php
@@ -269,7 +269,8 @@ class ClaimController extends Controller
     public function exportAlrmCenter($corporate_id, $start, $end)
     {
         $writer = WriterEntityFactory::createXLSXWriter();
-        $writer->openToFile(public_path('files/Claim-Data-Corporate-'. date('Y-m-d').'.xlsx'));
+        $writer->openToFile(public_path('files/Report-Data-Alarm-Center-'.$start.'-'.$end.'.xlsx'));
+        
         $header = [
             'No',
             'Code',
@@ -305,15 +306,18 @@ class ClaimController extends Controller
         ->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
         ->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
         ->where('corporate_employees.corporate_id', '=', $corporate_id)
-        ->where('request_logs.submission_date', '>', $start)
-        ->where('request_logs.submission_date', '<', $end)
+        ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
+            $query->where('request_logs.submission_date', '>', $start)
+                ->where('request_logs.submission_date', '<', $end);
+        })       
         ->select(
             DB::raw('1 AS no'),
             'request_logs.organization_id',
             'request_logs.id',
             'request_logs.member_id',
             'request_logs.service_code',
-            'request_logs.code'
+            'request_logs.code',
+            'request_logs.diagnosis'
         )
         ->get();
 
@@ -446,7 +450,7 @@ class ClaimController extends Controller
                             !empty($item_benefit->amount_approved) ? $item_benefit->amount_approved : '',
                             !empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '',
                             !empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '',
-                            !empty($item_benefit->keterangan) ? $item_benefit->keterangan : '',
+                            !empty($item->diagnosis) ? $item->diagnosis : '',
         
                         ];
                         array_push($dataRow,$rowData);
@@ -496,8 +500,8 @@ class ClaimController extends Controller
         $writer->close();
 
         return Helper::responseJson([
-            'file_name' => 'Claim-Data-Corporate-'. date('Y-m-d'),
-            "file_url" => url('files/Claim-Data-Corporate-'. date('Y-m-d').'.xlsx')
+            'file_name' => 'Report-Data-Alarm-Center-'. $start.'-'.$end,
+            "file_url" => url('files/Report-Data-Alarm-Center-'. $start.'-'.$end.'.xlsx')
         ]);
     }
 }
diff --git a/frontend/client-portal/src/pages/AlarmCenter/List.tsx b/frontend/client-portal/src/pages/AlarmCenter/List.tsx
index 056337cd..f6995a38 100644
--- a/frontend/client-portal/src/pages/AlarmCenter/List.tsx
+++ b/frontend/client-portal/src/pages/AlarmCenter/List.tsx
@@ -192,10 +192,11 @@ export default function List() {
 
   /* -------------------------------- handle export --------------------------- */
   const handleExportReport = async () => {
+    
     var filter = Object.fromEntries([...searchParams.entries()]);
 
     await axios
-      .get(corporateValue + '/claims/exportAlrmCenter/'+startDateValue+'/'+endDateValue, { params: filter })
+      .get(corporateValue + '/claims/exportAlrmCenter/'+(startDateValue ? startDateValue : 'all')+'/'+(endDateValue ? endDateValue : 'all'), { params: filter })
       .then((res) => {
         enqueueSnackbar('Data berhasil di Export', {
           variant: 'success',