tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

update list

Browse Source
This commit is contained in:
Tb Fajri
2024-01-31 09:47:01 +07:00
parent aaac2f0a87
commit a794379973
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Internal/Transformers/ReportLogResource.php
View File

@@ -32,9 +32,11 @@ class ReportLogResource extends JsonResource
$timeInsertBenefit = RequestLogBenefit::where('request_log_id', $this->id)->first(); $timeInsertBenefit = RequestLogBenefit::where('request_log_id', $this->id)->first();
if ($timeInsertBenefit){ 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 { } else {
$durationFinalGl = 0; $durationFinalGl = 0;
$created_final_at = NULL;
} }
$durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date); $durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date);
@@ -44,7 +46,7 @@ class ReportLogResource extends JsonResource
'id' => $this->id, 'id' => $this->id,
'code' => $this->code, 'code' => $this->code,
'created_at' => $formattedDateTime, 'created_at' => $formattedDateTime,
'created_final_at' => $this->created_final_at, 'created_final_at' => $created_final_at,
'submission_date' => $this->submission_date, 'submission_date' => $this->submission_date,
'approved_by' => Helper::userName($this->approved_by), 'approved_by' => Helper::userName($this->approved_by),
'approved_final_log_at' => $this->approved_final_log_at, 'approved_final_log_at' => $this->approved_final_log_at,
@@ -59,7 +61,8 @@ class ReportLogResource extends JsonResource
'payment_type_name' => $this->payment_type_name, 'payment_type_name' => $this->payment_type_name,
'duration_gl' => $durationGl, 'duration_gl' => $durationGl,
'duration_final_gl' => $this->final_log == 1 ? $durationFinalGl : '-', 'duration_final_gl' => $this->final_log == 1 ? $durationFinalGl : '-',
'files_by_type' => $filesGroupByType 'files_by_type' => $filesGroupByType,
'time_insert_benefit' => $filesGroupByType,
]; ];
return $data; return $data;

4
frontend/dashboard/src/pages/Report/Log/List.tsx
View File

@@ -416,10 +416,10 @@ export default function List() {
isSort: false, isSort: false,
}, },
{ {
id: 'submission_date', id: 'fgl_submission_date',
align: 'left', align: 'left',
label: 'FGL Submit Time', label: 'FGL Submit Time',
isSort: true, isSort: false,
}, },
{ {
id: 'service_code', id: 'service_code',