From 706c7b1f7522eb7588245f525fb4f19524c73b24 Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Wed, 15 Jan 2025 21:57:22 +0600 Subject: [PATCH] misc --- app/DataTables/WorklistDataTable.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index d6a8ed1..e95c6e7 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -22,7 +22,8 @@ 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 { @@ -33,7 +34,7 @@ private static function renderDateColumn(Carbon|CarbonImmutable|null $dt): ?stri return Blade::render( 'staff.worklist.partials._multi-value-cell', [ - 'title' => $dt->format(self::DATE_FORMAT), + 'title' => $dt->format(self::DATE_FORMAT_SHORT), 'subtitle' => $dt->diffForHumans(), ] ); @@ -210,7 +211,7 @@ private function physicianColumn(?User $user, Carbon|CarbonImmutable|null $dt): [ 'avatar_url' => $user->avatar(), '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(); break; 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; case WorklistColumn::ReadingPhysician: $columns[$col->value] = fn (Study $study) => $this->physicianColumn($study->readingPhysician, $study->read_at); @@ -255,9 +256,9 @@ private function renderCustomColumns(): array break; case WorklistColumn::History: $columns[$col->value] = fn (Study $study) => sprintf(' - + - + ', $study->hash, ($study->body_part_examined) ? 'text-muted' : 'text-primary');