diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 33dd368..659bd5e 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -5,6 +5,7 @@ use App\DAL\Studies\WorklistFactory; use App\Models\Study; use Carbon\Carbon; +use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Builder as QueryBuilder; use Illuminate\Support\Str; use Yajra\DataTables\EloquentDataTable; @@ -22,7 +23,12 @@ class WorklistDataTable extends DataTable * @param QueryBuilder $query Results from query() method. */ // const DATE_FORMAT = 'DD.MM.YYYY HH:mm'; - const DATE_FORMAT = 'MMM DD, YYYY HH:mm'; + const DATE_FORMAT = 'DD.MM.YYYY HH:mm'; + + private static function dtFormat(Carbon|CarbonImmutable|null $dt): string + { + return $dt == null ? '' : $dt->isoFormat(self::DATE_FORMAT); + } public function dataTable(QueryBuilder $query): EloquentDataTable { @@ -33,19 +39,19 @@ public function dataTable(QueryBuilder $query): EloquentDataTable return ''; } - return ''.$study->readingPhysician->display_name; + return ''.$study->readingPhysician->display_name; }) ->editColumn('images', function (Study $study) { - return $study->numInstances().'
'.human_filesize($study->disk_size).''; + return $study->numInstances().''.human_filesize($study->disk_size).''; }) ->editColumn('study_date', function ($data) { - return Carbon::parse($data->study_date)->isoFormat(self::DATE_FORMAT); + return self::dtFormat($data->study_date); }) ->editColumn('reported_at', function ($data) { - return Carbon::parse($data->reported_at)->isoFormat(self::DATE_FORMAT); + return self::dtFormat($data->reported_at); }) ->editColumn('received_at', function ($data) { - return Carbon::parse($data->received_at)->isoFormat(self::DATE_FORMAT); + return self::dtFormat($data->received_at); }) ->orderColumn('patient_name', 'patient_name $1') ->rawColumns(['priority_icon', 'report_status_led', 'images', 'reader']) @@ -119,9 +125,9 @@ public function getColumns(): array ->width('20px') ->title(''), - Column::make('modality'), - Column::make('patient_id'), - Column::make('patient_name'), + Column::make('modality')->title('Mo'), + Column::make('patient_id')->title('MRN'), + Column::make('patient_name')->title('Patient'), Column::make('sex_age') ->searchable(false) ->orderable(false) @@ -132,9 +138,10 @@ public function getColumns(): array Column::make('received_at')->searchable(false)->title('Received'), Column::make('reported_at')->searchable(false)->title('Reported'), - Column::make('study_description'), + Column::make('study_description') + ->title('Study'), Column::make('reader') - ->title('Reader'), + ->title('Read by'), // Column::make('body_part_examined'), Column::make('images') ->searchable(false)