From 53763674fd91cd5ad5b89173b6a65040424f7da0 Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Thu, 1 Feb 2024 09:42:43 +0700
Subject: [PATCH] add kolom import system

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

diff --git a/Modules/Internal/Http/Controllers/Api/ReportLogController.php b/Modules/Internal/Http/Controllers/Api/ReportLogController.php
index 829c61fe..3c20bc72 100644
--- a/Modules/Internal/Http/Controllers/Api/ReportLogController.php
+++ b/Modules/Internal/Http/Controllers/Api/ReportLogController.php
@@ -167,7 +167,8 @@ class ReportLogController extends Controller
             'Duration GL',
             'Duration FGL',
             'Status GL',
-            'Status Final GL'
+            'Status Final GL',
+            'Import By Excel'
         ];
        // Sheet 1
         $writer->getCurrentSheet()->setName('Data');
@@ -204,7 +205,15 @@ class ReportLogController extends Controller
             }
     
             $durationGl = Helper::differenceTime($formattedDateTime, $row['submission_date']);
-        
+            
+            $approveByFgl = '-';
+            if ($row['import_system']) {
+                $approveByFgl = 'Import By Excel';
+            } else if ($row['final_log'] == 1 &&  $row['status_final_log'] == 'requested'){
+                $approveByFgl = '-';
+            } else {
+                $approveByFgl = Helper::userName($row['approved_final_log_by']);
+            }
             
             $rowData = [
                 $row['code'], // code
@@ -214,7 +223,7 @@ class ReportLogController extends Controller
                 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
-                $row['final_log'] == 1 ? Helper::userName($row['approved_final_log_by']) : '-', // fgl create by
+                $approveByFgl, // fgl create by
                 $serviceName, // service
                 $provider ? $provider->name : '-', // provider
                 count($documentQty), // dokument qty
@@ -222,6 +231,7 @@ class ReportLogController extends Controller
                 $row['final_log'] == 1 ? $durationFinalGl : '-', // duration fgl
                 $row['status'] ?? '-', // status gl
                 $row['status_final_log'] ?? '-', // status fgl
+                $row['import_system'] == 1 ? 'True' : 'False', // status fgl
             ];
             $row = WriterEntityFactory::createRowFromArray($rowData);
             $writer->addRow($row);
diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php
index 4b245ae9..e20a7e49 100644
--- a/Modules/Internal/Transformers/ReportLogResource.php
+++ b/Modules/Internal/Transformers/ReportLogResource.php
@@ -40,7 +40,14 @@ class ReportLogResource extends JsonResource
         }
 
         $durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date);
-        
+        $approveByFgl = '-';
+        if ($this->import_system) {
+            $approveByFgl = 'Import By Excel';
+        } else if ($this->final_log == 1 &&  $this->status_final_log == 'requested'){
+            $approveByFgl = '-';
+        } else {
+            $approveByFgl = Helper::userName($this->approved_final_log_by);
+        }
         
         $data = [
             'id' => $this->id,