From 3161b143bb1502935c9afa6ea620d9fe0de17b6d Mon Sep 17 00:00:00 2001 From: Masroor Ehsan Date: Mon, 6 Jan 2025 19:24:28 +0600 Subject: [PATCH] wip - assign --- app/DataTables/WorklistDataTable.php | 1 + .../Controllers/Staff/StudiesController.php | 10 ++++++++ .../staff/history/partials/_history.blade.php | 6 ++--- .../views/staff/studies/assign-form.blade.php | 8 +++++++ .../views/staff/worklist/index.blade.php | 24 +++++++++++++++++++ 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 resources/views/staff/studies/assign-form.blade.php diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 2f09c24..bfeda79 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -51,6 +51,7 @@ public function dataTable(QueryBuilder $query): EloquentDataTable ->editColumn('show_study', function (Study $study) { $btn = 'Show'; $btn .= 'Edit'; + $btn .= ' Assign'; $btn .= ' Delete'; return $btn; diff --git a/app/Http/Controllers/Staff/StudiesController.php b/app/Http/Controllers/Staff/StudiesController.php index 28c30b5..2e33388 100644 --- a/app/Http/Controllers/Staff/StudiesController.php +++ b/app/Http/Controllers/Staff/StudiesController.php @@ -4,6 +4,7 @@ use App\Http\Controllers\HashidControllerBase; use App\Models\Enums\Permission; +use App\Models\Enums\UserRole; use App\Models\Study; use App\Services\AuditTrail\Activity; @@ -63,4 +64,13 @@ public function attachments() return view('staff.history.partials._uploaded-studies-list', compact('study', 'allow_delete')); } + + public function assignmentShow() + { + $this->decodeKeys(); + $study = Study::findOrFail($this->key); + $rads = User::active()->role(UserRole::Radiologist)->get(); + + return view('staff.studies.assign-form', compact('study', 'rads')); + } } diff --git a/resources/views/staff/history/partials/_history.blade.php b/resources/views/staff/history/partials/_history.blade.php index 1f3fc96..a048f72 100644 --- a/resources/views/staff/history/partials/_history.blade.php +++ b/resources/views/staff/history/partials/_history.blade.php @@ -5,7 +5,7 @@ -@if(!blank($details->surgical_history)) +@if (!blank($details->surgical_history))
Surgical History
@@ -14,7 +14,7 @@
@endif -@if(!blank($details->lab_results)) +@if (!blank($details->lab_results))
Lab Results
@@ -23,7 +23,7 @@
@endif -@if(!blank($details->clinical_diagnosis)) +@if (!blank($details->clinical_diagnosis))
Clinical Diagnosis
diff --git a/resources/views/staff/studies/assign-form.blade.php b/resources/views/staff/studies/assign-form.blade.php new file mode 100644 index 0000000..e7781d2 --- /dev/null +++ b/resources/views/staff/studies/assign-form.blade.php @@ -0,0 +1,8 @@ + + @foreach ($rads as $doc) + + + + + @endforeach +
{{ $doc->display_name }}X
diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index c595e36..292af5e 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -55,6 +55,16 @@ $('#study-modal').modal('show'); }); }); + + + $('body').on('click', '.show-assign', function () { + var study_id = $(this).data('id'); + $.get("{{ route('staff.studies.assign-show') }}", {hashid: study_id}, function (data) { + $('#assign-details').html(data); + $('#assign-modal').modal('show'); + }); + }); + }); @@ -96,4 +106,18 @@
+ + @endsection