diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 85afa36..ebbac8a 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -274,11 +274,27 @@ private function physicianColumn(Study $study): ?string { $user = $study->readingPhysician; if ($user === null) { + $html = ''; + if ($study->assigned_at !== null) { - return ''; + $html .= Blade::render('_partials._img-tooltip', + [ + 'src' => asset('imgs/assigned.png'), + 'class' => 'msg-icon', + 'tip' => 'Assigned on ' . $study->assigned_at->format(self::DATE_FORMAT_LONG), + ]); } - return null; + if ($study->isLocked()) { + $html .= Blade::render('_partials._img-tooltip', + [ + 'src' => asset('imgs/lock.png'), + 'class' => 'ms-1 msg-icon', + 'tip' => 'Locked on ' . $study->locked_at->format(self::DATE_FORMAT_LONG), + ]); + } + + return $html; } $dt = $study->read_at; @@ -317,7 +333,7 @@ private function renderCustomColumns(): array case WorklistColumn::AssignedPhysician: $columns[$col->value] = static function (Study $study) { if ($study->assigned_at !== null) { - return ''; + return ''; } return null; @@ -435,7 +451,7 @@ private function generateActionButtons(Study $study): string $btns[] = $this->renderImageLink($study->hash, 'info.png', 'showStudy', 'Info'); break; case WorklistButton::Assign: - $btns[] = $this->renderImageLink($study->hash, 'doctor.png', 'show-assign', 'Assign'); + $btns[] = $this->renderImageLink($study->hash, 'assign.png', 'show-assign', 'Assign'); break; case WorklistButton::Notes: $btns[] = $this->renderImageLink($study->hash, 'chat.png', 'show-notes', 'Chat'); diff --git a/app/Models/Study.php b/app/Models/Study.php index eaa7086..7a5d516 100644 --- a/app/Models/Study.php +++ b/app/Models/Study.php @@ -492,6 +492,7 @@ protected function casts(): array 'read_at' => 'immutable_datetime', 'assigned_at' => 'immutable_datetime', 'study_date' => 'immutable_datetime', + 'locked_at' => 'immutable_datetime', 'patient_birthdate' => 'immutable_date', ]; } diff --git a/resources/imgs/assign.png b/resources/imgs/assign.png index 36f9208..013c407 100644 Binary files a/resources/imgs/assign.png and b/resources/imgs/assign.png differ diff --git a/resources/imgs/assigned.png b/resources/imgs/assigned.png new file mode 100644 index 0000000..02be686 Binary files /dev/null and b/resources/imgs/assigned.png differ diff --git a/resources/imgs/lock.png b/resources/imgs/lock.png new file mode 100644 index 0000000..5b49ff5 Binary files /dev/null and b/resources/imgs/lock.png differ diff --git a/resources/views/_partials/_img-tooltip.blade.php b/resources/views/_partials/_img-tooltip.blade.php new file mode 100644 index 0000000..ba6d37a --- /dev/null +++ b/resources/views/_partials/_img-tooltip.blade.php @@ -0,0 +1 @@ + diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index 7388924..627e457 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -40,6 +40,15 @@ ]) @endsection +@section('page-style') + +@endsection + @section('page-script') @vite([ //'resources/assets/js/forms-pickers.js',