@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * |
| 20 | 20 | * @param $calendar_response |
| 21 | 21 | */ |
| 22 | - public function applyConstraint(CalendarResponse &$calendar_response); |
|
| 22 | + public function applyConstraint(CalendarResponse & $calendar_response); |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * @param $start_date |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | /** |
| 112 | 112 | * {@inheritdoc} |
| 113 | 113 | */ |
| 114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
| 114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
| 115 | 115 | $this->calendar_response = $calendar_response; |
| 116 | 116 | } |
| 117 | 117 | |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * @return int |
| 63 | 63 | */ |
| 64 | 64 | public function getValue() { |
| 65 | - return (int) $this->value; |
|
| 65 | + return (int)$this->value; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | * {@inheritdoc} |
| 45 | 45 | */ |
| 46 | 46 | public function getDefaultValue() { |
| 47 | - return (int) $this->default_value; |
|
| 47 | + return (int)$this->default_value; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | /** |
| 112 | 112 | * {@inheritdoc} |
| 113 | 113 | */ |
| 114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
| 114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
| 115 | 115 | $this->calendar_response = $calendar_response; |
| 116 | 116 | } |
| 117 | 117 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | /** |
| 36 | 36 | * {@inheritdoc} |
| 37 | 37 | */ |
| 38 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
| 38 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
| 39 | 39 | parent::applyConstraint($calendar_response); |
| 40 | 40 | |
| 41 | 41 | if ($this->start_date === NULL) { |
@@ -45,11 +45,11 @@ discard block |
||
| 45 | 45 | $this->end_date = new \DateTime('2999-12-31'); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - if ( (($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
| 48 | + if ((($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
| 49 | 49 | $calendar_response->getStartDate()->getTimestamp() <= $this->end_date->getTimestamp()) || |
| 50 | 50 | ($calendar_response->getStartDate()->getTimestamp() <= $this->start_date->getTimestamp() && |
| 51 | 51 | $calendar_response->getEndDate()->getTimestamp() >= $this->end_date->getTimestamp())) && |
| 52 | - $this->checkin_day != $calendar_response->getStartDate()->format('N') ) { |
|
| 52 | + $this->checkin_day != $calendar_response->getStartDate()->format('N')) { |
|
| 53 | 53 | |
| 54 | 54 | $units = $this->getUnits(); |
| 55 | 55 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | /** |
| 53 | 53 | * {@inheritdoc} |
| 54 | 54 | */ |
| 55 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
| 55 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
| 56 | 56 | parent::applyConstraint($calendar_response); |
| 57 | 57 | |
| 58 | 58 | if ($this->start_date === NULL) { |
@@ -62,13 +62,13 @@ discard block |
||
| 62 | 62 | $this->end_date = new \DateTime('2999-12-31'); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - if ( (($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
| 65 | + if ((($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
| 66 | 66 | $calendar_response->getStartDate()->getTimestamp() <= $this->end_date->getTimestamp()) || |
| 67 | 67 | ($calendar_response->getEndDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
| 68 | 68 | $calendar_response->getEndDate()->getTimestamp() <= $this->end_date->getTimestamp()) || |
| 69 | 69 | ($calendar_response->getStartDate()->getTimestamp() <= $this->start_date->getTimestamp() && |
| 70 | 70 | $calendar_response->getEndDate()->getTimestamp() >= $this->end_date->getTimestamp())) && |
| 71 | - ($this->checkin_day === NULL || $this->checkin_day == $calendar_response->getStartDate()->format('N')) ) { |
|
| 71 | + ($this->checkin_day === NULL || $this->checkin_day == $calendar_response->getStartDate()->format('N'))) { |
|
| 72 | 72 | |
| 73 | 73 | $units = $this->getUnits(); |
| 74 | 74 | |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | $text = ''; |
| 108 | 108 | |
| 109 | 109 | // Min/max stay length constraint variables. |
| 110 | - $minimum_stay = empty($this->min_days) ? '' : (($this->min_days == 1) ? $this->min_days . ' day' : $this->min_days . ' days'); |
|
| 111 | - $maximum_stay = empty($this->max_days) ? '' : (($this->max_days == 1) ? $this->max_days . ' day' : $this->max_days . ' days'); |
|
| 110 | + $minimum_stay = empty($this->min_days) ? '' : (($this->min_days == 1) ? $this->min_days.' day' : $this->min_days.' days'); |
|
| 111 | + $maximum_stay = empty($this->max_days) ? '' : (($this->max_days == 1) ? $this->max_days.' day' : $this->max_days.' days'); |
|
| 112 | 112 | |
| 113 | 113 | // Day of the week constraint variable. |
| 114 | 114 | $day_of_the_week = $this->getWeekDay($this->checkin_day); |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | // Create a mock itemized event for the period in question - since event data is either |
| 175 | 175 | // in the database or the default value we first create a mock event and then fill it in |
| 176 | 176 | // accordingly |
| 177 | - $mock_event = new Event($start_date, $end_date, new Unit(0,0), $this->default_value); |
|
| 177 | + $mock_event = new Event($start_date, $end_date, new Unit(0, 0), $this->default_value); |
|
| 178 | 178 | $itemized = $mock_event->itemize(new EventItemizer($mock_event, $granularity)); |
| 179 | 179 | |
| 180 | 180 | // Cycle through each unit retrieved and provide it with a fully configured itemized mock event |
@@ -265,11 +265,11 @@ discard block |
||
| 265 | 265 | foreach ($days as $day => $hours) { |
| 266 | 266 | foreach ($hours as $hour => $value) { |
| 267 | 267 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
| 268 | - $result[$year][$month][$day][$hour] = ((int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour]); |
|
| 268 | + $result[$year][$month][$day][$hour] = ((int)$db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour]); |
|
| 269 | 269 | } |
| 270 | 270 | else { |
| 271 | 271 | // If nothing from db - then revert to the defaults |
| 272 | - $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
| 272 | + $result[$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
| 273 | 273 | } |
| 274 | 274 | } |
| 275 | 275 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | foreach ($months as $month => $days) { |
| 284 | 284 | foreach ($days as $day => $hours) { |
| 285 | 285 | foreach ($hours as $hour => $value) { |
| 286 | - $result[$year][$month][$day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
| 286 | + $result[$year][$month][$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 287 | 287 | } |
| 288 | 288 | ksort($result[$year][$month][$day], SORT_NATURAL); |
| 289 | 289 | } |
@@ -314,11 +314,11 @@ discard block |
||
| 314 | 314 | foreach ($hours as $hour => $minutes) { |
| 315 | 315 | foreach ($minutes as $minute => $value) { |
| 316 | 316 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
| 317 | - $result[$year][$month][$day][$hour][$minute] = ((int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute]); |
|
| 317 | + $result[$year][$month][$day][$hour][$minute] = ((int)$db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute]); |
|
| 318 | 318 | } |
| 319 | 319 | else { |
| 320 | 320 | // If nothing from db - then revert to the defaults |
| 321 | - $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
| 321 | + $result[$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | } |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | foreach ($days as $day => $hours) { |
| 335 | 335 | foreach ($hours as $hour => $minutes) { |
| 336 | 336 | foreach ($minutes as $minute => $value) { |
| 337 | - $result[$year][$month][$day][$hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
| 337 | + $result[$year][$month][$day][$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 338 | 338 | } |
| 339 | 339 | ksort($result[$year][$month][$day][$hour], SORT_NATURAL); |
| 340 | 340 | } |
@@ -396,12 +396,12 @@ discard block |
||
| 396 | 396 | // Value just switched - let us wrap up with current event and start a new one |
| 397 | 397 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
| 398 | 398 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
| 399 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
| 399 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':'.substr($minute, 1)); |
|
| 400 | 400 | $current_value = $minute_value; |
| 401 | 401 | } |
| 402 | 402 | if ($current_value === NULL) { |
| 403 | 403 | // We are down to minutes and haven't created and event yet - do one now |
| 404 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
| 404 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':'.substr($minute, 1)); |
|
| 405 | 405 | $end_event = clone($start_event); |
| 406 | 406 | } |
| 407 | 407 | $current_value = $minute_value; |
@@ -417,21 +417,21 @@ discard block |
||
| 417 | 417 | // Start event becomes the end event with a minute added |
| 418 | 418 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
| 419 | 419 | // End event comes the current point in time |
| 420 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59'); |
|
| 420 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59'); |
|
| 421 | 421 | $current_value = $hour_value; |
| 422 | 422 | } |
| 423 | 423 | if ($current_value === NULL) { |
| 424 | 424 | // Got into hours and still haven't created an event so |
| 425 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':00'); |
|
| 425 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':00'); |
|
| 426 | 426 | // We will be occupying at least this hour so might as well mark it |
| 427 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59'); |
|
| 427 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59'); |
|
| 428 | 428 | $current_value = $hour_value; |
| 429 | 429 | } |
| 430 | 430 | } |
| 431 | 431 | } |
| 432 | 432 | elseif ($current_value === $value) { |
| 433 | 433 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
| 434 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
| 434 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
| 435 | 435 | } |
| 436 | 436 | elseif (($current_value !== $value) && ($current_value !== NULL)) { |
| 437 | 437 | // Value just switched - let us wrap up with current event and start a new one |
@@ -439,13 +439,13 @@ discard block |
||
| 439 | 439 | // Start event becomes the end event with a minute added |
| 440 | 440 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
| 441 | 441 | // End event becomes the current day which we have not account for yet |
| 442 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
| 442 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
| 443 | 443 | $current_value = $value; |
| 444 | 444 | } |
| 445 | 445 | if ($current_value === NULL) { |
| 446 | 446 | // We have not created an event yet so let's do it now |
| 447 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '00:00'); |
|
| 448 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
| 447 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'00:00'); |
|
| 448 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
| 449 | 449 | $current_value = $value; |
| 450 | 450 | } |
| 451 | 451 | } |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | * @return Unit |
| 545 | 545 | */ |
| 546 | 546 | protected function getUnit($unit_id) { |
| 547 | - $keyed = $this->keyUnitsById(); |
|
| 547 | + $keyed = $this->keyUnitsById(); |
|
| 548 | 548 | return $keyed[$unit_id]; |
| 549 | 549 | } |
| 550 | 550 | |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, $this->event->endMonthDate($this->event->getStartDate())); |
| 161 | 161 | } |
| 162 | 162 | foreach ($dayrange as $day) { |
| 163 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
| 163 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | elseif ($this->event->isLastMonth($date)) { |
| 169 | 169 | $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, $this->event->getEndDate()); |
| 170 | 170 | foreach ($dayrange as $day) { |
| 171 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
| 171 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | else { |
| 177 | 177 | $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, new \DateTime($date->format("Y-n-t 23:59:59"))); |
| 178 | 178 | foreach ($dayrange as $day) { |
| 179 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
| 179 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | 182 | } |
@@ -218,34 +218,34 @@ discard block |
||
| 218 | 218 | if (!($this->event->getEndDate()->format('H:i') == '23:59')) { |
| 219 | 219 | $period = new \DatePeriod($start_date, $interval, $end_date->add(new \DateInterval('PT1M'))); |
| 220 | 220 | $itemized_same_day = $this->createHourlyGranular($period, $start_date); |
| 221 | - $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
|
| 222 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
| 223 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
| 221 | + $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1; |
|
| 222 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd]; |
|
| 223 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd]; |
|
| 224 | 224 | } |
| 225 | 225 | } else { |
| 226 | 226 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
| 227 | 227 | if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
| 228 | 228 | $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); |
| 229 | 229 | $itemized_start = $this->createHourlyGranular($start_period, $start_date); |
| 230 | - $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
|
| 231 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
| 232 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
| 230 | + $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1; |
|
| 231 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd]; |
|
| 232 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd]; |
|
| 233 | 233 | } else { |
| 234 | 234 | // Just set an empty hour and minute |
| 235 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
|
| 236 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
|
| 235 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = array(); |
|
| 236 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = array(); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
| 240 | 240 | if ($this->event->getEndDate()->format('H:i') == '23:59') { |
| 241 | - $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
|
| 242 | - $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
|
| 241 | + $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = array(); |
|
| 242 | + $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = array(); |
|
| 243 | 243 | } else { |
| 244 | 244 | $end_period = new \DatePeriod(new \DateTime($end_date->format("Y-n-j 00:00:00")), $interval, $end_date->add(new \DateInterval('PT1M'))); |
| 245 | 245 | $itemized_end = $this->createHourlyGranular($end_period, new \DateTime($end_date->format("Y-n-j 00:00:00"))); |
| 246 | - $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1; |
|
| 247 | - $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed]; |
|
| 248 | - $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed]; |
|
| 246 | + $itemized[EventItemizer::BAT_DAY][$ey][$em]['d'.$ed] = -1; |
|
| 247 | + $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed]; |
|
| 248 | + $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed]; |
|
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | |
@@ -267,9 +267,9 @@ discard block |
||
| 267 | 267 | $start_minute = $counter; |
| 268 | 268 | foreach ($period as $minute) { |
| 269 | 269 | // Doing minutes so set the values in the minute array |
| 270 | - $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->event->getValue(); |
|
| 270 | + $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')]['m'.$minute->format('i')] = $this->event->getValue(); |
|
| 271 | 271 | // Let the hours know that it cannot determine availability |
| 272 | - $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
| 272 | + $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')] = -1; |
|
| 273 | 273 | $counter++; |
| 274 | 274 | |
| 275 | 275 | if ($counter == 60 && $start_minute !== 0) { |
@@ -279,9 +279,9 @@ discard block |
||
| 279 | 279 | } |
| 280 | 280 | elseif ($counter == 60 && $start_minute == 0) { |
| 281 | 281 | // Did a real whole hour so initialize the hour |
| 282 | - $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->event->getValue(); |
|
| 282 | + $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')] = $this->event->getValue(); |
|
| 283 | 283 | // We have a whole hour so get rid of the minute info |
| 284 | - unset($itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); |
|
| 284 | + unset($itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')]); |
|
| 285 | 285 | $counter = 0; |
| 286 | 286 | $start_minute = 0; |
| 287 | 287 | } |