diff --git a/application/controllers/Backend_api.php b/application/controllers/Backend_api.php index 5876610c..5a6e7896 100755 --- a/application/controllers/Backend_api.php +++ b/application/controllers/Backend_api.php @@ -104,7 +104,7 @@ class Backend_api extends CI_Controller { 'start_datetime >=' => $startDate, 'end_datetime <=' => $endDate ]), - 'unavailabilities' => $this->appointments_model->get_batch([ + 'unavailability_events' => $this->appointments_model->get_batch([ 'is_unavailable' => TRUE, 'start_datetime >=' => $startDate, 'end_datetime <=' => $endDate @@ -132,11 +132,11 @@ class Backend_api extends CI_Controller { } } - foreach ($response['unavailabilities'] as $index => $unavailability) + foreach ($response['unavailability_events'] as $index => $unavailability_event) { - if ((int)$unavailability['id_users_provider'] !== (int)$userId) + if ((int)$unavailability_event['id_users_provider'] !== (int)$userId) { - unset($response['unavailabilities'][$index]); + unset($response['unavailability_events'][$index]); } } } @@ -154,11 +154,11 @@ class Backend_api extends CI_Controller { } } - foreach ($response['unavailabilities'] as $index => $unavailability) + foreach ($response['unavailability_events'] as $index => $unavailability_event) { - if ( ! in_array((int)$unavailability['id_users_provider'], $providers)) + if ( ! in_array((int)$unavailability_event['id_users_provider'], $providers)) { - unset($response['unavailabilities'][$index]); + unset($response['unavailability_events'][$index]); } } } diff --git a/assets/js/backend_calendar_table_view.js b/assets/js/backend_calendar_table_view.js index d4909202..bb40b309 100755 --- a/assets/js/backend_calendar_table_view.js +++ b/assets/js/backend_calendar_table_view.js @@ -96,8 +96,8 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; // Add the appointments to the column. createAppointments($providerColumn, response.appointments); - // Add the unavailabilities to the column. - createUnavailabilities($providerColumn, response.unavailabilities); + // Add the unavailability events to the column. + createUnavailabilityEvents($providerColumn, response.unavailability_events); // Add the provider breaks to the column. var workingPlan = JSON.parse(provider.settings.working_plan); @@ -597,8 +597,8 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; // Add the appointments to the column. createAppointments($providerColumn, events.appointments); - // Add the unavailabilities to the column. - createUnavailabilities($providerColumn, events.unavailabilities); + // Add the unavailability events to the column. + createUnavailabilityEvents($providerColumn, events.unavailability_events); Backend.placeFooterToBottom(); } @@ -606,8 +606,8 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; /** * Get Calendar Component Height * - * This method calculates the proper calendar height, in order to be displayed correctly, even when the - * browser window is resizing. + * This method calculates the proper calendar height, in order to be displayed correctly, even when the browser + * window is resizing. * * @return {Number} Returns the calendar element height in pixels. */ @@ -912,20 +912,20 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; } /** - * Create Unavailabilities Events + * Create Unavailability Events * * This method will add the unavailability events on the table view. * * @param {jQuery} $providerColumn The provider column container. - * @param {Object[]} unavailabilities Contains the unavailability events data. + * @param {Object[]} unavailabilityEvents Contains the unavailability events data. */ - function createUnavailabilities($providerColumn, unavailabilities) { - if (unavailabilities.length === 0) { + function createUnavailabilityEvents($providerColumn, unavailabilityEvents) { + if (unavailabilityEvents.length === 0) { return; } - for (var index in unavailabilities) { - var unavailability = unavailabilities[index]; + for (var index in unavailabilityEvents) { + var unavailability = unavailabilityEvents[index]; if (unavailability.id_users_provider !== $providerColumn.data('provider').id) { continue;