ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filter items from the report if null returned

Browse Source
This commit is contained in:
Ivan Nieto Vivanco
2022-12-06 18:00:16 -06:00
parent b7a5467f8b
commit eb67d1b064
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportsController.php
+13 -7
View File
@@ -1110,13 +1110,19 @@ class ReportsController extends Controller
$rows[] = implode(',', $header); $rows[] = implode(',', $header);
foreach ($assetsForReport as $item) { foreach ($assetsForReport as $item) {
$row = [ ];
$row[] = str_replace(',', '', e($item['assetItem']->model->category->name)); if ($item['assetItem'] != null){
$row[] = str_replace(',', '', e($item['assetItem']->model->name));
$row[] = str_replace(',', '', e($item['assetItem']->name)); $row = [ ];
$row[] = str_replace(',', '', e($item['assetItem']->asset_tag)); $row[] = str_replace(',', '', e($item['assetItem']->model->category->name));
$row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user'))); $row[] = str_replace(',', '', e($item['assetItem']->model->name));
$rows[] = implode(',', $row); $row[] = str_replace(',', '', e($item['assetItem']->name));
$row[] = str_replace(',', '', e($item['assetItem']->asset_tag));
$row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
$rows[] = implode(',', $row);
} else {
// Log the error maybe?
}
} }
// spit out a csv // spit out a csv