From a794379973b84821df0eaf14291102a4b8082e31 Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Wed, 31 Jan 2024 09:47:01 +0700
Subject: [PATCH] update list

---
 Modules/Internal/Transformers/ReportLogResource.php | 9 ++++++---
 frontend/dashboard/src/pages/Report/Log/List.tsx    | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php
index 4fcf7dcf..ce7e7dd2 100644
--- a/Modules/Internal/Transformers/ReportLogResource.php
+++ b/Modules/Internal/Transformers/ReportLogResource.php
@@ -32,9 +32,11 @@ class ReportLogResource extends JsonResource
         $timeInsertBenefit = RequestLogBenefit::where('request_log_id', $this->id)->first();
 
         if ($timeInsertBenefit){
-            $durationFinalGl = Helper::differenceTime($this->created_final_at,$timeInsertBenefit->created_at);
+            $created_final_at = $timeInsertBenefit->created_at;
+            $durationFinalGl = Helper::differenceTime($timeInsertBenefit->created_at, $this->approved_final_log_at);
         } else {
             $durationFinalGl = 0;
+            $created_final_at = NULL;
         }
 
         $durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date);
@@ -44,7 +46,7 @@ class ReportLogResource extends JsonResource
             'id' => $this->id,
             'code' => $this->code,
             'created_at' => $formattedDateTime,
-            'created_final_at' => $this->created_final_at,
+            'created_final_at' => $created_final_at,
             'submission_date' => $this->submission_date,
             'approved_by' => Helper::userName($this->approved_by),
             'approved_final_log_at' => $this->approved_final_log_at,
@@ -59,7 +61,8 @@ class ReportLogResource extends JsonResource
             'payment_type_name' => $this->payment_type_name,
             'duration_gl' => $durationGl,
             'duration_final_gl' => $this->final_log == 1 ? $durationFinalGl : '-',
-            'files_by_type' => $filesGroupByType
+            'files_by_type' => $filesGroupByType,
+            'time_insert_benefit' => $filesGroupByType,
         ];
 
         return $data;
diff --git a/frontend/dashboard/src/pages/Report/Log/List.tsx b/frontend/dashboard/src/pages/Report/Log/List.tsx
index 037742c2..d4de6dd5 100644
--- a/frontend/dashboard/src/pages/Report/Log/List.tsx
+++ b/frontend/dashboard/src/pages/Report/Log/List.tsx
@@ -416,10 +416,10 @@ export default function List() {
       isSort: false,
     },
     {
-      id: 'submission_date',
+      id: 'fgl_submission_date',
       align: 'left',
       label: 'FGL Submit Time',
-      isSort: true,
+      isSort: false,
     },
     {
       id: 'service_code',