@@ -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,31 +38,31 @@ 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 | - $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
|
| 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 | 61 | $index = 'm0'.$i; |
| 62 | 62 | } else { |
| 63 | 63 | $index = 'm'.$i; |
| 64 | 64 | } |
| 65 | - $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d' . $data['day']]['h' . $data['hour']][$index] = $data[$index]; |
|
| 65 | + $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d'.$data['day']]['h'.$data['hour']][$index] = $data[$index]; |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
@@ -48,17 +48,17 @@ discard block |
||
| 48 | 48 | // Cycle through day results and setup an event array |
| 49 | 49 | foreach ($results[Event::BAT_DAY]->fetchAll() as $data) { |
| 50 | 50 | // Figure out how many days the current month has |
| 51 | - $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
|
| 51 | + $temp_date = new \DateTime($data['year']."-".$data['month']); |
|
| 52 | 52 | $days_in_month = (int)$temp_date->format('t'); |
| 53 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
| 54 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
| 53 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
| 54 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d'.$i] = $data['d'.$i]; |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | // With the day events taken care off let's cycle through hours |
| 59 | 59 | foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) { |
| 60 | - for ($i = 0; $i<=23; $i++) { |
|
| 61 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h' . $i] = $data['h' . $i]; |
|
| 60 | + for ($i = 0; $i <= 23; $i++) { |
|
| 61 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d'.$data['day']]['h'.$i] = $data['h'.$i]; |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | |
@@ -66,11 +66,11 @@ discard block |
||
| 66 | 66 | foreach ($results[Event::BAT_MINUTE]->fetchAll() as $data) { |
| 67 | 67 | for ($i = 0; $i <= 59; $i++) { |
| 68 | 68 | if ($i <= 9) { |
| 69 | - $index = 'm0' . $i; |
|
| 69 | + $index = 'm0'.$i; |
|
| 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 | |
@@ -106,11 +106,11 @@ discard block |
||
| 106 | 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 | } |
| 112 | 112 | else { |
| 113 | - $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . implode(', ', $values) . ")"); |
|
| 113 | + $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, ".implode(', ', $keys).") VALUES (".$event->getUnitId().", $year, $month, ".implode(', ', $values).")"); |
|
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | } |
@@ -126,14 +126,14 @@ discard block |
||
| 126 | 126 | $keys = array_keys($hours); |
| 127 | 127 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_HOUR][$year][$month][$day])) { |
| 128 | 128 | $command = "UPDATE $this->hour_table SET "; |
| 129 | - foreach ($hours as $hour => $value){ |
|
| 129 | + foreach ($hours as $hour => $value) { |
|
| 130 | 130 | $command .= "$hour = $value,"; |
| 131 | 131 | } |
| 132 | 132 | $command = rtrim($command, ','); |
| 133 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1); |
|
| 133 | + $command .= " WHERE unit_id = ".$event->getUnitId()." AND year = $year AND month = $month AND day = ".substr($day, 1); |
|
| 134 | 134 | $this->pdo->exec($command); |
| 135 | 135 | } else { |
| 136 | - $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) . ")"); |
|
| 136 | + $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).")"); |
|
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -149,14 +149,14 @@ discard block |
||
| 149 | 149 | $keys = array_keys($minutes); |
| 150 | 150 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_MINUTE][$year][$month][$day][$hour])) { |
| 151 | 151 | $command = "UPDATE $this->minute_table SET "; |
| 152 | - foreach ($minutes as $minute => $value){ |
|
| 152 | + foreach ($minutes as $minute => $value) { |
|
| 153 | 153 | $command .= "$minute = $value,"; |
| 154 | 154 | } |
| 155 | 155 | $command = rtrim($command, ','); |
| 156 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1) . " AND hour = " . substr($hour,1); |
|
| 156 | + $command .= " WHERE unit_id = ".$event->getUnitId()." AND year = $year AND month = $month AND day = ".substr($day, 1)." AND hour = ".substr($hour, 1); |
|
| 157 | 157 | $this->pdo->exec($command); |
| 158 | 158 | } else { |
| 159 | - $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) . ")"); |
|
| 159 | + $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).")"); |
|
| 160 | 160 | } |
| 161 | 161 | } |
| 162 | 162 | } |