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

penyesuaian approved at

Browse Source
This commit is contained in:
Tb Fajri
2024-02-01 10:43:40 +07:00
parent 8a7fac07ff
commit 12fee09c65
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Internal/Http/Controllers/Api/ReportLogController.php
View File

@@ -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

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

@@ -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,