Commit 3876cdb5 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Correction d'oubli dans la partie dépouillage

parent e5fc865e
Loading
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@

namespace UnicaenEnquete\Controller;

use Atelier\Service\Inscription\InscriptionServiceAwareTrait;
use UnicaenEnquete\Entity\Db\Instance;
use UnicaenEnquete\Entity\Db\Question;
use UnicaenEnquete\Service\Enquete\EnqueteServiceAwareTrait;
use UnicaenEnquete\Service\Instance\InstanceServiceAwareTrait;
use UnicaenEnquete\Service\Resultat\ResultatServiceAwareTrait;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;
@@ -13,7 +13,7 @@ use Laminas\View\Model\ViewModel;
class ResultatController extends AbstractActionController
{
    use EnqueteServiceAwareTrait;
    use InscriptionServiceAwareTrait;
    use InstanceServiceAwareTrait;
    use ResultatServiceAwareTrait;


@@ -21,11 +21,11 @@ class ResultatController extends AbstractActionController
    {
        $enquete = $this->getEnqueteService()->getRequestedEnquete($this);

        $inscriptions = $this->getInscriptionService()->getInscriptions();
        $instances = $this->getInstanceService()->getInstances();

        $resultats = [];
        foreach ($inscriptions as $inscription) {
            if ($inscription->getEnquete() !== null && $inscription->getValidationEnquete() !== null) $resultats[] = $inscription;
        foreach ($instances as $instance) {
            if ($instance !== null && $instance->getValidationEnquete() !== null) $resultats[] = $instance;
        }

        [$counts, $results] = $this->getResultatService()->generateResultatArray($enquete, $resultats);
@@ -34,7 +34,7 @@ class ResultatController extends AbstractActionController
            'enquete' => $enquete,
            'results' => $results,
            'counts' => $counts,
            'elements' => $inscriptions,
            'elements' => $instances,
        ]);
    }
}
 No newline at end of file
+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

namespace UnicaenEnquete\Controller;

use Atelier\Service\Inscription\InscriptionService;
use UnicaenEnquete\Service\Enquete\EnqueteService;
use UnicaenEnquete\Service\Instance\InstanceService;
use UnicaenEnquete\Service\Resultat\ResultatService;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
@@ -20,16 +20,16 @@ class ResultatControllerFactory
    {
        /**
         * @var EnqueteService $enqueteService
         * @var InscriptionService $inscriptionService
         * @var InstanceService $instanceService
         * @var ResultatService $resultatService
         */
        $enqueteService = $container->get(EnqueteService::class);
        $inscriptionService = $container->get(InscriptionService::class);
        $instanceService = $container->get(InstanceService::class);
        $resultatService = $container->get(ResultatService::class);

        $controller = new ResultatController();
        $controller->setEnqueteService($enqueteService);
        $controller->setInscriptionService($inscriptionService);
        $controller->setInstanceService($instanceService);
        $controller->setResultatService($resultatService);

        return $controller;