|
@@ -129,8 +129,7 @@ discard block |
|
|
block discarded – undo |
|
129
|
129
|
// We add a minute to compensate |
|
130
|
130
|
elseif (($this->event->getStartDate()->format('Y-m-d H:i') == $this->event->getEndDate()->format('Y-m-d H:i')) && $this->granularity == EventItemizer::BAT_DAILY) { |
|
131
|
131
|
$adjusted_end_day = new \DateTime($this->event->getEndDate()->add(new \DateInterval('PT1M'))->format('Y-m-d H:i')); |
|
132
|
|
- } |
|
133
|
|
- else { |
|
|
132
|
+ } else { |
|
134
|
133
|
$adjusted_end_day = new \DateTime($this->event->getEndDate()->format('Y-m-d H:i')); |
|
135
|
134
|
} |
|
136
|
135
|
|
|
@@ -221,16 +220,14 @@ discard block |
|
|
block discarded – undo |
|
221
|
220
|
$itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
222
|
221
|
$itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
223
|
222
|
} |
|
224
|
|
- } |
|
225
|
|
- else { |
|
|
223
|
+ } else { |
|
226
|
224
|
// Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
|
227
|
225
|
if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
|
228
|
226
|
$itemized_start = $this->createHourlyGranular($start_date, new \DateTime($start_date->format("Y-n-j 23:59:59")), $interval); |
|
229
|
227
|
$itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
|
230
|
228
|
$itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
231
|
229
|
$itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
232
|
|
- } |
|
233
|
|
- else { |
|
|
230
|
+ } else { |
|
234
|
231
|
// Just set an empty hour and minute |
|
235
|
232
|
$itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
|
236
|
233
|
$itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
|
@@ -240,8 +237,7 @@ discard block |
|
|
block discarded – undo |
|
240
|
237
|
if ($this->event->getEndDate()->format('H:i') == '23:59') { |
|
241
|
238
|
$itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
|
242
|
239
|
$itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
|
243
|
|
- } |
|
244
|
|
- else { |
|
|
240
|
+ } else { |
|
245
|
241
|
$itemized_end = $this->createHourlyGranular(new \DateTime($end_date->format("Y-n-j 00:00:00")), $end_date->add(new \DateInterval('PT1M')), $interval); |
|
246
|
242
|
$itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1; |
|
247
|
243
|
$itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed]; |
|
@@ -297,8 +293,7 @@ discard block |
|
|
block discarded – undo |
|
297
|
293
|
$min = 0; |
|
298
|
294
|
$hour++; |
|
299
|
295
|
$start_minute = 0; |
|
300
|
|
- } |
|
301
|
|
- elseif ($min == 60 && $start_minute == 0) { |
|
|
296
|
+ } elseif ($min == 60 && $start_minute == 0) { |
|
302
|
297
|
// Did a real whole hour so initialize the hour |
|
303
|
298
|
$itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = $event_value; |
|
304
|
299
|
|