@@ -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 |
@@ -49,14 +49,14 @@ 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++) { |
|
52 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
53 | 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++) { |
|
59 | + for ($i = 0; $i <= 23; $i++) { |
|
60 | 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 | } |
@@ -102,7 +102,7 @@ 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){ |
|
105 | + foreach ($days as $day => $value) { |
|
106 | 106 | $command .= "$day = $value,"; |
107 | 107 | } |
108 | 108 | $command = rtrim($command, ','); |
@@ -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){ |
|
128 | + foreach ($hours as $hour => $value) { |
|
129 | 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){ |
|
151 | + foreach ($minutes as $minute => $value) { |
|
152 | 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) . ")"); |
@@ -107,10 +107,10 @@ |
||
107 | 107 | $query_parameters .= ' OR '; |
108 | 108 | } |
109 | 109 | $query_parameters .= 'year IN (' . $year . ') '; |
110 | - $query_parameters .= 'AND month IN (' . implode("," ,array_keys($months)) . ') '; |
|
110 | + $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') '; |
|
111 | 111 | if (count($unit_ids) > 0) { |
112 | 112 | // Unit ids are defined so add this as a filter |
113 | - $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) . ') '; |
|
113 | + $query_parameters .= 'AND unit_id in (' . implode(",", $unit_ids) . ') '; |
|
114 | 114 | } |
115 | 115 | $year_count++; |
116 | 116 | } |
@@ -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,20 +53,20 @@ 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 | print_r("Event is: "); |
62 | - print_r($event->getStartDate()->format('Y-m-d H:i:s') ." to "); |
|
63 | - print_r($event->getEndDate()->format('Y-m-d H:i:s') ."\n"); |
|
62 | + print_r($event->getStartDate()->format('Y-m-d H:i:s') . " to "); |
|
63 | + print_r($event->getEndDate()->format('Y-m-d H:i:s') . "\n"); |
|
64 | 64 | print_r("Period is: "); |
65 | - print_r($dt->format('Y-m-d H:i:s') ."\n"); |
|
66 | - if ($event->dateIsInRange($dt)){ |
|
65 | + print_r($dt->format('Y-m-d H:i:s') . "\n"); |
|
66 | + if ($event->dateIsInRange($dt)) { |
|
67 | 67 | print_r("In range adding: " . $event->getValue() . " to event.\n"); |
68 | 68 | $value = $value + $event->getValue(); |
69 | - print_r("Current Value " .$value . "\n"); |
|
69 | + print_r("Current Value " . $value . "\n"); |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 | } |
@@ -134,10 +134,10 @@ discard block |
||
134 | 134 | $start = TRUE; |
135 | 135 | |
136 | 136 | // Cycle through each month |
137 | - foreach($daterange as $date) { |
|
137 | + foreach ($daterange as $date) { |
|
138 | 138 | |
139 | 139 | // Check if we have |
140 | - if (($date->format('Y-n') != $old_month) || ($start)) { |
|
140 | + if (($date->format('Y-n') != $old_month) || ($start)) { |
|
141 | 141 | |
142 | 142 | $year = $date->format("Y"); |
143 | 143 | $dayinterval = new \DateInterval('P1D'); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | } |
232 | 232 | |
233 | 233 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
234 | - if ($this->event->getEndDate()->format('H:i') == '23:59' ) { |
|
234 | + if ($this->event->getEndDate()->format('H:i') == '23:59') { |
|
235 | 235 | $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
236 | 236 | $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
237 | 237 | } else { |
@@ -259,14 +259,14 @@ discard block |
||
259 | 259 | |
260 | 260 | $counter = (int)$period_start->format('i'); |
261 | 261 | $start_minute = $counter; |
262 | - foreach($period as $minute) { |
|
262 | + foreach ($period as $minute) { |
|
263 | 263 | // Doing minutes so set the values in the minute array |
264 | - $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->event->getValue(); |
|
264 | + $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->event->getValue(); |
|
265 | 265 | // Let the hours know that it cannot determine availability |
266 | - $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1; |
|
266 | + $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
267 | 267 | $counter++; |
268 | 268 | |
269 | - if ($counter == 60 && $start_minute!==0) { |
|
269 | + if ($counter == 60 && $start_minute !== 0) { |
|
270 | 270 | // Not a real hour - leave as is and move on |
271 | 271 | $counter = 0; |
272 | 272 | $start_minute = 0; |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | // Did a real whole hour so initialize the hour |
276 | 276 | $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->event->getValue(); |
277 | 277 | // We have a whole hour so get rid of the minute info |
278 | - unset($itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]); |
|
278 | + unset($itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); |
|
279 | 279 | $counter = 0; |
280 | 280 | $start_minute = 0; |
281 | 281 | } |