Compare commits

...

2 Commits
master ... dev

Author SHA1 Message Date
6b9cd53f9f update system log, change from EloquentDatatable to CollectionDtatable 2024-01-10 17:36:11 +07:00
Daeng Deni Mardaeni
6c5f7dba97 update breadcrumb 2023-09-27 15:05:39 +07:00

View File

@ -8,6 +8,7 @@
use Jackiedo\LogReader\Exceptions\UnableToRetrieveLogFilesException; use Jackiedo\LogReader\Exceptions\UnableToRetrieveLogFilesException;
use Jackiedo\LogReader\LogReader; use Jackiedo\LogReader\LogReader;
use Spatie\Activitylog\Models\Activity; use Spatie\Activitylog\Models\Activity;
use Yajra\DataTables\CollectionDataTable;
use Yajra\DataTables\EloquentDataTable; use Yajra\DataTables\EloquentDataTable;
use Yajra\DataTables\Html\Builder as HtmlBuilder; use Yajra\DataTables\Html\Builder as HtmlBuilder;
use Yajra\DataTables\Html\Column; use Yajra\DataTables\Html\Column;
@ -22,10 +23,10 @@
* *
* @return \Yajra\DataTables\DataTableAbstract * @return \Yajra\DataTables\DataTableAbstract
*/ */
public function dataTable(QueryBuilder $query) public function dataTable(Collection $query)
: EloquentDataTable : CollectionDataTable
{ {
return (new EloquentDataTable($query))->rawColumns([ return (new CollectionDataTable($query))->rawColumns([
'action', 'action',
'level' 'level'
])->editColumn('id', function (Collection $model) { ])->editColumn('id', function (Collection $model) {
@ -71,13 +72,13 @@
* @return Collection * @return Collection
*/ */
public function query(LogReader $model) public function query(LogReader $model)
: QueryBuilder : Collection
{ {
$data = collect();
$model->setLogPath(storage_path('logs')); $model->setLogPath(storage_path('logs'));
try { try {
$data = $model->get()->merge($data); $data = $model->get();
} catch (UnableToRetrieveLogFilesException $exception) { } catch (UnableToRetrieveLogFilesException $exception) {
echo $exception->getMessage(); echo $exception->getMessage();
exit; exit;
@ -87,6 +88,7 @@
return (collect($a))->only(['id', 'date', 'environment', 'level', 'file_path', 'context']); return (collect($a))->only(['id', 'date', 'environment', 'level', 'file_path', 'context']);
}); });
return $data; return $data;
} }