diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index a8f3a70..5f5f77a 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -49,9 +49,9 @@ public function dataTable(QueryBuilder $query): EloquentDataTable return self::dtFormat($study->received_at); }) ->editColumn('show_study', function (Study $study) { - $btn = 'Show'; - $btn .= ' Edit'; - $btn .= ' Delete'; + $btn = 'Show'; + $btn .= ' Edit'; + $btn .= ' Delete'; return $btn; }) diff --git a/app/Http/Controllers/Staff/StudiesController.php b/app/Http/Controllers/Staff/StudiesController.php index 7ba121e..0fbfc7c 100644 --- a/app/Http/Controllers/Staff/StudiesController.php +++ b/app/Http/Controllers/Staff/StudiesController.php @@ -21,9 +21,10 @@ public function details() return response()->json($study); } - public function show(Request $request) + public function show() { - $study = Study::with(['details'])->findOrFail($request->id); + $this->decodeKeys(); + $study = Study::with(['details'])->findOrFail($this->key); return view('staff.studies.show-details', compact('study')); } diff --git a/pint.json b/pint.json new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/staff/worklist/table.blade.php b/resources/views/staff/worklist/table.blade.php index 4eabd4e..7bc493b 100644 --- a/resources/views/staff/worklist/table.blade.php +++ b/resources/views/staff/worklist/table.blade.php @@ -27,6 +27,9 @@ @endsection @section('vendor-script') + + @vite([ 'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js', ]) @@ -34,51 +37,19 @@ @section('page-script') {{ $dataTable->scripts(attributes: ['type' => 'module']) }} - + @endsection @section('content') @@ -116,14 +87,16 @@