@@ -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,28 +49,28 @@ 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']]['d'.$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']]['d' . $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 | - $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d'.$data['day']]['h'.$data['hour']][$index] = $data[$index]; |
|
73 | + $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d' . $data['day']]['h' . $data['hour']][$index] = $data[$index]; |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
@@ -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_HOUR][$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_MINUTE][$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) . ")"); |