@@ -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 |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
| 28 | 28 | |
| 29 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 29 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 30 | 30 | |
| 31 | 31 | $results = array(); |
| 32 | 32 | // Run each query and store results |
@@ -37,30 +37,30 @@ discard block |
||
| 37 | 37 | $db_events = array(); |
| 38 | 38 | |
| 39 | 39 | // Cycle through day results and setup an event array |
| 40 | - while( $data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 40 | + while ($data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 41 | 41 | // Figure out how many days the current month has |
| 42 | 42 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
| 43 | 43 | $days_in_month = (int)$temp_date->format('t'); |
| 44 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
| 45 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
| 44 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
| 45 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | // With the day events taken care off let's cycle through hours |
| 50 | - while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 51 | - for ($i = 0; $i<=23; $i++) { |
|
| 52 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i]; |
|
| 50 | + while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 51 | + for ($i = 0; $i <= 23; $i++) { |
|
| 52 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i]; |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // With the hour events taken care off let's cycle through minutes |
| 57 | - while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 58 | - for ($i = 0; $i<=59; $i++) { |
|
| 57 | + while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 58 | + for ($i = 0; $i <= 59; $i++) { |
|
| 59 | 59 | if ($i <= 9) { |
| 60 | - $index = 'm0'.$i; |
|
| 60 | + $index = 'm0' . $i; |
|
| 61 | 61 | } |
| 62 | 62 | else { |
| 63 | - $index = 'm'.$i; |
|
| 63 | + $index = 'm' . $i; |
|
| 64 | 64 | } |
| 65 | 65 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
| 66 | 66 | } |
@@ -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 | |
@@ -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 | |
@@ -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 | |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
| 493 | - if ($this->end_date->format('H:i') == '23:59' ) { |
|
| 493 | + if ($this->end_date->format('H:i') == '23:59') { |
|
| 494 | 494 | $itemized[AbstractEvent::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
| 495 | 495 | $itemized[AbstractEvent::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
| 496 | 496 | } else { |
@@ -518,14 +518,14 @@ discard block |
||
| 518 | 518 | |
| 519 | 519 | $counter = (int)$period_start->format('i'); |
| 520 | 520 | $start_minute = $counter; |
| 521 | - foreach($period as $minute) { |
|
| 521 | + foreach ($period as $minute) { |
|
| 522 | 522 | // Doing minutes so set the values in the minute array |
| 523 | - $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue(); |
|
| 523 | + $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->getValue(); |
|
| 524 | 524 | // Let the hours know that it cannot determine availability |
| 525 | - $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1; |
|
| 525 | + $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
| 526 | 526 | $counter++; |
| 527 | 527 | |
| 528 | - if ($counter == 60 && $start_minute!==0) { |
|
| 528 | + if ($counter == 60 && $start_minute !== 0) { |
|
| 529 | 529 | // Not a real hour - leave as is and move on |
| 530 | 530 | $counter = 0; |
| 531 | 531 | $start_minute = 0; |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | // Did a real whole hour so initialize the hour |
| 535 | 535 | $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); |
| 536 | 536 | // We have a whole hour so get rid of the minute info |
| 537 | - unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]); |
|
| 537 | + unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); |
|
| 538 | 538 | $counter = 0; |
| 539 | 539 | $start_minute = 0; |
| 540 | 540 | } |
@@ -555,12 +555,12 @@ discard block |
||
| 555 | 555 | // Set the end date to the last day of the month so that we are sure to get that last month |
| 556 | 556 | $adjusted_end_day = new \DateTime($this->end_date->format('Y-n-t')); |
| 557 | 557 | |
| 558 | - $daterange = new \DatePeriod($this->start_date, $interval ,$adjusted_end_day); |
|
| 558 | + $daterange = new \DatePeriod($this->start_date, $interval, $adjusted_end_day); |
|
| 559 | 559 | |
| 560 | 560 | $itemized = array(); |
| 561 | 561 | |
| 562 | 562 | // Cycle through each month |
| 563 | - foreach($daterange as $date) { |
|
| 563 | + foreach ($daterange as $date) { |
|
| 564 | 564 | |
| 565 | 565 | $year = $date->format("Y"); |
| 566 | 566 | $dayinterval = new \DateInterval('P1D'); |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | |
| 10 | 10 | use Roomify\Bat\Event\EventInterface; |
| 11 | 11 | use Roomify\Bat\Store\Store; |
| 12 | -use Roomify\Bat\Unit\Unit; |
|
| 13 | 12 | |
| 14 | 13 | abstract class AbstractEvent implements EventInterface { |
| 15 | 14 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | protected $duration_unit; |
| 34 | 34 | |
| 35 | - public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit){ |
|
| 35 | + public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit) { |
|
| 36 | 36 | parent::__construct($start_date, $end_date, $unit, $store); |
| 37 | 37 | $this->duration_unit = $duration_unit; |
| 38 | 38 | } |
@@ -53,21 +53,21 @@ discard block |
||
| 53 | 53 | //var_dump($period); |
| 54 | 54 | //var_dump($unit); |
| 55 | 55 | //var_dump($unit_events); |
| 56 | - foreach ($unit_events as $event){ |
|
| 57 | - if ($unit = $this->unit->getUnitId()){ |
|
| 56 | + foreach ($unit_events as $event) { |
|
| 57 | + if ($unit = $this->unit->getUnitId()) { |
|
| 58 | 58 | foreach ($period as $dt) { |
| 59 | 59 | // If event in period involved add value of event |
| 60 | 60 | // If event is not completely in period involved then add just the percentage that is |
| 61 | 61 | $last_period = $dt; |
| 62 | 62 | print_r("Event is: "); |
| 63 | - print_r($event->getStartDate()->format('Y-m-d H:i:s') ." to "); |
|
| 64 | - print_r($event->getEndDate()->format('Y-m-d H:i:s') ."\n"); |
|
| 63 | + print_r($event->getStartDate()->format('Y-m-d H:i:s') . " to "); |
|
| 64 | + print_r($event->getEndDate()->format('Y-m-d H:i:s') . "\n"); |
|
| 65 | 65 | print_r("Period is: "); |
| 66 | - print_r($dt->format('Y-m-d H:i:s') ."\n"); |
|
| 67 | - if ($event->dateIsInRange($dt)){ |
|
| 66 | + print_r($dt->format('Y-m-d H:i:s') . "\n"); |
|
| 67 | + if ($event->dateIsInRange($dt)) { |
|
| 68 | 68 | print_r("In range adding: " . $event->getValue() . " to event.\n"); |
| 69 | 69 | $value = $value + $event->getValue(); |
| 70 | - print_r("Current Value " .$value . "\n"); |
|
| 70 | + print_r("Current Value " . $value . "\n"); |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | $current_states = array_keys($unit_states); |
| 125 | 125 | // Compare the current states with the set of valid states |
| 126 | 126 | $remaining_states = array_diff($current_states, $valid_states); |
| 127 | - if (count($remaining_states) == 0 ) { |
|
| 127 | + if (count($remaining_states) == 0) { |
|
| 128 | 128 | // Unit is in a state that is within the set of valid states so add to result set |
| 129 | 129 | $units[$unit] = $unit; |
| 130 | 130 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | // Create a mock itemized event for the period in question - since event data is either |
| 164 | 164 | // in the database or the default value we first create a mock event and then fill it in |
| 165 | 165 | // accordingly |
| 166 | - $mock_event = new Event($start_date, $end_date, new Unit(0,0,null), $this->default_value); |
|
| 166 | + $mock_event = new Event($start_date, $end_date, new Unit(0, 0, null), $this->default_value); |
|
| 167 | 167 | $itemized = $mock_event->itemizeEvent(); |
| 168 | 168 | |
| 169 | 169 | // Cycle through each unit retrieved and provide it with a fully configured itemized mock event |
@@ -253,11 +253,11 @@ discard block |
||
| 253 | 253 | foreach ($days as $day => $hours) { |
| 254 | 254 | foreach ($hours as $hour => $value) { |
| 255 | 255 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
| 256 | - $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]); |
|
| 256 | + $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]); |
|
| 257 | 257 | } |
| 258 | 258 | else { |
| 259 | 259 | // If nothing from db - then revert to the defaults |
| 260 | - $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
| 260 | + $result[$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | foreach ($months as $month => $days) { |
| 271 | 271 | foreach ($days as $day => $hours) { |
| 272 | 272 | foreach ($hours as $hour => $value) { |
| 273 | - $result[$year][$month][$day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
| 273 | + $result[$year][$month][$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 274 | 274 | } |
| 275 | 275 | ksort($result[$year][$month][$day], SORT_NATURAL); |
| 276 | 276 | } |
@@ -300,11 +300,11 @@ discard block |
||
| 300 | 300 | foreach ($hours as $hour => $minutes) { |
| 301 | 301 | foreach ($minutes as $minute => $value) { |
| 302 | 302 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
| 303 | - $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]); |
|
| 303 | + $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]); |
|
| 304 | 304 | } |
| 305 | 305 | else { |
| 306 | 306 | // If nothing from db - then revert to the defaults |
| 307 | - $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
| 307 | + $result[$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
| 308 | 308 | } |
| 309 | 309 | } |
| 310 | 310 | } |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | foreach ($days as $day => $hours) { |
| 320 | 320 | foreach ($hours as $hour => $minutes) { |
| 321 | 321 | foreach ($minutes as $minute => $value) { |
| 322 | - $result[$year][$month][$day][$hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
| 322 | + $result[$year][$month][$day][$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 323 | 323 | } |
| 324 | 324 | ksort($result[$year][$month][$day][$hour], SORT_NATURAL); |
| 325 | 325 | } |
@@ -382,12 +382,12 @@ discard block |
||
| 382 | 382 | // Value just switched - let us wrap up with current event and start a new one |
| 383 | 383 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
| 384 | 384 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
| 385 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
| 385 | + $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
| 386 | 386 | $current_value = $minute_value; |
| 387 | 387 | } |
| 388 | 388 | if ($current_value === NULL) { |
| 389 | 389 | // We are down to minutes and haven't created and event yet - do one now |
| 390 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
| 390 | + $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
| 391 | 391 | $end_event = clone($start_event); |
| 392 | 392 | } |
| 393 | 393 | $current_value = $minute_value; |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | * @return mixed |
| 531 | 531 | */ |
| 532 | 532 | protected function getUnit($unit_id) { |
| 533 | - $keyed = $this->keyUnitsById(); |
|
| 533 | + $keyed = $this->keyUnitsById(); |
|
| 534 | 534 | return $keyed[$unit_id]; |
| 535 | 535 | } |
| 536 | 536 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * @param $unit |
| 29 | 29 | * @param $value |
| 30 | 30 | */ |
| 31 | - public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit , $value = 0) { |
|
| 31 | + public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, $value = 0) { |
|
| 32 | 32 | $this->unit_id = $unit->getUnitId(); |
| 33 | 33 | $this->unit = $unit; |
| 34 | 34 | $this->start_date = clone($start_date); |