@@ -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'); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
36 | 36 | |
37 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
37 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
38 | 38 | |
39 | 39 | $results = array(); |
40 | 40 | // Run each query and store results |
@@ -49,26 +49,26 @@ discard block |
||
49 | 49 | // Figure out how many days the current month has |
50 | 50 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
51 | 51 | $days_in_month = (int)$temp_date->format('t'); |
52 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
53 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
52 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
53 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | |
57 | 57 | // With the day events taken care off let's cycle through hours |
58 | 58 | foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) { |
59 | - for ($i = 0; $i<=23; $i++) { |
|
60 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i]; |
|
59 | + for ($i = 0; $i <= 23; $i++) { |
|
60 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i]; |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
64 | 64 | // With the hour events taken care off let's cycle through minutes |
65 | 65 | foreach ($results[Event::BAT_MINUTE]->fetchAll() as $data) { |
66 | - for ($i = 0; $i<=59; $i++) { |
|
66 | + for ($i = 0; $i <= 59; $i++) { |
|
67 | 67 | if ($i <= 9) { |
68 | - $index = 'm0'.$i; |
|
68 | + $index = 'm0' . $i; |
|
69 | 69 | } |
70 | 70 | else { |
71 | - $index = 'm'.$i; |
|
71 | + $index = 'm' . $i; |
|
72 | 72 | } |
73 | 73 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
74 | 74 | } |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | // Because SQLite does not have a nice merge first we have to check if a row exists to determine whether to do an insert or an update |
103 | 103 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month])) { |
104 | 104 | $command = "UPDATE $this->day_table SET "; |
105 | - foreach ($days as $day => $value){ |
|
106 | - $command .= "$day = $value,"; |
|
105 | + foreach ($days as $day => $value) { |
|
106 | + $command .= "$day = $value,"; |
|
107 | 107 | } |
108 | 108 | $command = rtrim($command, ','); |
109 | - $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month"; |
|
109 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month"; |
|
110 | 110 | $this->pdo->exec($command); |
111 | 111 | } else { |
112 | 112 | $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . implode(', ', $values) . ")"); |
@@ -125,11 +125,11 @@ discard block |
||
125 | 125 | $keys = array_keys($hours); |
126 | 126 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month][$day])) { |
127 | 127 | $command = "UPDATE $this->hour_table SET "; |
128 | - foreach ($hours as $hour => $value){ |
|
129 | - $command .= "$hour = $value,"; |
|
128 | + foreach ($hours as $hour => $value) { |
|
129 | + $command .= "$hour = $value,"; |
|
130 | 130 | } |
131 | 131 | $command = rtrim($command, ','); |
132 | - $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month AND day = ". substr($day,1); |
|
132 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1); |
|
133 | 133 | $this->pdo->exec($command); |
134 | 134 | } else { |
135 | 135 | $this->pdo->exec("INSERT INTO $this->hour_table (unit_id, year, month, day, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . substr($day, 1) . ", " . implode(', ', $values) . ")"); |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | $keys = array_keys($minutes); |
149 | 149 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month][$day][$hour])) { |
150 | 150 | $command = "UPDATE $this->minute_table SET "; |
151 | - foreach ($minutes as $minute => $value){ |
|
152 | - $command .= "$minute = $value,"; |
|
151 | + foreach ($minutes as $minute => $value) { |
|
152 | + $command .= "$minute = $value,"; |
|
153 | 153 | } |
154 | 154 | $command = rtrim($command, ','); |
155 | - $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month AND day = ". substr($day,1) . " AND hour = " . substr($hour,1); |
|
155 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1) . " AND hour = " . substr($hour, 1); |
|
156 | 156 | $this->pdo->exec($command); |
157 | 157 | } else { |
158 | 158 | $this->pdo->exec("INSERT INTO $this->minute_table (unit_id, year, month, day, hour, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . substr($day, 1) . ", " . substr($hour, 1) . ", " . implode(', ', $values) . ")"); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $current_states = array_keys($unit_states); |
124 | 124 | // Compare the current states with the set of valid states |
125 | 125 | $remaining_states = array_diff($current_states, $valid_states); |
126 | - if (count($remaining_states) == 0 ) { |
|
126 | + if (count($remaining_states) == 0) { |
|
127 | 127 | // Unit is in a state that is within the set of valid states so add to result set |
128 | 128 | $units[$unit] = $unit; |
129 | 129 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | foreach ($months as $month => $days) { |
214 | 214 | foreach ($days as $day => $hours) { |
215 | 215 | foreach ($hours as $hour => $value) { |
216 | - $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
216 | + $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
217 | 217 | } |
218 | 218 | } |
219 | 219 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | foreach ($hours as $hour => $minutes) { |
229 | 229 | foreach ($minutes as $minute => $value) { |
230 | 230 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
231 | - $events[$unit][Event::BAT_MINUTE][$year][$month]['d' .$day]['h'.$hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); |
|
231 | + $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); |
|
232 | 232 | } |
233 | 233 | else { |
234 | 234 | // If nothing from db - then revert to the defaults |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | foreach ($days as $day => $hours) { |
248 | 248 | foreach ($hours as $hour => $minutes) { |
249 | 249 | foreach ($minutes as $minute => $value) { |
250 | - $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
250 | + $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
251 | 251 | } |
252 | 252 | } |
253 | 253 | } |
@@ -320,12 +320,12 @@ discard block |
||
320 | 320 | // Value just switched - let us wrap up with current event and start a new one |
321 | 321 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); |
322 | 322 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
323 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
323 | + $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
324 | 324 | $current_value = $minute_value; |
325 | 325 | } |
326 | 326 | if ($current_value === NULL) { |
327 | 327 | // We are down to minutes and haven't created and event yet - do one now |
328 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
328 | + $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
329 | 329 | $end_event = clone($start_event); |
330 | 330 | } |
331 | 331 | $current_value = $minute_value; |
@@ -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 | } |