diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 224035e..6cf8bb5 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -504,7 +504,11 @@ private function renderCustomColumns(): array private function generateReportingButtons(Study $study): string { $hasReports = $study->hasReports(); - $img = $hasReports ? 'report.png' : 'inbox.png'; + $img = match (true) { + $hasReports => 'report.png', + me()->isRadiologist() => 'report-write.png', + default => 'inbox.png', + }; if (me()->isRadiologist()) { if ($study->isLocked() && ! $study->isLockedBy()) { @@ -532,7 +536,7 @@ private function generateReportingButtons(Study $study): string if (! $hasReports) { // fresh untouched study, go directly to the edit page return $this->renderImageLink( - $study->hash, $img, '', 'Report', route('staff.report.create', $study->hash), true + $study->hash, $img, '', 'Write Report', route('staff.report.create', $study->hash), true ); } } @@ -576,13 +580,13 @@ private function generateViewerButtons(Study $study): string { $btns = []; $btns[] = $this->renderImageLink( - $study->hash, 'eye.png', '', 'OHIF Viewer', route('viewer.ohif', $study->hash), true + $study->hash, 'eye.png', '', 'Cornerstone Viewer', route('viewer.ohif', $study->hash), true ); $btns[] = $this->renderImageLink( - $study->hash, 'weasis.png', '', 'WEASIS Viewer', $study->links()['weasis'], false + $study->hash, 'live.png', '', 'Simple Viewer', route('viewer.stone', $study->hash), true ); $btns[] = $this->renderImageLink( - $study->hash, 'live.png', '', 'STONE Viewer', route('viewer.stone', $study->hash), true + $study->hash, 'weasis.png', '', 'Open Study in Weasis', $study->links()['weasis'], false ); return implode("\r", $btns); diff --git a/resources/views/staff/audit/popup.blade.php b/resources/views/staff/audit/popup.blade.php index 47d10a0..5fbc16e 100644 --- a/resources/views/staff/audit/popup.blade.php +++ b/resources/views/staff/audit/popup.blade.php @@ -5,10 +5,10 @@ - - - - + + + + @@ -17,7 +17,11 @@ - +
TimeUserActivityRemarksTimeUserActivityRemarks  
{{ $log->log_time }} {{ $log->user_name }} {{ $log->activity_name }}{{ $log->notes }} + $log->notes])> + {{ \Illuminate\Support\Str::limit($log->notes, 20) }} + + @isset($log->ip_addr) {{ $log->ip_addr }}