From 444b1592abbc9578d4e284198a2d7781347d1a04 Mon Sep 17 00:00:00 2001
From: Dr Masroor Ehsan <masroore@gmail.com>
Date: Sat, 4 Jan 2025 13:56:35 +0600
Subject: [PATCH] wip

---
 app/DAL/Studies/IUserStudyLister.php |  3 +++
 app/DAL/Studies/WorklistBase.php     | 10 +++++++++-
 app/DataTables/WorklistDataTable.php |  3 +--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/DAL/Studies/IUserStudyLister.php b/app/DAL/Studies/IUserStudyLister.php
index 0ee8a68..0955549 100644
--- a/app/DAL/Studies/IUserStudyLister.php
+++ b/app/DAL/Studies/IUserStudyLister.php
@@ -4,6 +4,7 @@
 
 use App\Models\Enums\ReportStatus;
 use App\Models\Enums\StudyLevelStatus;
+use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 interface IUserStudyLister
@@ -26,6 +27,8 @@ public function setLocked(bool $locked): self;
 
     public function get(?int $user_id = null): LengthAwarePaginator;
 
+    public function query(?int $user_id = null): Builder;
+
     public function setStudyDate(string $from, ?string $to = null): self;
 
     public function setReceiveDate(string $from, ?string $to = null): self;
diff --git a/app/DAL/Studies/WorklistBase.php b/app/DAL/Studies/WorklistBase.php
index 0075868..28e986b 100644
--- a/app/DAL/Studies/WorklistBase.php
+++ b/app/DAL/Studies/WorklistBase.php
@@ -110,12 +110,20 @@ protected function applySort(Builder $query): Builder
         }
 
         return $query
-            ->orderByDesc('study_priority')
+            ->orderByDesc('priority')
             ->orderByDesc('received_at');
     }
 
     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);
+
+        return $query;
+    }
+
     public function get(?int $user_id = null): LengthAwarePaginator
     {
         $query = $this->buildQuery($user_id);
diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php
index df9d08c..11a480c 100644
--- a/app/DataTables/WorklistDataTable.php
+++ b/app/DataTables/WorklistDataTable.php
@@ -93,7 +93,7 @@ public function getColumns(): array
 
             Column::make('study_description'),
             Column::make('reporting_physician_id'),
-            Column::make('body_part_examined'),
+            // Column::make('body_part_examined'),
             Column::make('num_instances')
                 ->searchable(false)
                 ->orderable(false)
@@ -105,7 +105,6 @@ public function getColumns(): array
                 ->printable(false)
                 ->width(60)
                 ->addClass('text-center'),
-
         ];
     }