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

Check both appointments and unavailabilities when generating available hours

Browse source
This commit is contained in:
Alex Tselegidis 2022-06-19 14:38:46 +01:00
parent 9907b0af12
commit c0e7a082f3
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
application/libraries/Availability.php
View file

@ -38,6 +38,7 @@ class Availability {
$this->CI->load->model('secretaries_model'); $this->CI->load->model('secretaries_model');
$this->CI->load->model('secretaries_model'); $this->CI->load->model('secretaries_model');
$this->CI->load->model('settings_model'); $this->CI->load->model('settings_model');
$this->CI->load->model('unavailabilities_model');
$this->CI->load->library('ics_file'); $this->CI->load->library('ics_file');
} }
@ -110,7 +111,12 @@ class Availability {
$where .= ' AND id != ' . $escaped_exclude_appointment_id; $where .= ' AND id != ' . $escaped_exclude_appointment_id;
} }
$appointments = $this->CI->appointments_model->get($where); $appointments = array_values(
array_merge(
$this->CI->appointments_model->get($where),
$this->CI->unavailabilities_model->get($where),
)
);
// Find the empty spaces on the plan. The first split between the plan is due to a break (if any). After that // Find the empty spaces on the plan. The first split between the plan is due to a break (if any). After that
// every reserved appointment is considered to be a taken space in the plan. // every reserved appointment is considered to be a taken space in the plan.