|
@@ -49,47 +49,36 @@ class DashboardController extends AbstractController
|
|
|
$ajoutsParMois = $filmRepository->countAjoutsParMois();
|
|
|
|
|
|
$months = [];
|
|
|
- $entryCounts = [];
|
|
|
foreach ($ajoutsParMois as $data) {
|
|
|
- $months[] = $data['month'];
|
|
|
- $entryCounts[] = $data['entryCount'];
|
|
|
+ $months[$data['month']]['nbFilms'] = $data['entryCount'];
|
|
|
}
|
|
|
|
|
|
+ foreach ($commentairesParMois as $data) {
|
|
|
+ $months[$data['month']]['nbComs'] = $data['entryCount'];
|
|
|
+ }
|
|
|
+ ksort($months);
|
|
|
+
|
|
|
+ foreach($months as &$mois) {
|
|
|
+ if(!isset($mois['nbFilms'])) {
|
|
|
+ $mois['nbFilms'] = 0;
|
|
|
+ }
|
|
|
+ if (!isset($mois['nbComs'])) {
|
|
|
+ $mois['nbComs'] = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$chartDatesAjout->setData([
|
|
|
- 'labels' => $months,
|
|
|
+ 'labels' => array_keys($months),
|
|
|
'datasets' => [
|
|
|
[
|
|
|
'label' => 'Nombre de films ajoutés par mois',
|
|
|
- 'data' => $entryCounts
|
|
|
- ]
|
|
|
- ]
|
|
|
- ]);
|
|
|
-
|
|
|
- $chart->setOptions([
|
|
|
- 'scales' => [
|
|
|
- 'y' => [
|
|
|
- 'suggestedMin' => 0,
|
|
|
- 'suggestedMax' => 100,
|
|
|
+ 'data' => array_map(fn($value): int => $value['nbFilms'], $months)
|
|
|
],
|
|
|
- ],
|
|
|
- ]);
|
|
|
-
|
|
|
- $months = [];
|
|
|
- $entryCounts = [];
|
|
|
- foreach ($commentairesParMois as $data) {
|
|
|
- $months[] = $data['month'];
|
|
|
- $entryCounts[] = $data['entryCount'];
|
|
|
- }
|
|
|
-
|
|
|
- $chartCommentairesAjout = $chartBuilderInterface->createChart(Chart::TYPE_LINE);
|
|
|
- $chartCommentairesAjout->setData([
|
|
|
- 'labels' => $months,
|
|
|
- 'datasets' => [
|
|
|
[
|
|
|
- 'label' => 'Nombre de films ajoutés par mois',
|
|
|
- 'data' => $entryCounts
|
|
|
- ]
|
|
|
+ 'label' => 'Nombre de commentaires ajoutés par mois',
|
|
|
+ 'data' => array_map(fn($value): int => $value['nbComs'], $months)
|
|
|
+ ],
|
|
|
+
|
|
|
]
|
|
|
]);
|
|
|
|
|
@@ -104,8 +93,7 @@ class DashboardController extends AbstractController
|
|
|
|
|
|
return $this->render('dashboard/index.html.twig', [
|
|
|
'chart' => $chart,
|
|
|
- 'chartAjoutsParMois' => $chartDatesAjout,
|
|
|
- 'chartCommentairesAjouts' => $chartCommentairesAjout
|
|
|
+ 'chartDatesAjout' => $chartDatesAjout,
|
|
|
]);
|
|
|
}
|
|
|
}
|