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

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-02-01 09:52:37 +07:00
parent 64cca9bca0 53763674fd
commit 85749e4743
7 changed files with 86 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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');
@@ -209,6 +210,15 @@ class ReportLogController extends Controller
$durationGl = 0;
}
$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
@@ -218,7 +228,7 @@ class ReportLogController extends Controller
$row['approved_by'] ? 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
@@ -226,6 +236,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);