mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-12-01 04:12:22 +03:00
Code Issues Projects Releases Packages Wiki Activity

Display the company working plan when browsing the "all" filter item

Browse source
This commit is contained in:
Alex Tselegidis 2022-07-27 02:19:42 +03:00
parent 2f289b48cb
commit dcc5084807
2 changed files with 197 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
application/controllers/Calendar.php
View file

@ -123,6 +123,7 @@ class Calendar extends EA_Controller {
'date_format' => setting('date_format'), 'date_format' => setting('date_format'),
'time_format' => setting('time_format'), 'time_format' => setting('time_format'),
'first_weekday' => setting('first_weekday'), 'first_weekday' => setting('first_weekday'),
'company_working_plan' => setting('company_working_plan'),
'timezones' => $this->timezones->to_array(), 'timezones' => $this->timezones->to_array(),
'privileges' => $privileges, 'privileges' => $privileges,
'calendar_view' => $calendar_view, 'calendar_view' => $calendar_view,

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

@ -1120,17 +1120,16 @@ App.Utils.CalendarDefaultView = (function () {
const calendarView = fullCalendar.view; const calendarView = fullCalendar.view;
if (filterType === FILTER_TYPE_PROVIDER && calendarView.type !== 'dayGridMonth') { if (calendarView.type === 'dayGridMonth') {
return;
}
const provider = vars('available_providers').find( const provider = vars('available_providers').find(
(availableProvider) => Number(availableProvider.id) === Number(recordId) (availableProvider) => Number(availableProvider.id) === Number(recordId)
); );
if (!provider) { const workingPlan = JSON.parse(provider ? provider.settings.working_plan : vars('company_working_plan'));
throw new Error('Provider was not found.'); const workingPlanExceptions = JSON.parse(provider ? provider.settings.working_plan_exceptions : '{}');
}
const workingPlan = JSON.parse(provider.settings.working_plan);
const workingPlanExceptions = JSON.parse(provider.settings.working_plan_exceptions);
let unavailabilityEvent; let unavailabilityEvent;
let viewStart; let viewStart;
let viewEnd; let viewEnd;
@ -1409,7 +1408,6 @@ App.Utils.CalendarDefaultView = (function () {
break; break;
} }
}
}) })
.always(() => { .always(() => {
$('#loading').css('visibility', ''); $('#loading').css('visibility', '');