fixed page numbering when records are less than page size

mkocansey · Dec 13, 2024 · 7402941 · 7402941
1 parent dba9972
commit 7402941
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php
@@ -24,7 +24,9 @@
     $next_button_status_css = ($default_page == $total_pages) ? $inactive_css : $default_button_css;
     $prev_button_status_css = ($default_page == 1) ? $inactive_css : $default_button_css;
     $to = $page_size*$default_page;
+    $to = ($to > $total_records) ? $total_records : $to;
     $from = $to - ($page_size-1);
+    $from = ($to == $total_records) ? 1 : $from;
     $prev_page = $default_page-1;
     $next_page = $default_page+1;
     $prev_page = ($prev_page <= 0) ? 0 : $default_page-1;

diff --git a/resources/views/components/rating.blade.php b/resources/views/components/rating.blade.php
@@ -1,5 +1,5 @@
 @props([
-    'name' => 'rating',
+    'name' => defaultBladewindName(),
     'rating' => 0,
     'size' => config('bladewind.rating.size', 'small'),
     'color' => 'orange',
@@ -13,7 +13,7 @@
     ],
 ])
 @php
-    $name = str_replace(' ', '-', $name); 
+    $name = str_replace(' ', '-', $name);
     $size_adjustment = ($size == 'big') ? 2 : 1;
     $clickable = parseBladewindVariable($clickable);
 @endphp

diff --git a/resources/views/components/table-icons.blade.php b/resources/views/components/table-icons.blade.php
@@ -9,7 +9,6 @@
                                 size="tiny"
                                 icon="{{ $icon['icon'] }}"
                                 color="{{ $icon['color'] ?? '' }}"
-                                {{--title="{{$icon['tip']??''}}"--}}
                                 onclick="{!! build_click($icon['click'], $row) ?? 'void(0)' !!}"
                                 type="{!! isset($icon['color']) ? 'primary' : 'secondary' !!}"/>
                         @if(!empty($icon['tip'])) </a>

diff --git a/resources/views/components/table.blade.php b/resources/views/components/table.blade.php
@@ -167,7 +167,7 @@ function pagination_row($row_number, $page_size=25, $default_page=1): string
 <div class="@if($has_border && !$celled) border border-gray-200/70 dark:border-dark-700/60 @endif border-collapse max-w-full">
     <div class="w-full">
         @if($searchable)
-            <div class="bw-table-filter-bar">
+            <div class="bw-table-filter-bar @if($has_shadow) drop-shadow shadow shadow-gray-200/70 dark:shadow-md dark:shadow-dark-950/20 @endif">
                 <x-bladewind::input
                         name="bw-search-{{$name}}"
                         placeholder="{{$search_placeholder}}"