|
@@ -160,7 +160,7 @@ discard block |
|
|
block discarded – undo |
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 |
|
|
block discarded – undo |
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 |
|
|
block discarded – undo |
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 |
|
|
block discarded – undo |
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 |
|
|
block discarded – undo |
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
|
|
|
@@ -284,9 +284,9 @@ discard block |
|
|
block discarded – undo |
284
|
284
|
} |
285
|
285
|
|
286
|
286
|
// Doing minutes so set the values in the minute array |
287
|
|
- $itemized[EventItemizer::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour]['m' . $min] = $event_value; |
|
287
|
+ $itemized[EventItemizer::BAT_MINUTE][$year][$month]['d'.$day]['h'.$hour]['m'.$min] = $event_value; |
288
|
288
|
// Let the hours know that it cannot determine availability |
289
|
|
- $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = -1; |
|
289
|
+ $itemized[EventItemizer::BAT_HOUR][$year][$month]['d'.$day]['h'.$hour] = -1; |
290
|
290
|
$min++; |
291
|
291
|
|
292
|
292
|
if ($min == 60 && $start_minute !== 0) { |
|
@@ -297,7 +297,7 @@ discard block |
|
|
block discarded – undo |
297
|
297
|
} |
298
|
298
|
elseif ($min == 60 && $start_minute == 0) { |
299
|
299
|
// Did a real whole hour so initialize the hour |
300
|
|
- $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = $event_value; |
|
300
|
+ $itemized[EventItemizer::BAT_HOUR][$year][$month]['d'.$day]['h'.$hour] = $event_value; |
301
|
301
|
|
302
|
302
|
$min = 0; |
303
|
303
|
$hour++; |