Преглед на файлове

NRC - paginator route fix

Vijayakrishnan преди 3 години
родител
ревизия
a9df713bf2

+ 1 - 1
app/Http/Controllers/PracticeManagementController.php

@@ -3700,7 +3700,7 @@ ORDER BY c.name_last, c.name_first
         $rows = DB::select($dataQuery);
 
         $paginator = new LengthAwarePaginator($rows, $total, $request->input('per_page') ?: $defaultPageSize, $request->input('page') ?: 1);
-        $paginator->setPath(route('practice-management.notes-resolution-center'));
+        $paginator->setPath(route('practice-management.notes-resolution-center-v2'));
 
         return view('app.practice-management.notes-resolution-center-v2', compact('rows', 'paginator'));
     }

+ 5 - 4
resources/views/app/practice-management/notes-resolution-center-v2.blade.php

@@ -99,16 +99,17 @@
     <script>
         (function() {
             function init() {
+                @php $nrcPage = request()->input('page') ?: 1; @endphp
                 let parent = $('#notes-resolution-center');
                 parent.find('.row-scroller')
                     .off('scroll')
                     .on('scroll', function() {
-                        localStorage.nrcv2RowScrollTop = $(this).scrollTop();
+                        localStorage.nrcv2RowScrollTop_{{$nrcPage}} = $(this).scrollTop();
                     });
                 @if(request('uid'))
                 window.setTimeout(() => {
-                    if(localStorage.nrcv2RowScrollTop) {
-                        parent.find('.row-scroller').scrollTop(+localStorage.nrcv2RowScrollTop);
+                    if(localStorage.nrcv2RowScrollTop_{{$nrcPage}}) {
+                        parent.find('.row-scroller').scrollTop(+localStorage.nrcv2RowScrollTop_{{$nrcPage}});
                     }
                     else {
                         let selectedTr = parent.find('tr[data-uid="{{request('uid')}}"]').first();
@@ -119,7 +120,7 @@
                     parent.removeAttr('v-cloak');
                 }, 0);
                 @else
-                localStorage.nrcv2RowScrollTop = '';
+                localStorage.nrcv2RowScrollTop_{{$nrcPage}} = '';
                 parent.find('tr[data-uid]').first().find('.select-row').trigger('click');
                 @endif
                 parent.removeAttr('v-cloak');