table

app/DataTables/WorklistDataTable.php

@@ -22,6 +22,8 @@ public function dataTable(QueryBuilder $query): EloquentDataTable
     {
         return (new EloquentDataTable($query))
             ->addColumn('action', 'worklist.action')
+            ->orderColumn('patient_name', 'patient_name $1')
+            ->rawColumns(['priority_icon'])
             ->setRowId('id');
     }
 
@@ -62,8 +64,8 @@ public function html(): HtmlBuilder
     public function getColumns(): array
     {
         return [
-            Column::make('study_priority'),
-            Column::make('study_modality'),
+            Column::make('priority_icon'),
+            Column::make('modality'),
 
             Column::make('patient_id'),
             Column::make('patient_name'),

app/Models/Study.php

@@ -23,7 +23,7 @@ protected function casts(): array
             'is_archived' => 'boolean',
             'study_status' => StudyLevelStatus::class,
             'report_status' => ReportStatus::class,
-            'study_priority' => Priority::class,
+            'priority' => Priority::class,
             'received_at' => 'datetime',
             'reported_at' => 'datetime',
             'assigned_at' => 'datetime',
@@ -180,6 +180,7 @@ public function allowed(): array
     public function toArray(): array
     {
         return array_merge(parent::toArray(), [
+            'priority_icon' => $this->getPriorityIcon(),
             'sex_age' => $this->sexAge(),
             'num_instances' => $this->numInstances(),
             'links' => $this->links(),
@@ -187,12 +188,13 @@ public function toArray(): array
         ]);
     }
 
-    public function getPriorityIconAttribute(): string
+    public function getPriorityIcon(): string
     {
-        return match ($this->study_priority) {
-            1 => 'fa fa-star text-warning',
-            2 => 'fa fa-star text-danger',
-            default => 'fa fa-star text-primary',
+        return match ($this->priority) {
+            Priority::High => '<i class="fa-light fa-triangle-exclamation"></i>',
+            Priority::Urgent => '<i class="fa-light fa-bolt"></i>',
+            Priority::Low => '<i class="fa-thin fa-chevrons-down"></i>',
+            default => '',
         };
     }
 }