From 56c6012112611987bbe3d3360854328ac884f7c1 Mon Sep 17 00:00:00 2001 From: Masroor Ehsan Date: Wed, 8 Jan 2025 21:10:56 +0600 Subject: [PATCH] wip --- app/DataTables/WorklistDataTable.php | 2 +- .../views/staff/worklist/index.blade.php | 24 +++++++++++++++++++ routes/web.php | 3 ++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 90ac5f9..4e3bb11 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -267,7 +267,7 @@ private function renderCustomColumns(): array private function generateReportingButtons(Study $study): string { - return 'x'; + return $this->renderButton($study->hash, 'fa-circle-info', 'show-reports btn-outline', 'Rep'); } private function renderButton(string $data_id, string $fa_icon, string $data_class, string $text, string $url = '#', bool $blank = false): string diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index 93203e9..de63bff 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -65,6 +65,15 @@ }); }); + + $('body').on('click', '.show-reports', function () { + var study_id = $(this).data('id'); + $.get("{{ route('staff.report.popup') }}", {hashid: study_id}, function (data) { + $('#report-details').html(data); + $('#report-modal').modal('show'); + }); + }); + }); @@ -120,4 +129,19 @@ + + + @endsection diff --git a/routes/web.php b/routes/web.php index 036d55a..ef82d42 100644 --- a/routes/web.php +++ b/routes/web.php @@ -84,8 +84,9 @@ }); Route::group(['prefix' => 'report', 'as' => 'report.'], function () { + Route::get('popup', [ReportController::class, 'popup'])->name('popup'); Route::get('view/{uuid}', [ReportController::class, 'view'])->name('view'); - Route::get('download/{uuid}', [ReportController::class, 'view'])->name('download'); + Route::get('download/{uuid}', [ReportController::class, 'download'])->name('download'); }); });