minor UI changes
This commit is contained in:
parent
f9a576c0ef
commit
858c001d81
@ -504,7 +504,11 @@ private function renderCustomColumns(): array
|
|||||||
private function generateReportingButtons(Study $study): string
|
private function generateReportingButtons(Study $study): string
|
||||||
{
|
{
|
||||||
$hasReports = $study->hasReports();
|
$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 (me()->isRadiologist()) {
|
||||||
if ($study->isLocked() && ! $study->isLockedBy()) {
|
if ($study->isLocked() && ! $study->isLockedBy()) {
|
||||||
@ -532,7 +536,7 @@ private function generateReportingButtons(Study $study): string
|
|||||||
if (! $hasReports) {
|
if (! $hasReports) {
|
||||||
// fresh untouched study, go directly to the edit page
|
// fresh untouched study, go directly to the edit page
|
||||||
return $this->renderImageLink(
|
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 = [];
|
||||||
$btns[] = $this->renderImageLink(
|
$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(
|
$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(
|
$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);
|
return implode("\r", $btns);
|
||||||
|
@ -5,10 +5,10 @@
|
|||||||
<table class="table table-sm table-striped">
|
<table class="table table-sm table-striped">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Time</th>
|
<th><i class="me-1 ri-time-line"></i>Time</th>
|
||||||
<th>User</th>
|
<th><i class="me-1 ri-contacts-line"></i>User</th>
|
||||||
<th>Activity</th>
|
<th><i class="me-1 ri-reactjs-line"></i>Activity</th>
|
||||||
<th>Remarks</th>
|
<th><i class="me-1 ri-sticky-note-line"></i>Remarks</th>
|
||||||
<th> </th>
|
<th> </th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@ -17,7 +17,11 @@
|
|||||||
<td>{{ $log->log_time }}</td>
|
<td>{{ $log->log_time }}</td>
|
||||||
<td>{{ $log->user_name }}</td>
|
<td>{{ $log->user_name }}</td>
|
||||||
<td>{{ $log->activity_name }}</td>
|
<td>{{ $log->activity_name }}</td>
|
||||||
<td>{{ $log->notes }}</td>
|
<td>
|
||||||
|
<span @include('_partials._tooltip', ['tip' => $log->notes])>
|
||||||
|
{{ \Illuminate\Support\Str::limit($log->notes, 20) }}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
@isset($log->ip_addr)
|
@isset($log->ip_addr)
|
||||||
<a target="_blank" href="{{ 'https://ipinfo.io/'.$log->ip_addr }}">{{ $log->ip_addr }}</a>
|
<a target="_blank" href="{{ 'https://ipinfo.io/'.$log->ip_addr }}">{{ $log->ip_addr }}</a>
|
||||||
|
Loading…
Reference in New Issue
Block a user