@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
| 29 | 29 | |
| 30 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 30 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 31 | 31 | |
| 32 | 32 | $results = array(); |
| 33 | 33 | // Run each query and store results |
@@ -38,30 +38,30 @@ discard block |
||
| 38 | 38 | $db_events = array(); |
| 39 | 39 | |
| 40 | 40 | // Cycle through day results and setup an event array |
| 41 | - while( $data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 41 | + while ($data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 42 | 42 | // Figure out how many days the current month has |
| 43 | 43 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
| 44 | 44 | $days_in_month = (int)$temp_date->format('t'); |
| 45 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
| 46 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
| 45 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
| 46 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | // With the day events taken care off let's cycle through hours |
| 51 | - while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 52 | - for ($i = 0; $i<=23; $i++) { |
|
| 53 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h'. $i] = $data['h'.$i]; |
|
| 51 | + while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 52 | + for ($i = 0; $i <= 23; $i++) { |
|
| 53 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h' . $i] = $data['h' . $i]; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // With the hour events taken care off let's cycle through minutes |
| 58 | - while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 59 | - for ($i = 0; $i<=59; $i++) { |
|
| 58 | + while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 59 | + for ($i = 0; $i <= 59; $i++) { |
|
| 60 | 60 | if ($i <= 9) { |
| 61 | - $index = 'm0'.$i; |
|
| 61 | + $index = 'm0' . $i; |
|
| 62 | 62 | } |
| 63 | 63 | else { |
| 64 | - $index = 'm'.$i; |
|
| 64 | + $index = 'm' . $i; |
|
| 65 | 65 | } |
| 66 | 66 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d' . $data['day']]['h' . $data['hour']][$index] = $data[$index]; |
| 67 | 67 | } |