From 4703df1adac4c39fbb7d122246f90e8ecf0ec311 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Tue, 21 May 2024 15:39:45 +0200 Subject: [PATCH] Fix provider filter (#1530) --- application/models/Providers_model.php | 2 ++ assets/js/utils/calendar_table_view.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/models/Providers_model.php b/application/models/Providers_model.php index b3ff051e..a6012b62 100755 --- a/application/models/Providers_model.php +++ b/application/models/Providers_model.php @@ -635,8 +635,10 @@ class Providers_model extends EA_Model ->select('users.*') ->from('users') ->join('roles', 'roles.id = users.id_roles', 'inner') + ->join('services_providers', 'services_providers.id_users = users.id', 'inner') ->where('roles.slug', DB_SLUG_PROVIDER) ->order_by('first_name ASC, last_name ASC, email ASC') + ->group_by('users.id') ->get() ->result_array(); diff --git a/assets/js/utils/calendar_table_view.js b/assets/js/utils/calendar_table_view.js index 2cbd2f74..485e8c53 100755 --- a/assets/js/utils/calendar_table_view.js +++ b/assets/js/utils/calendar_table_view.js @@ -550,8 +550,8 @@ App.Utils.CalendarTableView = (function () { 'text': App.Utils.Date.format(date, vars('date_format'), vars('time_format')), }).appendTo($dateColumn); - const filterProviderIds = $filterProvider.val(); - const filterServiceIds = $filterService.val(); + const filterProviderIds = $filterProvider.val().map((filterProviderId) => Number(filterProviderId)); + const filterServiceIds = $filterService.val().map((filterServiceId) => Number(filterServiceId)); let providers = vars('available_providers').filter((provider) => { const servedServiceIds = provider.services.filter((serviceId) => {