@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $data = new Data(); |
35 | 35 | |
36 | 36 | /** @var \DateTime $endDate */ |
37 | - $endDate = $configuration['timePeriod']['end']?:null; |
|
37 | + $endDate = $configuration['timePeriod']['end'] ?: null; |
|
38 | 38 | |
39 | 39 | //There is added 23 hours 59 minutes 59 seconds to the end date to provide records for whole end date |
40 | 40 | $configuration['timePeriod']['end'] = $endDate !== null ? $endDate->add(new \DateInterval('PT23H59M59S')) : null; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $labels = []; |
92 | 92 | foreach ($labelsAux as $label) { |
93 | 93 | if (!in_array($label, ['MonthDate', 'YearDate', 'DateDate'])) { |
94 | - $labels[] = preg_replace('/(?!^)[A-Z]{2,}(?=[A-Z][a-z])|[A-Z][a-z]/', ' $0', (string)$label); |
|
94 | + $labels[] = preg_replace('/(?!^)[A-Z]{2,}(?=[A-Z][a-z])|[A-Z][a-z]/', ' $0', (string) $label); |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 | $data->setLabels($labels); |
@@ -165,16 +165,16 @@ discard block |
||
165 | 165 | foreach ($datas as $data) { |
166 | 166 | $date = new \DateTime($data[$labels[0]]); |
167 | 167 | $dateFormated = $date->format($configuration['timePeriod']['presentationFormat']); |
168 | - $currentDateMedia = isset($datesMedia[$dateFormated])?$datesMedia[$dateFormated]:array('quantity' => 0, 'media' => 0); |
|
169 | - $currentDateMedia['quantity'] = $currentDateMedia['quantity']+1; |
|
170 | - $currentDateMedia['media'] = $currentDateMedia['media']+$data[$labels[1]]; |
|
168 | + $currentDateMedia = isset($datesMedia[$dateFormated]) ? $datesMedia[$dateFormated] : array('quantity' => 0, 'media' => 0); |
|
169 | + $currentDateMedia['quantity'] = $currentDateMedia['quantity'] + 1; |
|
170 | + $currentDateMedia['media'] = $currentDateMedia['media'] + $data[$labels[1]]; |
|
171 | 171 | $datesMedia[$dateFormated] = $currentDateMedia; |
172 | 172 | } |
173 | 173 | $fetched = []; |
174 | 174 | foreach ($datesMedia as $date => $dateMedia) { |
175 | 175 | $fetched[] = [ |
176 | 176 | $labels[0] => $date, |
177 | - $labels[1] => round($dateMedia['media']/$dateMedia['quantity'], 1) |
|
177 | + $labels[1] => round($dateMedia['media'] / $dateMedia['quantity'], 1) |
|
178 | 178 | ]; |
179 | 179 | } |
180 | 180 | return $fetched; |