diff --git a/addons/default/visiosoft/advs-module/resources/css/admin/filter-user.css b/addons/default/visiosoft/advs-module/resources/css/admin/filter-user.css new file mode 100644 index 000000000..93119c7b0 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/css/admin/filter-user.css @@ -0,0 +1,3 @@ +select[name=filter_user] + .select2 { + min-width: 20rem; +} diff --git a/addons/default/visiosoft/advs-module/resources/css/custom.css b/addons/default/visiosoft/advs-module/resources/css/custom.css index c00e602ef..ddf7bbb6a 100644 --- a/addons/default/visiosoft/advs-module/resources/css/custom.css +++ b/addons/default/visiosoft/advs-module/resources/css/custom.css @@ -41,11 +41,6 @@ .select2-container--default .select2-selection--single .select2-selection__arrow { top: unset; } - -select[name=filter_User] + .select2 { - min-width: 20rem; -} - .navbar-collapse { padding-left: 15px !important; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/js/admin/filter-user.js b/addons/default/visiosoft/advs-module/resources/js/admin/filter-user.js new file mode 100644 index 000000000..740cbe991 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/js/admin/filter-user.js @@ -0,0 +1,25 @@ +$(document).ready(function () { + +// User filter + $("select[name=filter_user]").select2({ + placeholder: $('select[name=filter_user] option:first-child').text(), + ajax: { + url: '/api/profile/query-users', + dataType: 'json', + processResults: function (data) { + let formattedData = []; + + Object.keys(data).forEach(function (id) { + formattedData.push({ + 'id': id, + 'text': data[id] + }) + }); + + return { + results: formattedData + } + } + } + }); +}); \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index 6152c9a2e..a5099a2fe 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -145,29 +145,6 @@ $(document).ready(function () { filter.checkUser(); }); - // User filter - $("select[name=filter_User]").select2({ - placeholder: $('select[name=filter_User] option:first-child').text(), - ajax: { - url: '/api/profile/query-users', - dataType: 'json', - processResults: function (data) { - let formattedData = []; - - Object.keys(data).forEach(function (id) { - formattedData.push({ - 'id': id, - 'text': data[id] - }) - }) - - return { - results: formattedData - } - } - } - }); - // Country filter $("select[name=filter_country]").select2({ placeholder: $('select[name=filter_country] option:first-child').text() diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php index 45466ee3b..1e4f8df9e 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php @@ -89,7 +89,11 @@ class AdvTableBuilder extends TableBuilder */ protected $assets = [ 'scripts.js' => [ - 'visiosoft.module.advs::js/admin/advanced.js' + 'visiosoft.module.advs::js/admin/advanced.js', + 'visiosoft.module.advs::js/admin/filter-user.js', + ], + 'styles.css' => [ + 'visiosoft.module.advs::css/admin/filter-user.css', ], ]; diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableFilters.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableFilters.php index dea4ecdfc..3b78437aa 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableFilters.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableFilters.php @@ -40,7 +40,7 @@ class AdvTableFilters 'query' => CategoryFilterQuery::class, 'options' => $categories, ], - 'User' => [ + 'user' => [ 'exact' => true, 'filter' => 'select', 'query' => UserFilterQuery::class,