misc
This commit is contained in:
parent
e4be14be81
commit
706c7b1f75
@ -22,7 +22,8 @@
|
|||||||
|
|
||||||
class WorklistDataTable extends DataTable
|
class WorklistDataTable extends DataTable
|
||||||
{
|
{
|
||||||
const DATE_FORMAT = 'd.m.Y H:i';
|
const DATE_FORMAT_SHORT = 'd.m.Y H:i';
|
||||||
|
const DATE_FORMAT_LONG = 'd/m/Y h:i A';
|
||||||
|
|
||||||
private static function renderDateColumn(Carbon|CarbonImmutable|null $dt): ?string
|
private static function renderDateColumn(Carbon|CarbonImmutable|null $dt): ?string
|
||||||
{
|
{
|
||||||
@ -33,7 +34,7 @@ private static function renderDateColumn(Carbon|CarbonImmutable|null $dt): ?stri
|
|||||||
return Blade::render(
|
return Blade::render(
|
||||||
'staff.worklist.partials._multi-value-cell',
|
'staff.worklist.partials._multi-value-cell',
|
||||||
[
|
[
|
||||||
'title' => $dt->format(self::DATE_FORMAT),
|
'title' => $dt->format(self::DATE_FORMAT_SHORT),
|
||||||
'subtitle' => $dt->diffForHumans(),
|
'subtitle' => $dt->diffForHumans(),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
@ -210,7 +211,7 @@ private function physicianColumn(?User $user, Carbon|CarbonImmutable|null $dt):
|
|||||||
[
|
[
|
||||||
'avatar_url' => $user->avatar(),
|
'avatar_url' => $user->avatar(),
|
||||||
'name' => $user->display_name,
|
'name' => $user->display_name,
|
||||||
'time' => $dt?->format(self::DATE_FORMAT) ?? '~',
|
'time' => $dt?->format(self::DATE_FORMAT_SHORT) ?? '~',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -231,7 +232,7 @@ private function renderCustomColumns(): array
|
|||||||
$columns[$col->value] = fn (Study $study) => $study->sanitizedStudyDescription();
|
$columns[$col->value] = fn (Study $study) => $study->sanitizedStudyDescription();
|
||||||
break;
|
break;
|
||||||
case WorklistColumn::AssignedPhysician:
|
case WorklistColumn::AssignedPhysician:
|
||||||
$columns[$col->value] = fn (Study $study) => $study->assigned_at?->format(self::DATE_FORMAT);
|
$columns[$col->value] = fn (Study $study) => $study->assigned_at?->format(self::DATE_FORMAT_SHORT);
|
||||||
break;
|
break;
|
||||||
case WorklistColumn::ReadingPhysician:
|
case WorklistColumn::ReadingPhysician:
|
||||||
$columns[$col->value] = fn (Study $study) => $this->physicianColumn($study->readingPhysician, $study->read_at);
|
$columns[$col->value] = fn (Study $study) => $this->physicianColumn($study->readingPhysician, $study->read_at);
|
||||||
@ -255,9 +256,9 @@ private function renderCustomColumns(): array
|
|||||||
break;
|
break;
|
||||||
case WorklistColumn::History:
|
case WorklistColumn::History:
|
||||||
$columns[$col->value] = fn (Study $study) => sprintf('
|
$columns[$col->value] = fn (Study $study) => sprintf('
|
||||||
<a href="#" data-id="%s" class="btn btn-sm btn-outline-light show-attach" data-bs-toggle="tooltip" data-bs-placement="right" title="Tooltip on right">
|
<a href="#" data-id="%s" class="btn btn-sm btn-outline-light show-attach" data-bs-toggle="tooltip" data-bs-placement="right" title="xxx">
|
||||||
<i class="fa-light fa-file-prescription %s"></i>
|
<i class="fa-light fa-file-prescription %s"></i>
|
||||||
</a>
|
</a>
|
||||||
',
|
',
|
||||||
$study->hash,
|
$study->hash,
|
||||||
($study->body_part_examined) ? 'text-muted' : 'text-primary');
|
($study->body_part_examined) ? 'text-muted' : 'text-primary');
|
||||||
|
Loading…
Reference in New Issue
Block a user