From 2601b40ea35f9c4488d2299303b38efa93d09990 Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Sat, 18 Jan 2025 22:54:23 +0600 Subject: [PATCH] tab filter --- app/DataTables/WorklistDataTable.php | 17 +++++++ .../views/staff/worklist/index.blade.php | 49 +++++++++++++++++-- .../worklist/partials/_nav-item.blade.php | 6 +-- .../worklist/partials/_nav-top.blade.php | 4 +- 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index d2317cb..9302599 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -51,6 +51,23 @@ public function dataTable(QueryBuilder $query): EloquentDataTable $rawColumns[] = $column; } + // Apply the status filter + if (($status = strtolower($this->request()->get('status'))) && $status !== 'all') { + $data_table->filter(function ($query) use ($status) { + switch ($status) { + case 'unread': + $query->whereNull('read_at'); + break; + case 'read': + $query->whereNotNull('read_at'); + break; + case 'progress': + $query->whereNotNull('locked_at'); + break; + } + }); + } + $data_table ->orderColumn(WorklistColumn::PatientName->value, sprintf('%s $1', WorklistColumn::PatientName->value)) ->rawColumns($rawColumns) diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index 3e2b709..733f6b2 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -17,12 +17,12 @@ @section('vendor-style') @vite([ 'resources/fontawesome/scss/fontawesome.scss', - 'resources/fontawesome/scss/solid.scss', + //'resources/fontawesome/scss/solid.scss', 'resources/fontawesome/scss/light.scss', 'resources/assets/vendor/libs/datatables-bs5/datatables.bootstrap5.scss', 'resources/assets/vendor/libs/datatables-responsive-bs5/responsive.bootstrap5.scss', - 'resources/assets/vendor/libs/datatables-checkboxes-jquery/datatables.checkboxes.scss', - 'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss' + //'resources/assets/vendor/libs/datatables-checkboxes-jquery/datatables.checkboxes.scss', + //'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss' ]) @endsection @@ -39,10 +39,10 @@ 'resources/assets/js/ui-popover.js' ]) - {{ $dataTable->scripts(attributes: ['type' => 'module']) }} + {{ $dataTable->scripts() }} + + @endsection @section('content') diff --git a/resources/views/staff/worklist/partials/_nav-item.blade.php b/resources/views/staff/worklist/partials/_nav-item.blade.php index b8f93b8..9a46b6a 100644 --- a/resources/views/staff/worklist/partials/_nav-item.blade.php +++ b/resources/views/staff/worklist/partials/_nav-item.blade.php @@ -1,5 +1,5 @@ diff --git a/resources/views/staff/worklist/partials/_nav-top.blade.php b/resources/views/staff/worklist/partials/_nav-top.blade.php index f426de2..2c89a11 100644 --- a/resources/views/staff/worklist/partials/_nav-top.blade.php +++ b/resources/views/staff/worklist/partials/_nav-top.blade.php @@ -1,8 +1,8 @@