Display appointments from all providers in one view.

application/controllers/Calendar.php

@@ -584,9 +584,11 @@ class Calendar extends EA_Controller {
                 throw new Exception('You do not have the required permissions for this task.');
             }
 
+            $record_id = request('record_id');
+            
             $filter_type = request('filter_type');
 
-            if ( ! $filter_type)
+            if ( ! $filter_type && $record_id !== 'all')
             {
                 json_response([
                     'appointments' => [],
@@ -596,17 +598,20 @@ class Calendar extends EA_Controller {
                 return;
             }
 
+            $record_id = $this->db->escape($record_id);
+
             if ($filter_type == FILTER_TYPE_PROVIDER)
             {
                 $where_id = 'id_users_provider';
             }
-            else
+            elseif ($filter_type === FILTER_TYPE_SERVICE)
             {
                 $where_id = 'id_services';
+            } else {
+                $where_id = $record_id;
             }
 
             // Get appointments
-            $record_id = $this->db->escape(request('record_id'));
             $start_date = $this->db->escape(request('start_date'));
             $end_date = $this->db->escape(date('Y-m-d', strtotime(request('end_date') . ' +1 day')));
 

application/language/arabic/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/bulgarian/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/catalan/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/chinese/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/czech/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/danish/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/dutch/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/english/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/finnish/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/french/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/greek/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/hebrew/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/hindi/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/hungarian/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/italian/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/japanese/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/luxembourgish/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/marathi/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/polish/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/portuguese-br/translations_lang.php

@@ -359,4 +359,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/portuguese/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/romanian/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/russian/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/slovak/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/spanish/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/swedish/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

application/language/turkish/translations_lang.php

@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End

assets/js/utils/calendar_default_view.js

@@ -1542,6 +1542,8 @@ App.Utils.CalendarDefaultView = (function () {
         // Trigger once to set the proper footer position after calendar initialization.
         onWindowResize();
 
+        $selectFilterItem.append(new Option(lang('all'), 'all', true, true));
+
         // Fill the select list boxes of the page.
         if (vars('available_providers').length > 0) {
             $('<optgroup/>', {