maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Display appointments from all providers in one view.

Browse source
This commit is contained in:
Alex Tselegidis 2022-01-24 22:07:24 +01:00
parent 0bbbff47c8
commit 4f5fbb8262
29 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
application/controllers/Calendar.php
View file

@ -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')));

1
application/language/arabic/translations_lang.php
View file

@ -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

1
application/language/bulgarian/translations_lang.php
View file

@ -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

1
application/language/catalan/translations_lang.php
View file

@ -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

1
application/language/chinese/translations_lang.php
View file

@ -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

1
application/language/czech/translations_lang.php
View file

@ -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

1
application/language/danish/translations_lang.php
View file

@ -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

1
application/language/dutch/translations_lang.php
View file

@ -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

1
application/language/english/translations_lang.php
View file

@ -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

1
application/language/finnish/translations_lang.php
View file

@ -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

1
application/language/french/translations_lang.php
View file

@ -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

1
application/language/greek/translations_lang.php
View file

@ -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

1
application/language/hebrew/translations_lang.php
View file

@ -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

1
application/language/hindi/translations_lang.php
View file

@ -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

1
application/language/hungarian/translations_lang.php
View file

@ -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

1
application/language/italian/translations_lang.php
View file

@ -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

1
application/language/japanese/translations_lang.php
View file

@ -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

1
application/language/luxembourgish/translations_lang.php
View file

@ -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

1
application/language/marathi/translations_lang.php
View file

@ -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

1
application/language/polish/translations_lang.php
View file

@ -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

1
application/language/portuguese-br/translations_lang.php
View file

@ -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

1
application/language/portuguese/translations_lang.php
View file

@ -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

1
application/language/romanian/translations_lang.php
View file

@ -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

1
application/language/russian/translations_lang.php
View file

@ -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

1
application/language/slovak/translations_lang.php
View file

@ -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

1
application/language/spanish/translations_lang.php
View file

@ -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

1
application/language/swedish/translations_lang.php
View file

@ -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

1
application/language/turkish/translations_lang.php
View file

@ -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

2
assets/js/utils/calendar_default_view.js
View file

@ -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/>', {