From e4be14be8136bbed328b8a2e4993da22f8e3c5d6 Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Wed, 15 Jan 2025 21:15:36 +0600 Subject: [PATCH] wip --- app/DataTables/WorklistDataTable.php | 2 +- resources/assets/js/forms-pickers.js | 11 +++++++++++ resources/assets/js/ui-popover.js | 8 ++++++++ resources/views/_partials/_tooltip.blade.php | 1 + resources/views/layouts/sections/scripts.blade.php | 8 -------- .../views/layouts/sections/scriptsFront.blade.php | 3 --- resources/views/layouts/sections/styles.blade.php | 4 +--- resources/views/staff/meta/edit.blade.php | 13 ++++++++++++- resources/views/staff/meta/partials/_date.blade.php | 2 +- resources/views/staff/worklist/index.blade.php | 5 +++++ 10 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 resources/assets/js/forms-pickers.js create mode 100644 resources/assets/js/ui-popover.js create mode 100644 resources/views/_partials/_tooltip.blade.php diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index d019a0d..d6a8ed1 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -255,7 +255,7 @@ private function renderCustomColumns(): array break; case WorklistColumn::History: $columns[$col->value] = fn (Study $study) => sprintf(' - + ', diff --git a/resources/assets/js/forms-pickers.js b/resources/assets/js/forms-pickers.js new file mode 100644 index 0000000..deb72da --- /dev/null +++ b/resources/assets/js/forms-pickers.js @@ -0,0 +1,11 @@ +'use strict'; + +(function () { + const flatpickrDate = document.querySelector('.flatpickr-date'); + + if (flatpickrDate) { + flatpickrDate.flatpickr({ + monthSelectorType: 'static' + }); + } +})(); diff --git a/resources/assets/js/ui-popover.js b/resources/assets/js/ui-popover.js new file mode 100644 index 0000000..63a65e6 --- /dev/null +++ b/resources/assets/js/ui-popover.js @@ -0,0 +1,8 @@ +'use strict'; + +(function () { + const popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')); + const popoverList = popoverTriggerList.map(function (popoverTriggerEl) { + return new bootstrap.Popover(popoverTriggerEl); + }); +})(); diff --git a/resources/views/_partials/_tooltip.blade.php b/resources/views/_partials/_tooltip.blade.php new file mode 100644 index 0000000..022e100 --- /dev/null +++ b/resources/views/_partials/_tooltip.blade.php @@ -0,0 +1 @@ +data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="{{ $tip }}" diff --git a/resources/views/layouts/sections/scripts.blade.php b/resources/views/layouts/sections/scripts.blade.php index 5165384..3572ce6 100644 --- a/resources/views/layouts/sections/scripts.blade.php +++ b/resources/views/layouts/sections/scripts.blade.php @@ -4,10 +4,6 @@ 'resources/assets/vendor/libs/jquery/jquery.js', 'resources/assets/vendor/libs/popper/popper.js', 'resources/assets/vendor/js/bootstrap.js', - 'resources/assets/vendor/libs/node-waves/node-waves.js', - 'resources/assets/vendor/libs/perfect-scrollbar/perfect-scrollbar.js', - 'resources/assets/vendor/libs/hammer/hammer.js', - 'resources/assets/vendor/libs/typeahead-js/typeahead.js', 'resources/assets/vendor/js/menu.js' ]) @@ -17,12 +13,8 @@ @vite(['resources/assets/js/main.js']) - -@stack('pricing-script') - @yield('page-script') @stack('modals') -@livewireScripts diff --git a/resources/views/layouts/sections/scriptsFront.blade.php b/resources/views/layouts/sections/scriptsFront.blade.php index 1629622..1b96c5e 100644 --- a/resources/views/layouts/sections/scriptsFront.blade.php +++ b/resources/views/layouts/sections/scriptsFront.blade.php @@ -13,9 +13,6 @@ @vite(['resources/assets/js/front-main.js']) - -@stack('pricing-script') - @yield('page-script') diff --git a/resources/views/layouts/sections/styles.blade.php b/resources/views/layouts/sections/styles.blade.php index a88d82c..7419bb2 100644 --- a/resources/views/layouts/sections/styles.blade.php +++ b/resources/views/layouts/sections/styles.blade.php @@ -17,12 +17,10 @@ @vite([ - 'resources/assets/vendor/libs/perfect-scrollbar/perfect-scrollbar.scss', - 'resources/assets/vendor/libs/typeahead-js/typeahead.scss' + 'resources/assets/vendor/libs/perfect-scrollbar/perfect-scrollbar.scss' ]) @yield('vendor-style') @yield('page-style') -@livewireStyles diff --git a/resources/views/staff/meta/edit.blade.php b/resources/views/staff/meta/edit.blade.php index 39aaf0d..5cc74d3 100644 --- a/resources/views/staff/meta/edit.blade.php +++ b/resources/views/staff/meta/edit.blade.php @@ -3,12 +3,22 @@ @section('title', 'Edit Study') @section('vendor-style') + @vite([ + 'resources/assets/vendor/libs/flatpickr/flatpickr.scss' + ]) @endsection @section('vendor-script') + @vite([ + 'resources/assets/vendor/libs/flatpickr/flatpickr.js' + ]) @endsection @section('page-script') + @vite([ + 'resources/assets/js/forms-pickers.js', + 'resources/assets/js/ui-popover.js' + ]) @endsection @section('content') @@ -62,7 +72,8 @@ + Save + diff --git a/resources/views/staff/meta/partials/_date.blade.php b/resources/views/staff/meta/partials/_date.blade.php index a4afe2e..cd34e5c 100644 --- a/resources/views/staff/meta/partials/_date.blade.php +++ b/resources/views/staff/meta/partials/_date.blade.php @@ -1,4 +1,4 @@
- +
diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index de63bff..c18d033 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -31,11 +31,16 @@ @vite([ 'resources/assets/vendor/libs/jquery/jquery.js', + 'resources/assets/vendor/libs/popper/popper.js', 'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js', ]) @endsection @section('page-script') + @vite([ + 'resources/assets/js/ui-popover.js' + ]) + {{ $dataTable->scripts(attributes: ['type' => 'module']) }}