Merge branch 'master' into feature/VSVGVQ-112

# Conflicts:
#	public/css/style.css.map

assets/scss/components/_footer.scss

@@ -9,7 +9,7 @@
 		height: auto;
 		max-height: 80px;
 		max-width: 150px;
-		margin-bottom: $global-margin;
+		margin: $global-margin/2 0;
 	}
 }
 
@@ -24,7 +24,7 @@
 	img {
 		height: auto;
 		max-width: 100%;
-		margin-bottom: $global-margin/2;
+		margin: $global-margin/4 0;
 	}
 }
 

assets/scss/components/_overrides.scss

@@ -137,6 +137,10 @@ input, button, select, optgroup, textarea {
     padding-left: 1em;
 }
 
+.fixed-table-pagination .dropdown-menu.show {
+    transform: translate3d(0px, -100%, 0px) !important;
+}
+
 .page-link {
     color: $color-primary;
     font-weight: bold;

config/routes.yaml

@@ -4,12 +4,36 @@
 accounts_view_index:
   path: /
   controller: VSV\GVQ_API\Account\Controllers\AccountViewController::index
+accounts_inschrijven:
+  path: /{_locale}/inschrijven
+  controller: VSV\GVQ_API\Account\Controllers\AccountViewController::register
+  methods: [GET, POST]
+  requirements:
+    _locale: nl
+accounts_inscription:
+  path: /{_locale}/inscription
+  controller: VSV\GVQ_API\Account\Controllers\AccountViewController::register
+  methods: [GET, POST]
+  requirements:
+    _locale: fr
 accounts_view_register:
   path: /{_locale}/view/accounts/register
   controller: VSV\GVQ_API\Account\Controllers\AccountViewController::register
   methods: [GET, POST]
   requirements:
     _locale: nl|fr
+accounts_info:
+  path: /{_locale}/info
+  controller: VSV\GVQ_API\Account\Controllers\AccountViewController::info
+  methods: [GET]
+  requirements:
+    _locale: nl|fr
+accounts_view_info:
+  path: /{_locale}/view/accounts/info
+  controller: VSV\GVQ_API\Account\Controllers\AccountViewController::info
+  methods: [GET]
+  requirements:
+    _locale: nl|fr
 accounts_view_register_success:
   path: /{_locale}/view/accounts/register/success
   controller: VSV\GVQ_API\Account\Controllers\AccountViewController::registerSuccess

config/services.yaml

@@ -247,6 +247,12 @@ services:
         $year: '@quiz_year'
         $allowedDelay: '@quiz_delay'
 
+    statistics_service:
+      class: VSV\GVQ_API\Statistics\Service\StatisticsService
+      arguments:
+        $startedQuizRepository: '@started_quiz_redis_repository'
+        $finishedQuizRepository: '@finished_quiz_redis_repository'
+
     ### CONTROLLERS ###
     VSV\GVQ_API\Account\Controllers\AccountController:
       arguments:
@@ -305,6 +311,8 @@ services:
       tags: ['controller.service_arguments']
 
     VSV\GVQ_API\Statistics\Controllers\StatisticsViewController:
+      arguments:
+        $statisticsService: '@statistics_service'
       tags: ['controller.service_arguments']
 
     VSV\GVQ_API\Dashboard\Controllers\DashboardViewController:

src/Account/Controllers/AccountViewController.php

@@ -192,6 +192,14 @@ public function register(Request $request): Response
         );
     }
 
+    /**
+     * @return Response
+     */
+    public function info(): Response
+    {
+        return $this->render('accounts/info.html.twig');
+    }
+
     /**
      * @return Response
      */

src/Quiz/ValueObjects/StatisticsKey.php

@@ -63,4 +63,21 @@ public static function createFromQuiz(Quiz $quiz): StatisticsKey
 
         return new StatisticsKey($statisticsKey);
     }
+
+    /**
+     * @return StatisticsKey[]
+     */
+    public static function getAllKeys(): array
+    {
+        return [
+            new StatisticsKey(self::INDIVIDUAL_NL),
+            new StatisticsKey(self::INDIVIDUAL_FR),
+            new StatisticsKey(self::PARTNER_NL),
+            new StatisticsKey(self::PARTNER_FR),
+            new StatisticsKey(self::COMPANY_NL),
+            new StatisticsKey(self::COMPANY_FR),
+            new StatisticsKey(self::CUP_NL),
+            new StatisticsKey(self::CUP_FR),
+        ];
+    }
 }

src/Statistics/Controllers/StatisticsViewController.php

@@ -4,14 +4,37 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
+use VSV\GVQ_API\Statistics\Service\StatisticsService;
 
 class StatisticsViewController extends AbstractController
 {
+    /**
+     * @var StatisticsService
+     */
+    private $statisticsService;
+
+    /**
+     * @param StatisticsService $statisticsService
+     */
+    public function __construct(StatisticsService $statisticsService)
+    {
+        $this->statisticsService = $statisticsService;
+    }
+
     /**
      * @return Response
      */
     public function statistics(): Response
     {
-        return $this->render('statistics/statistics.html.twig');
+        $startedCounts = $this->statisticsService->getStartedQuizCounts();
+        $finishedCounts = $this->statisticsService->getFinishedQuizCounts();
+
+        return $this->render(
+            'statistics/statistics.html.twig',
+            [
+                'startedCounts' => $startedCounts,
+                'finishedCounts' => $finishedCounts,
+            ]
+        );
     }
 }

src/Statistics/Service/StatisticsService.php

@@ -0,0 +1,95 @@
+<?php declare(strict_types=1);
+
+namespace VSV\GVQ_API\Statistics\Service;
+
+use VSV\GVQ_API\Quiz\Repositories\CounterRepository;
+use VSV\GVQ_API\Quiz\Repositories\FinishedQuizRepository;
+use VSV\GVQ_API\Quiz\Repositories\StartedQuizRepository;
+use VSV\GVQ_API\Quiz\ValueObjects\StatisticsKey;
+
+class StatisticsService
+{
+    /**
+     * @var StartedQuizRepository
+     */
+    private $startedQuizRepository;
+
+    /**
+     * @var FinishedQuizRepository
+     */
+    private $finishedQuizRepository;
+
+    /**
+     * @var StatisticsKey[]
+     */
+    private $statisticsKeys;
+
+    /**
+     * @param StartedQuizRepository $startedQuizRepository
+     * @param FinishedQuizRepository $finishedQuizRepository
+     */
+    public function __construct(
+        StartedQuizRepository $startedQuizRepository,
+        FinishedQuizRepository $finishedQuizRepository
+    ) {
+        $this->startedQuizRepository = $startedQuizRepository;
+        $this->finishedQuizRepository = $finishedQuizRepository;
+
+        $this->statisticsKeys = StatisticsKey::getAllKeys();
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getStartedQuizCounts(): array
+    {
+        return $this->getCountsFromRepository($this->startedQuizRepository);
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getFinishedQuizCounts(): array
+    {
+        return $this->getCountsFromRepository($this->finishedQuizRepository);
+    }
+
+    /**
+     * @param CounterRepository $counterRepository
+     * @return array
+     */
+    private function getCountsFromRepository(CounterRepository $counterRepository): array
+    {
+        $totalNL = 0;
+        $totalFR = 0;
+        $counts = [];
+
+        foreach ($this->statisticsKeys as $statisticsKey) {
+            $key = $statisticsKey->toNative();
+            $counts[$key] = $counterRepository->getCount($statisticsKey);
+            if (substr($key, -2) === 'nl') {
+                $totalNL += $counts[$key];
+            } else {
+                $totalFR += $counts[$key];
+            }
+
+            $totalKey = substr($key, 0, -2).'total';
+
+            if (key_exists($totalKey, $counts)) {
+                $counts[$totalKey] += $counts[$key];
+            } else {
+                $counts[$totalKey] = $counts[$key];
+            }
+        }
+
+        $counts['quiz_total_nl'] = $totalNL - $counts['cup_nl'];
+        $counts['quiz_total_fr'] = $totalFR - $counts['cup_fr'];
+        $counts['quiz_total'] = $counts['quiz_total_nl'] + $counts['quiz_total_fr'];
+        $counts['total_nl'] = $totalNL;
+        $counts['total_fr'] = $totalFR;
+        $counts['total'] = $totalNL + $totalFR;
+
+
+        return $counts;
+    }
+}