From 4593e85900e75ed5142f56c1979806b7e6b5827f Mon Sep 17 00:00:00 2001
From: Dr Masroor Ehsan <masroore@gmail.com>
Date: Sat, 4 Jan 2025 18:45:25 +0600
Subject: [PATCH] wip

---
 app/DAL/Studies/RadiologistWorklist.php        |  8 +++++++-
 app/DAL/Studies/WorklistBase.php               |  4 ++--
 app/DataTables/WorklistDataTable.php           | 11 +++++++----
 resources/views/staff/worklist/table.blade.php |  5 +++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/DAL/Studies/RadiologistWorklist.php b/app/DAL/Studies/RadiologistWorklist.php
index e953e46..3a0617e 100644
--- a/app/DAL/Studies/RadiologistWorklist.php
+++ b/app/DAL/Studies/RadiologistWorklist.php
@@ -8,9 +8,15 @@ final class RadiologistWorklist extends WorklistBase
 {
     protected function buildQuery(?int $user_id = null): Builder
     {
+        $query = $this->getStudiesQuery();
         $user_id = (int) ($user_id ?? auth()->id());
         $this->setRadiologist($user_id);
 
-        return $this->getStudiesQuery();
+        $query = $query->where(function ($query) use ($user_id) {
+            $query->Where('assigned_physician_id', '=', $user_id);
+            $query->orWhere('reporting_physician_id', '=', $user_id);
+        });
+
+        return $query;
     }
 }
diff --git a/app/DAL/Studies/WorklistBase.php b/app/DAL/Studies/WorklistBase.php
index 57eeefd..7fd0ea1 100644
--- a/app/DAL/Studies/WorklistBase.php
+++ b/app/DAL/Studies/WorklistBase.php
@@ -125,8 +125,8 @@ abstract protected function buildQuery(?int $user_id = null): Builder;
     public function query(?int $user_id = null): Builder
     {
         $query = $this->buildQuery($user_id);
-        $query = $this->applySort($query);
-        $query = $this->applyRadiologist($query);
+        // $query = $this->applySort($query);
+        // $query = $this->applyRadiologist($query);
 
         return $query;
     }
diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php
index 196e621..33dd368 100644
--- a/app/DataTables/WorklistDataTable.php
+++ b/app/DataTables/WorklistDataTable.php
@@ -22,7 +22,7 @@ class WorklistDataTable extends DataTable
      * @param  QueryBuilder  $query  Results from query() method.
      */
     // const DATE_FORMAT = 'DD.MM.YYYY HH:mm';
-    const DATE_FORMAT = 'DD MMM HH:mm';
+    const DATE_FORMAT = 'MMM DD, YYYY HH:mm';
 
     public function dataTable(QueryBuilder $query): EloquentDataTable
     {
@@ -109,14 +109,17 @@ public function getColumns(): array
                 ->searchable(false)
                 ->orderable(false)
                 ->addClass('text-center')
-                ->title('Priority'),
+                ->width('20px')
+                ->title(''),
+
             Column::make('report_status_led')
                 ->searchable(false)
                 ->orderable(false)
                 ->addClass('text-center')
-                ->title('Status'),
-            Column::make('modality'),
+                ->width('20px')
+                ->title(''),
 
+            Column::make('modality'),
             Column::make('patient_id'),
             Column::make('patient_name'),
             Column::make('sex_age')
diff --git a/resources/views/staff/worklist/table.blade.php b/resources/views/staff/worklist/table.blade.php
index 2cbcfb2..209af96 100644
--- a/resources/views/staff/worklist/table.blade.php
+++ b/resources/views/staff/worklist/table.blade.php
@@ -19,7 +19,6 @@
         'resources/fontawesome/scss/fontawesome.scss',
         'resources/fontawesome/scss/light.scss',
         'resources/fontawesome/scss/thin.scss',
-        //'resources/fontawesome/css/all.min.css',
         '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',
@@ -39,5 +38,7 @@
 @endsection
 
 @section('content')
-    {{ $dataTable->table() }}
+    <div class="table-responsive text-nowrap">
+        {{ $dataTable->table(['class' => 'table table-sm'], true) }}
+    </div>
 @endsection