diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 4e3bb11..9cb559c 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -49,6 +49,7 @@ public function dataTable(QueryBuilder $query): EloquentDataTable $data_table->addColumn($column, $content); $rawColumns[] = $column; } + $data_table ->orderColumn(WorklistColumn::PatientName->value, sprintf('%s $1', WorklistColumn::PatientName->value)) ->rawColumns($rawColumns) @@ -155,7 +156,7 @@ public function getColumns(): array break; case WorklistColumn::ActionButtons: case WorklistColumn::ViewerButtons: - case WorklistColumn::ReportingButtons: + case WorklistColumn::ReportButtons: $columns[] = Column::computed($col->value) ->searchable(false) ->orderable(false) @@ -256,7 +257,7 @@ private function renderCustomColumns(): array case WorklistColumn::ViewerButtons: $columns[$col->value] = fn (Study $study) => $this->generateViewerButtons($study); break; - case WorklistColumn::ReportingButtons: + case WorklistColumn::ReportButtons: $columns[$col->value] = fn (Study $study) => $this->generateReportingButtons($study); break; } @@ -267,7 +268,7 @@ private function renderCustomColumns(): array private function generateReportingButtons(Study $study): string { - return $this->renderButton($study->hash, 'fa-circle-info', 'show-reports btn-outline', 'Rep'); + return $this->renderButton($study->hash, 'fa-eye', 'show-reports btn-outline', 'R'); } private function renderButton(string $data_id, string $fa_icon, string $data_class, string $text, string $url = '#', bool $blank = false): string @@ -319,7 +320,7 @@ private function generateActionButtons(Study $study): string $btns[] = $this->renderButton($study->hash, 'fa-user-doctor', 'btn-outline-youtube show-assign', 'Assign'); break; case WorklistButton::Attachment: - $btns[] = $this->renderButton($study->hash, 'fa-trash', 'btn-danger archive-study', 'Archive'); + // $btns[] = $this->renderButton($study->hash, 'fa-trash', 'btn-danger archive-study', 'Archive'); break; } } diff --git a/app/Services/ACL/WorklistColumn.php b/app/Services/ACL/WorklistColumn.php index d6ebd57..6e80a37 100644 --- a/app/Services/ACL/WorklistColumn.php +++ b/app/Services/ACL/WorklistColumn.php @@ -31,7 +31,7 @@ enum WorklistColumn: string case Series = 'series'; case CreatedAt = 'created_at'; case UpdatedAt = 'updated_at'; - case ActionButtons = 'action'; - case ViewerButtons = 'viewers'; - case ReportingButtons = 'reporting'; + case ActionButtons = 'action_buttons'; + case ViewerButtons = 'viewer_buttons'; + case ReportButtons = 'report_buttons'; } diff --git a/app/Services/ACL/WorklistGuard.php b/app/Services/ACL/WorklistGuard.php index f9f3063..efcb9b9 100644 --- a/app/Services/ACL/WorklistGuard.php +++ b/app/Services/ACL/WorklistGuard.php @@ -26,8 +26,8 @@ public static function worklistColumns(?int $user_id = null): Collection WorklistColumn::Series, WorklistColumn::ReceiveDate, WorklistColumn::ActionButtons, + WorklistColumn::ReportButtons, WorklistColumn::ViewerButtons, - WorklistColumn::ReportingButtons, ]); return $columns;