|
@@ -174,7 +174,7 @@ discard block |
|
|
block discarded – undo |
|
174
|
174
|
// Create a mock itemized event for the period in question - since event data is either |
|
175
|
175
|
// in the database or the default value we first create a mock event and then fill it in |
|
176
|
176
|
// accordingly |
|
177
|
|
- $mock_event = new Event($start_date, $end_date, new Unit(0,0), $this->default_value); |
|
|
177
|
+ $mock_event = new Event($start_date, $end_date, new Unit(0, 0), $this->default_value); |
|
178
|
178
|
$itemized = $mock_event->itemize(new EventItemizer($mock_event, $granularity)); |
|
179
|
179
|
|
|
180
|
180
|
// Cycle through each unit retrieved and provide it with a fully configured itemized mock event |
|
@@ -265,11 +265,11 @@ discard block |
|
|
block discarded – undo |
|
265
|
265
|
foreach ($days as $day => $hours) { |
|
266
|
266
|
foreach ($hours as $hour => $value) { |
|
267
|
267
|
if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
|
268
|
|
- $result[$year][$month][$day][$hour] = ((int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour]); |
|
|
268
|
+ $result[$year][$month][$day][$hour] = ((int)$db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour]); |
|
269
|
269
|
} |
|
270
|
270
|
else { |
|
271
|
271
|
// If nothing from db - then revert to the defaults |
|
272
|
|
- $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
|
272
|
+ $result[$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
273
|
273
|
} |
|
274
|
274
|
} |
|
275
|
275
|
} |
|
@@ -283,7 +283,7 @@ discard block |
|
|
block discarded – undo |
|
283
|
283
|
foreach ($months as $month => $days) { |
|
284
|
284
|
foreach ($days as $day => $hours) { |
|
285
|
285
|
foreach ($hours as $hour => $value) { |
|
286
|
|
- $result[$year][$month][$day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
|
286
|
+ $result[$year][$month][$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
287
|
287
|
} |
|
288
|
288
|
ksort($result[$year][$month][$day], SORT_NATURAL); |
|
289
|
289
|
} |
|
@@ -314,11 +314,11 @@ discard block |
|
|
block discarded – undo |
|
314
|
314
|
foreach ($hours as $hour => $minutes) { |
|
315
|
315
|
foreach ($minutes as $minute => $value) { |
|
316
|
316
|
if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
|
317
|
|
- $result[$year][$month][$day][$hour][$minute] = ((int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute]); |
|
|
317
|
+ $result[$year][$month][$day][$hour][$minute] = ((int)$db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute]); |
|
318
|
318
|
} |
|
319
|
319
|
else { |
|
320
|
320
|
// If nothing from db - then revert to the defaults |
|
321
|
|
- $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
|
321
|
+ $result[$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
322
|
322
|
} |
|
323
|
323
|
} |
|
324
|
324
|
} |
|
@@ -334,7 +334,7 @@ discard block |
|
|
block discarded – undo |
|
334
|
334
|
foreach ($days as $day => $hours) { |
|
335
|
335
|
foreach ($hours as $hour => $minutes) { |
|
336
|
336
|
foreach ($minutes as $minute => $value) { |
|
337
|
|
- $result[$year][$month][$day][$hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
|
337
|
+ $result[$year][$month][$day][$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
338
|
338
|
} |
|
339
|
339
|
ksort($result[$year][$month][$day][$hour], SORT_NATURAL); |
|
340
|
340
|
} |
|
@@ -396,12 +396,12 @@ discard block |
|
|
block discarded – undo |
|
396
|
396
|
// Value just switched - let us wrap up with current event and start a new one |
|
397
|
397
|
$normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
|
398
|
398
|
$start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
|
399
|
|
- $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
|
399
|
+ $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
400
|
400
|
$current_value = $minute_value; |
|
401
|
401
|
} |
|
402
|
402
|
if ($current_value === NULL) { |
|
403
|
403
|
// We are down to minutes and haven't created and event yet - do one now |
|
404
|
|
- $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
|
404
|
+ $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
405
|
405
|
$end_event = clone($start_event); |
|
406
|
406
|
} |
|
407
|
407
|
$current_value = $minute_value; |
|
@@ -544,7 +544,7 @@ discard block |
|
|
block discarded – undo |
|
544
|
544
|
* @return Unit |
|
545
|
545
|
*/ |
|
546
|
546
|
protected function getUnit($unit_id) { |
|
547
|
|
- $keyed = $this->keyUnitsById(); |
|
|
547
|
+ $keyed = $this->keyUnitsById(); |
|
548
|
548
|
return $keyed[$unit_id]; |
|
549
|
549
|
} |
|
550
|
550
|
|