From ca4b5107430c626bf45955a4ddeba8649c48cf37 Mon Sep 17 00:00:00 2001 From: Masroor Ehsan Date: Mon, 6 Jan 2025 18:31:24 +0600 Subject: [PATCH] migrated to index view --- .../Controllers/Staff/WorklistController.php | 2 +- .../views/staff/worklist/index.blade.php | 130 ++++++++---------- .../views/staff/worklist/table.blade.php | 75 ---------- 3 files changed, 56 insertions(+), 151 deletions(-) delete mode 100644 resources/views/staff/worklist/table.blade.php diff --git a/app/Http/Controllers/Staff/WorklistController.php b/app/Http/Controllers/Staff/WorklistController.php index 2000f13..a1a0624 100644 --- a/app/Http/Controllers/Staff/WorklistController.php +++ b/app/Http/Controllers/Staff/WorklistController.php @@ -9,6 +9,6 @@ class WorklistController extends HashidControllerBase { public function index(WorklistDataTable $dataTable) { - return $dataTable->render('staff.worklist.table'); + return $dataTable->render('staff.worklist.index'); } } diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index 61f8363..d8960fa 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -1,95 +1,75 @@ +@php + $configData = App\Services\ThemeHelper::appClasses(); + $container = 'container-fluid'; + $containerNav = 'container-fluid'; + /* + $isNavbar = false; + $navbarType = 'layout-navbar-hidden'; + $isMenu = false; + $navbarHideToggle = false; + */ +@endphp + @extends('layouts.layoutMaster') @section('title', 'Worklist') @section('vendor-style') @vite([ - 'resources/assets/vendor/libs/datatables-bs5/datatables.bootstrap5.scss', - 'resources/assets/vendor/libs/datatables-responsive-bs5/responsive.bootstrap5.scss', - 'resources/assets/vendor/libs/datatables-checkboxes-jquery/datatables.checkboxes.scss', - 'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss' + 'resources/fontawesome/scss/fontawesome.scss', + 'resources/fontawesome/scss/solid.scss', + 'resources/fontawesome/scss/light.scss', + 'resources/assets/vendor/libs/datatables-bs5/datatables.bootstrap5.scss', + 'resources/assets/vendor/libs/datatables-responsive-bs5/responsive.bootstrap5.scss', + 'resources/assets/vendor/libs/datatables-checkboxes-jquery/datatables.checkboxes.scss', + 'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss' ]) @endsection @section('vendor-script') + + @vite([ - 'resources/assets/vendor/libs/moment/moment.js', - 'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js' + 'resources/assets/vendor/libs/jquery/jquery.js', + 'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js', ]) @endsection +@section('page-script') + {{ $dataTable->scripts(attributes: ['type' => 'module']) }} + + + +@endsection + @section('content') + @include('staff.worklist.partials._stats') +
+ {{ $dataTable->table(['class' => 'table table-sm'], true) }} +
- -
-
- - - - - - - - - - - - - - - - - @foreach ($studies as $study) - - - - - - - - - - - - - @endforeach - -
Accession NumberPatient IDPatient NamePatient SexModalityStudy DateReceive DateSeriesInstitute Name 
{{ $study->accession_number }} - - {{ $study->patient_id }} - - - - {{ $study->patient_name }} - - {{ $study->sexAge() }}{{ $study->study_modality }}{{ $study->study_date }}{{ $study->received_at }}{{ $study->numInstances() }}{{ $study->institution_name }} - @if ($study->allowed()['stone']) - St | - @endif - @if ($study->allowed()['ohif']) - Oh | - @endif - @if ($study->allowed()['ohif.mpr']) - OM | - @endif - @if ($study->allowed()['ohif.seg']) - OS | - @endif - @if ($study->allowed()['zip']) - Z | - @endif - - Reported - - @can(\App\Models\Enums\Permission::ReportCreate) - TXT - @endcan -
-
- {!! $studies->links() !!} + + @endsection diff --git a/resources/views/staff/worklist/table.blade.php b/resources/views/staff/worklist/table.blade.php deleted file mode 100644 index d8960fa..0000000 --- a/resources/views/staff/worklist/table.blade.php +++ /dev/null @@ -1,75 +0,0 @@ -@php - $configData = App\Services\ThemeHelper::appClasses(); - $container = 'container-fluid'; - $containerNav = 'container-fluid'; - /* - $isNavbar = false; - $navbarType = 'layout-navbar-hidden'; - $isMenu = false; - $navbarHideToggle = false; - */ -@endphp - -@extends('layouts.layoutMaster') - -@section('title', 'Worklist') - -@section('vendor-style') - @vite([ - 'resources/fontawesome/scss/fontawesome.scss', - 'resources/fontawesome/scss/solid.scss', - 'resources/fontawesome/scss/light.scss', - 'resources/assets/vendor/libs/datatables-bs5/datatables.bootstrap5.scss', - 'resources/assets/vendor/libs/datatables-responsive-bs5/responsive.bootstrap5.scss', - 'resources/assets/vendor/libs/datatables-checkboxes-jquery/datatables.checkboxes.scss', - 'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss' - ]) -@endsection - -@section('vendor-script') - - - @vite([ - 'resources/assets/vendor/libs/jquery/jquery.js', - 'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js', - ]) -@endsection - -@section('page-script') - {{ $dataTable->scripts(attributes: ['type' => 'module']) }} - - - -@endsection - -@section('content') - @include('staff.worklist.partials._stats') -
- {{ $dataTable->table(['class' => 'table table-sm'], true) }} -
- - - -@endsection