@@ -50,10 +50,10 @@ |
||
50 | 50 | |
51 | 51 | // рахуєм різницю в роках між першою датою графіка і останньою, щоб динамічно підлаштувати висоту канви |
52 | 52 | $firstDate = array_keys($data)[1]; // в 0-му елементі заголовки графіка. перша дата в 1-му |
53 | - $lastDate = array_keys($data)[count($data)-1]; |
|
53 | + $lastDate = array_keys($data)[count($data) - 1]; |
|
54 | 54 | |
55 | 55 | $years = (new \DateTime($lastDate))->format('Y') - (new \DateTime($firstDate))->format('Y') + 1; |
56 | - $chart->getOptions()->setHeight(200*$years); |
|
56 | + $chart->getOptions()->setHeight(200 * $years); |
|
57 | 57 | |
58 | 58 | $chart->getOptions()->getCalendar()->setCellSize(18); |
59 | 59 | $chart->getOptions()->getNoDataPattern()->setBackgroundColor('#76a7fa'); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | ; |
57 | 57 | |
58 | 58 | // fill the possible gap in sequence of dates |
59 | - $dateRange = new \DatePeriod($dateFrom, new \DateInterval('P1D'), $dateTo->modify( '+1 day' )); |
|
59 | + $dateRange = new \DatePeriod($dateFrom, new \DateInterval('P1D'), $dateTo->modify('+1 day')); |
|
60 | 60 | |
61 | 61 | $formattedResult = []; |
62 | 62 | foreach ($dateRange as $date) { |
@@ -182,12 +182,12 @@ discard block |
||
182 | 182 | $number = $oneDateData[1]; |
183 | 183 | |
184 | 184 | $key = $date->format("Y-W"); |
185 | - $oneEventResults[$key] = (isset($oneEventResults[$key])? $oneEventResults[$key]: 0) + $number; |
|
185 | + $oneEventResults[$key] = (isset($oneEventResults[$key]) ? $oneEventResults[$key] : 0) + $number; |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | // мержим отриману статистику івента в загальний масив результатів |
189 | - foreach(array_values($oneEventResults) as $week => $number) { |
|
190 | - if($week == $weeksMaxNumber) { |
|
189 | + foreach (array_values($oneEventResults) as $week => $number) { |
|
190 | + if ($week == $weeksMaxNumber) { |
|
191 | 191 | break; |
192 | 192 | } |
193 | 193 | $results[$week][$event->getId()] = $number; |
@@ -31,12 +31,12 @@ |
||
31 | 31 | $qb = $this->createQueryBuilder('t'); |
32 | 32 | |
33 | 33 | return $qb->join('t.event', 'e') |
34 | - ->where($qb->expr()->eq('e.active', ':active')) |
|
35 | - ->andWhere($qb->expr()->eq('t.user', ':user')) |
|
36 | - ->setParameters(['user' => $user, 'active' => true]) |
|
37 | - ->orderBy('e.date', 'ASC') |
|
38 | - ->getQuery() |
|
39 | - ->getResult(); |
|
34 | + ->where($qb->expr()->eq('e.active', ':active')) |
|
35 | + ->andWhere($qb->expr()->eq('t.user', ':user')) |
|
36 | + ->setParameters(['user' => $user, 'active' => true]) |
|
37 | + ->orderBy('e.date', 'ASC') |
|
38 | + ->getQuery() |
|
39 | + ->getResult(); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |