@@ -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 | } |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, $this->event->endMonthDate($this->event->getStartDate())); |
161 | 161 | } |
162 | 162 | foreach ($dayrange as $day) { |
163 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
163 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | elseif ($this->event->isLastMonth($date)) { |
169 | 169 | $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, $this->event->getEndDate()); |
170 | 170 | foreach ($dayrange as $day) { |
171 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
171 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
172 | 172 | } |
173 | 173 | } |
174 | 174 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | else { |
177 | 177 | $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, new \DateTime($date->format("Y-n-t 23:59:59"))); |
178 | 178 | foreach ($dayrange as $day) { |
179 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
179 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
180 | 180 | } |
181 | 181 | } |
182 | 182 | } |
@@ -218,9 +218,9 @@ discard block |
||
218 | 218 | if (!($this->event->getStartDate()->format('H:i') == '00:00' && $this->event->getEndDate()->format('H:i') == '23:59')) { |
219 | 219 | $period = new \DatePeriod($start_date, $interval, $end_date->add(new \DateInterval('PT1M'))); |
220 | 220 | $itemized_same_day = $this->createHourlyGranular($period, $start_date); |
221 | - $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
|
222 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
223 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
221 | + $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1; |
|
222 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd]; |
|
223 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd]; |
|
224 | 224 | } |
225 | 225 | } |
226 | 226 | else { |
@@ -228,27 +228,27 @@ discard block |
||
228 | 228 | if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
229 | 229 | $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); |
230 | 230 | $itemized_start = $this->createHourlyGranular($start_period, $start_date); |
231 | - $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
|
232 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
233 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
231 | + $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1; |
|
232 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd]; |
|
233 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd]; |
|
234 | 234 | } |
235 | 235 | else { |
236 | 236 | // Just set an empty hour and minute |
237 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
|
238 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
|
237 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = array(); |
|
238 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = array(); |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
242 | 242 | if ($this->event->getEndDate()->format('H:i') == '23:59') { |
243 | - $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
|
244 | - $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
|
243 | + $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = array(); |
|
244 | + $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = array(); |
|
245 | 245 | } |
246 | 246 | else { |
247 | 247 | $end_period = new \DatePeriod(new \DateTime($end_date->format("Y-n-j 00:00:00")), $interval, $end_date->add(new \DateInterval('PT1M'))); |
248 | 248 | $itemized_end = $this->createHourlyGranular($end_period, new \DateTime($end_date->format("Y-n-j 00:00:00"))); |
249 | - $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1; |
|
250 | - $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed]; |
|
251 | - $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed]; |
|
249 | + $itemized[EventItemizer::BAT_DAY][$ey][$em]['d'.$ed] = -1; |
|
250 | + $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed]; |
|
251 | + $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed]; |
|
252 | 252 | } |
253 | 253 | } |
254 | 254 | |
@@ -270,9 +270,9 @@ discard block |
||
270 | 270 | $start_minute = $counter; |
271 | 271 | foreach ($period as $minute) { |
272 | 272 | // Doing minutes so set the values in the minute array |
273 | - $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(); |
|
273 | + $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(); |
|
274 | 274 | // Let the hours know that it cannot determine availability |
275 | - $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
275 | + $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')] = -1; |
|
276 | 276 | $counter++; |
277 | 277 | |
278 | 278 | if ($counter == 60 && $start_minute !== 0) { |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | } |
283 | 283 | elseif ($counter == 60 && $start_minute == 0) { |
284 | 284 | // Did a real whole hour so initialize the hour |
285 | - $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->event->getValue(); |
|
285 | + $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')] = $this->event->getValue(); |
|
286 | 286 | |
287 | 287 | $counter = 0; |
288 | 288 | $start_minute = 0; |
@@ -47,7 +47,7 @@ |
||
47 | 47 | $split_start_date = clone($new_end_date)->add(new \DateInterval('P1D')); |
48 | 48 | $split_end_date = $end_date; |
49 | 49 | |
50 | - $split_constraint = new MinMaxDaysConstraint($constraint->getUnits(), $constraint->getMinDays(), $constraint->getMaxDays(), $split_start_date, $split_end_date , $constraint->getCheckinDay()); |
|
50 | + $split_constraint = new MinMaxDaysConstraint($constraint->getUnits(), $constraint->getMinDays(), $constraint->getMaxDays(), $split_start_date, $split_end_date, $constraint->getCheckinDay()); |
|
51 | 51 | } |
52 | 52 | else { |
53 | 53 | $split_start_date = $split_constraint->getStartDate(); |