ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity

Correct the response prop name and load the 50 last updated customers in the calendar page.

Browse source
This commit is contained in:
Alex Tselegidis 2022-10-03 17:01:04 +03:00
parent 218bbea800
commit fb9e78535f
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
application/controllers/Calendar.php
View file

@ -131,7 +131,7 @@ class Calendar extends EA_Controller {
'available_services' => $available_services, 'available_services' => $available_services,
'secretary_providers' => $secretary_providers, 'secretary_providers' => $secretary_providers,
'edit_appointment' => $edit_appointment, 'edit_appointment' => $edit_appointment,
'customers' => [], // TODO: Remove the use of the pre-rendered customer set and only work with asynchronously fetched customer records. 'customers' => $this->customers_model->get(NULL, 50, NULL, 'update_datetime DESC'),
]); ]);
html_vars([ html_vars([
@ -529,13 +529,17 @@ class Calendar extends EA_Controller {
} }
} }
foreach ($response['unavailability_events'] as $index => $unavailability_event) $response['appointments'] = array_values($response['appointments']);
foreach ($response['unavailabilities'] as $index => $unavailability)
{ {
if ((int)$unavailability_event['id_users_provider'] !== (int)$user_id) if ((int)$unavailability['id_users_provider'] !== (int)$user_id)
{ {
unset($response['unavailability_events'][$index]); unset($response['unavailabilities'][$index]);
} }
} }
$response['unavailabilities'] = array_values($response['unavailabilities']);
} }
// If the current user is a secretary he must only see the appointments of his providers. // If the current user is a secretary he must only see the appointments of his providers.
@ -551,13 +555,17 @@ class Calendar extends EA_Controller {
} }
} }
foreach ($response['unavailability_events'] as $index => $unavailability_event) $response['appointments'] = array_values($response['appointments']);
foreach ($response['unavailabilities'] as $index => $unavailability)
{ {
if ( ! in_array((int)$unavailability_event['id_users_provider'], $providers)) if ( ! in_array((int)$unavailability['id_users_provider'], $providers))
{ {
unset($response['unavailability_events'][$index]); unset($response['unavailabilities'][$index]);
} }
} }
$response['unavailabilities'] = array_values($response['unavailabilities']);
} }
json_response($response); json_response($response);