So so improvement to list filter widget

tastyigniter · May 17, 2020 · 30b3d11 · 30b3d11
1 parent da111eb
commit 30b3d11
Show file tree

Hide file tree

Showing 33 changed files with 35 additions and 15,404 deletions.
diff --git a/app/system/assets/package.json → app/admin/assets/package.json b/app/system/assets/package.json → app/admin/assets/package.json
diff --git a/...ets/ui/scss/components/_button-group.scss → ...assets/scss/components/_button-group.scss b/...ets/ui/scss/components/_button-group.scss → ...assets/scss/components/_button-group.scss
diff --git a/app/system/assets/webpack.mix.js → app/admin/assets/webpack.mix.js b/app/system/assets/webpack.mix.js → app/admin/assets/webpack.mix.js
diff --git a/app/admin/models/config/categories_model.php b/app/admin/models/config/categories_model.php
@@ -33,12 +33,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/coupons_model.php b/app/admin/models/config/coupons_model.php
@@ -46,12 +46,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/customers_model.php b/app/admin/models/config/customers_model.php
@@ -35,12 +35,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
         'groups' => [
             'label' => 'lang:admin::lang.side_menu.customer_group',
             'class' => 'btn btn-default',

diff --git a/app/admin/models/config/locations_model.php b/app/admin/models/config/locations_model.php
@@ -30,12 +30,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/mealtimes_model.php b/app/admin/models/config/mealtimes_model.php
@@ -25,12 +25,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/menus_model.php b/app/admin/models/config/menus_model.php
@@ -44,12 +44,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/orders_model.php b/app/admin/models/config/orders_model.php
@@ -74,12 +74,6 @@
             'href' => 'orders/assigned',
             'context' => 'index',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/payments_model.php b/app/admin/models/config/payments_model.php
@@ -29,12 +29,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/reservations_model.php b/app/admin/models/config/reservations_model.php
@@ -69,12 +69,6 @@
             'href' => 'reservations/assigned',
             'context' => 'index',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/reviews_model.php b/app/admin/models/config/reviews_model.php
@@ -48,12 +48,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/staffs_model.php b/app/admin/models/config/staffs_model.php
@@ -41,12 +41,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
         'groups' => [
             'label' => 'lang:admin::lang.side_menu.staff_group',
             'class' => 'btn btn-default',

diff --git a/app/admin/models/config/statuses_model.php b/app/admin/models/config/statuses_model.php
@@ -29,12 +29,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/models/config/tables_model.php b/app/admin/models/config/tables_model.php
@@ -29,12 +29,6 @@
             'data-request-data' => "_method:'DELETE'",
             'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
         ],
-        'filter' => [
-            'label' => 'lang:admin::lang.button_icon_filter',
-            'class' => 'btn btn-default btn-filter',
-            'data-toggle' => 'list-filter',
-            'data-target' => '.list-filter',
-        ],
     ],
 ];
 

diff --git a/app/admin/widgets/Lists.php b/app/admin/widgets/Lists.php
@@ -182,6 +182,7 @@ public function prepareVars()
         $this->vars['showCheckboxes'] = $this->showCheckboxes;
         $this->vars['showDragHandle'] = $this->showDragHandle;
         $this->vars['showSetup'] = $this->showSetup;
+        $this->vars['showFilter'] = count($this->filterCallbacks);
         $this->vars['showPagination'] = $this->showPagination;
         $this->vars['showSorting'] = $this->showSorting;
         $this->vars['sortColumn'] = $this->getSortColumn();

diff --git a/app/admin/widgets/filter/filter.php b/app/admin/widgets/filter/filter.php
@@ -13,27 +13,26 @@ class="form-inline"
             action="<?= current_url(); ?>"
             role="form"
         >
+            <?= csrf_field(); ?>
             <input type="hidden" name="_handler" value="<?= $onSubmitHandler; ?>">
 
             <?= $this->makePartial('filter/filter_scopes') ?>
         </form>
     <?php } ?>
 
     <?php if ($search) { ?>
-    <div class="d-flex mt-3">
-        <div class="mr-3">
-            <button
-                class="btn btn-outline-danger"
-                type="button"
-                data-request="<?= $onClearHandler; ?>"
-                data-attach-loading
-            >
-                <i class="fa fa-times"></i>&nbsp;&nbsp;<?= lang('admin::lang.text_clear'); ?>
-            </button>
+        <div class="d-flex mt-3">
+            <div class="mr-3">
+                <button
+                    class="btn btn-outline-danger"
+                    type="button"
+                    data-request="<?= $onClearHandler; ?>"
+                    data-attach-loading
+                ><i class="fa fa-times"></i>&nbsp;&nbsp;<?= lang('admin::lang.text_clear'); ?></button>
+            </div>
+            <div class="flex-fill">
+                <div class="filter-search"><?= $search ?></div>
+            </div>
         </div>
-        <div class="flex-fill">
-            <div class="filter-search"><?= $search ?></div>
-        </div>
-        <?php } ?>
-    </div>
+    <?php } ?>
 </div>
diff --git a/app/admin/widgets/lists/list_body.php b/app/admin/widgets/lists/list_body.php
@@ -40,8 +40,12 @@ class="list-col-index-<?= $index ?> list-col-name-<?= $column->getName() ?> list
             </td>
         <?php } ?>
 
+        <?php if ($showFilter) { ?>
+            <td class="list-setup px-1">&nbsp;</td>
+        <?php } ?>
+
         <?php if ($showSetup) { ?>
-            <td class="list-setup">&nbsp;</td>
+            <td class="list-setup px-1">&nbsp;</td>
         <?php } ?>
     </tr>
 <?php } ?>
diff --git a/app/admin/widgets/lists/list_head.php b/app/admin/widgets/lists/list_head.php
@@ -46,18 +46,27 @@ class="list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type
         <?php } ?>
     <?php } ?>
 
+    <?php if ($showFilter) { ?>
+        <th class="list-setup px-1">
+            <button
+                type="button"
+                class="btn btn-outline-default btn-sm border-none"
+                title="<?= lang('admin::lang.button_filter') ?>"
+                data-toggle="list-filter"
+                data-target=".list-filter"
+            ><i class="fa fa-filter"></i></button>
+        </th>
+    <?php } ?>
     <?php if ($showSetup) { ?>
-        <th class="list-setup">
+        <th class="list-setup px-1">
             <button
                 type="button"
                 class="btn btn-outline-default btn-sm border-none"
                 title="<?= lang('admin::lang.list.text_setup') ?>"
                 data-toggle="modal"
                 data-target="#<?= $listId ?>-setup-modal"
                 data-request="<?= $this->getEventHandler('onLoadSetup'); ?>"
-            >
-                <i class="fa fa-sliders"></i>
-            </button>
+            ><i class="fa fa-sliders"></i></button>
         </th>
     <?php } ?>
 </tr>