From 12fee09c6502d82dc5a0128f11da0ef5feda3884 Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Thu, 1 Feb 2024 10:43:40 +0700
Subject: [PATCH] penyesuaian approved at

---
 Modules/Internal/Http/Controllers/Api/ReportLogController.php | 4 ++--
 Modules/Internal/Transformers/ReportLogResource.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/Internal/Http/Controllers/Api/ReportLogController.php b/Modules/Internal/Http/Controllers/Api/ReportLogController.php
index 1be8de6e..262e3d92 100644
--- a/Modules/Internal/Http/Controllers/Api/ReportLogController.php
+++ b/Modules/Internal/Http/Controllers/Api/ReportLogController.php
@@ -205,7 +205,7 @@ class ReportLogController extends Controller
                 $created_final_at = false;
             }
     
-            $durationGl = Helper::differenceTime($formattedDateTime, $row['submission_date']);
+            $durationGl = Helper::differenceTime($formattedDateTime, $row['approved_at']);
             
             $approveByFgl = '-';
             if ($row['import_system']) {
@@ -221,7 +221,7 @@ class ReportLogController extends Controller
                 $row['member'] ? $row['member']['name'] : '', // name
                 $row['member'] ? $row['member']['member_id'] : '', // member id
                 $formattedDateTime ? $formattedDateTime : "-" , // created at
-                $row['submission_date'], // submission date
+                $row['approved_at'], // submission date
                 Helper::userName($row['approved_by']), // created by
                 $created_final_at ? $created_final_at : "-", // fgl create time
                 $row['approved_final_log_at'] ? $row['approved_final_log_at'] : "", // fgl submit time
diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php
index 57e55092..fecaf7ca 100644
--- a/Modules/Internal/Transformers/ReportLogResource.php
+++ b/Modules/Internal/Transformers/ReportLogResource.php
@@ -39,7 +39,7 @@ class ReportLogResource extends JsonResource
             $created_final_at = null;
         }
 
-        $durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date);
+        $durationGl = Helper::differenceTime($formattedDateTime, $this->approved_at);
         $approveByFgl = '-';
         if ($this->import_system) {
             $approveByFgl = 'Import By Excel';
@@ -54,7 +54,7 @@ class ReportLogResource extends JsonResource
             'code' => $this->code,
             'created_at' => $formattedDateTime,
             'created_final_at' => $created_final_at,
-            'submission_date' => $this->submission_date,
+            'submission_date' => $this->approved_at,
             'approved_by' => Helper::userName($this->approved_by),
             'approved_final_log_at' => $this->approved_final_log_at,
             'approved_final_log_by' => $approveByFgl,