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

Reparcours des pages liées aux modules

parent 637c4887
Loading
Loading
Loading
Loading
+91 −43
Changes for module/Formation/src/Formation/Controller/EnqueteQuestionController.php: 91 added lines, 43 removed lines.
Original line number Diff line number Diff line
@@ -7,29 +7,86 @@ use Doctrine\Common\Collections\ArrayCollection;
use Formation\Entity\Db\EnqueteCategorie;
use Formation\Entity\Db\EnqueteQuestion;
use Formation\Entity\Db\EnqueteReponse;
use Formation\Entity\Db\Inscription;
use Formation\Form\EnqueteCategorie\EnqueteCategorieFormAwareTrait;
use Formation\Form\EnqueteQuestion\EnqueteQuestionFormAwareTrait;
use Formation\Form\EnqueteReponse\EnqueteReponseFormAwareTrait;
use Formation\Service\EnqueteCategorie\EnqueteCategorieServiceAwareTrait;
use Formation\Service\EnqueteQuestion\EnqueteQuestionServiceAwareTrait;
use Formation\Service\EnqueteReponse\EnqueteReponseServiceAwareTrait;
use Formation\Service\Inscription\InscriptionServiceAwareTrait;
use Formation\Service\Session\SessionServiceAwareTrait;
use Laminas\View\Model\ViewModel;
use Laminas\Http\Response;
use UnicaenApp\Service\EntityManagerAwareTrait;
use Laminas\View\Model\ViewModel;

class EnqueteQuestionController extends AbstractController {
    use EntityManagerAwareTrait;
    use EnqueteCategorieServiceAwareTrait;
    use EnqueteQuestionServiceAwareTrait;
    use EnqueteReponseServiceAwareTrait;
    use InscriptionServiceAwareTrait;
    use SessionServiceAwareTrait;
    use EnqueteCategorieFormAwareTrait;
    use EnqueteQuestionFormAwareTrait;
    use EnqueteReponseFormAwareTrait;

    public function afficherQuestionsAction() {
    /** ENQUETE *******************************************************************************************************/

    public function afficherResultatsAction() : ViewModel
    {
        $session = $this->getSessionService()->getRepository()->getRequestedSession($this);

        $questions = $this->getEntityManager()->getRepository(EnqueteQuestion::class)->findAll();
        $questions = array_filter($questions, function (EnqueteQuestion $a) { return $a->estNonHistorise();});
        usort($questions, function (EnqueteQuestion $a, EnqueteQuestion $b) { return $a->getOrdre() > $b->getOrdre();});

        $reponses = $this->getEntityManager()->getRepository(EnqueteReponse::class)->findAll();

        //todo exploiter le filtre pour réduire
        if ($session) $reponses = array_filter($reponses, function (EnqueteReponse $r) use ($session) { return $r->getInscription()->getSession() === $session;});
        //todo fin

        $reponses = array_filter($reponses, function (EnqueteReponse $a) { return $a->estNonHistorise();});
        usort($reponses, function (EnqueteReponse $a, EnqueteReponse $b) { return $a->getQuestion()->getId() > $b->getQuestion()->getId();});

        /** PREP HISTOGRAMME $histogramme */
        $histogramme = [];
        foreach ($questions as $question) {
            $histogramme[$question->getId()] = [];
            foreach (EnqueteReponse::NIVEAUX as $clef => $value) $histogramme[$question->getId()][$clef] = 0;
        }

        $array = [];

        /** @var EnqueteReponse $reponse */
        foreach ($reponses as $reponse) {
            if ($reponse->getQuestion()->estNonHistorise()) {
                $question = $reponse->getQuestion()->getId();
                $inscription = $reponse->getInscription()->getId();

                $niveau = $reponse->getNiveau();
                $description = $reponse->getDescription();

                $array[$inscription]["Niveau_" . $question] = EnqueteReponse::NIVEAUX[$niveau];
                $array[$inscription]["Commentaire_" . $question] = $description;
                $histogramme[$question][$niveau]++;
            }
        }

        $categories = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->findAll();
        return new ViewModel([
            "array" => $array,
            "histogramme" => $histogramme,
            "nbReponses" => count($array),
            "questions" => $questions,
            "categories" => $categories,
        ]);
    }

    /** QUESTIONS *****************************************************************************************************/

    public function afficherQuestionsAction() : ViewModel
    {
        $questions = $this->getEntityManager()->getRepository(EnqueteQuestion::class)->findAll();
        $categories = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->findAll();

@@ -39,8 +96,8 @@ class EnqueteQuestionController extends AbstractController {
        ]);
    }

    public function ajouterCategorieAction() {

    public function ajouterCategorieAction() : ViewModel
    {
        $question = new EnqueteCategorie();

        $form = $this->getEnqueteCategorieForm();
@@ -64,10 +121,9 @@ class EnqueteQuestionController extends AbstractController {
        return $vm;
    }

    public function modifierCategorieAction() {

        /** @var EnqueteCategorie $categorie */
        $categorie = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->getRequestedEnqueteCategorie($this);
    public function modifierCategorieAction() : ViewModel
    {
        $categorie = $this->getEnqueteCategorieService()->getRepository()->getRequestedEnqueteCategorie($this);

        $form = $this->getEnqueteCategorieForm();
        $form->setAttribute('action', $this->url()->fromRoute('formation/enquete/categorie/modifier', ['categorie' => $categorie->getId()], [], true));
@@ -90,26 +146,22 @@ class EnqueteQuestionController extends AbstractController {
        return $vm;
    }

    public function historiserCategorieAction()
    public function historiserCategorieAction() : Response
    {
        /** @var EnqueteCategorie $categorie */
        $categorie = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->getRequestedEnqueteCategorie($this);
        $retour = $this->params()->fromQuery('retour');

        $categorie = $this->getEnqueteCategorieService()->getRepository()->getRequestedEnqueteCategorie($this);
        $this->getEnqueteCategorieService()->historise($categorie);

        $retour = $this->params()->fromQuery('retour');
        if ($retour) return $this->redirect()->toUrl($retour);
        return $this->redirect()->toRoute('formation/enquete/question', [], [], true);
    }

    public function restaurerCategorieAction()
    public function restaurerCategorieAction() : Response
    {
        /** @var EnqueteCategorie $categorie */
        $categorie = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->getRequestedEnqueteCategorie($this);
        $retour = $this->params()->fromQuery('retour');

        $categorie = $this->getEnqueteCategorieService()->getRepository()->getRequestedEnqueteCategorie($this);
        $this->getEnqueteCategorieService()->restore($categorie);

        $retour = $this->params()->fromQuery('retour');
        if ($retour) return $this->redirect()->toUrl($retour);
        return $this->redirect()->toRoute('formation/enquete/question', [], [], true);
    }
@@ -117,7 +169,7 @@ class EnqueteQuestionController extends AbstractController {
    public function supprimerCategorieAction()
    {
        /** @var EnqueteCategorie|null $categorie */
        $categorie = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->getRequestedEnqueteCategorie($this);
        $categorie = $this->getEnqueteCategorieService()->getRepository()->getRequestedEnqueteCategorie($this);

        $request = $this->getRequest();
        if ($request->isPost()) {
@@ -138,7 +190,7 @@ class EnqueteQuestionController extends AbstractController {
        return $vm;
    }

    public function ajouterQuestionAction() {
    public function ajouterQuestionAction() : ViewModel {

        $question = new EnqueteQuestion();

@@ -163,10 +215,9 @@ class EnqueteQuestionController extends AbstractController {
        return $vm;
    }

    public function modifierQuestionAction() {

        /** @var EnqueteQuestion $question */
        $question = $this->getEntityManager()->getRepository(EnqueteQuestion::class)->getRequestedEnqueteQuestion($this);
    public function modifierQuestionAction() : ViewModel
    {
        $question = $this->getEnqueteQuestionService()->getRepository()->getRequestedEnqueteQuestion($this);

        $form = $this->getEnqueteQuestionForm();
        $form->setAttribute('action', $this->url()->fromRoute('formation/enquete/question/modifier', ['question' => $question->getId()], [], true));
@@ -189,34 +240,29 @@ class EnqueteQuestionController extends AbstractController {
        return $vm;
    }

    public function historiserQuestionAction()
    public function historiserQuestionAction() : Response
    {
        /** @var EnqueteQuestion $question */
        $question = $this->getEntityManager()->getRepository(EnqueteQuestion::class)->getRequestedEnqueteQuestion($this);
        $retour = $this->params()->fromQuery('retour');

        $question = $this->getEnqueteQuestionService()->getRepository()->getRequestedEnqueteQuestion($this);
        $this->getEnqueteQuestionService()->historise($question);

        $retour = $this->params()->fromQuery('retour');
        if ($retour) return $this->redirect()->toUrl($retour);
        return $this->redirect()->toRoute('formation/enquete/question', [], [], true);
    }

    public function restaurerQuestionAction()
    public function restaurerQuestionAction() : Response
    {
        /** @var EnqueteQuestion $question */
        $question = $this->getEntityManager()->getRepository(EnqueteQuestion::class)->getRequestedEnqueteQuestion($this);
        $retour = $this->params()->fromQuery('retour');

        $question = $this->getEnqueteQuestionService()->getRepository()->getRequestedEnqueteQuestion($this);
        $this->getEnqueteQuestionService()->restore($question);

        $retour = $this->params()->fromQuery('retour');
        if ($retour) return $this->redirect()->toUrl($retour);
        return $this->redirect()->toRoute('formation/enquete/question', [], [], true);
    }

    public function supprimerQuestionAction()
    public function supprimerQuestionAction() : ViewModel
    {
        /** @var EnqueteQuestion|null $question */
        $question = $this->getEntityManager()->getRepository(EnqueteQuestion::class)->getRequestedEnqueteQuestion($this);
        $question = $this->getEnqueteQuestionService()->getRepository()->getRequestedEnqueteQuestion($this);

        $request = $this->getRequest();
        if ($request->isPost()) {
@@ -237,18 +283,20 @@ class EnqueteQuestionController extends AbstractController {
        return $vm;
    }

    public function repondreQuestionsAction()
    /** REPONSES ******************************************************************************************************/

    public function repondreQuestionsAction() : ViewModel
    {
        /** @var Inscription $inscription */
        $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this);
        $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this);

        /** @var EnqueteQuestion[] $questions */
        $questions = $this->getEntityManager()->getRepository(EnqueteQuestion::class)->findAll();
        $questions = array_filter($questions, function (EnqueteQuestion $a) { return $a->estNonHistorise();});
        $dictionnaireQuestion = [];
        foreach ($questions as $question) $dictionnaireQuestion[$question->getId()] = $question;
        usort($questions, function (EnqueteQuestion $a, EnqueteQuestion $b) { return $a->getOrdre() > $b->getOrdre();});
        /** @var EnqueteReponse[] $reponses */
        $reponses = $this->getEntityManager()->getRepository(EnqueteReponse::class)->findEnqueteReponseByInscription($inscription);

        $reponses = $this->getEnqueteReponseService()->getRepository()->findEnqueteReponseByInscription($inscription);
        $reponses = array_filter($reponses, function (EnqueteReponse $a) { return $a->estNonHistorise();});
        $dictionnaireReponse = [];
        foreach ($reponses as $reponse) $dictionnaireReponse[$reponse->getQuestion()->getId()] = $reponse;
+8 −0
Changes for module/Formation/src/Formation/Controller/EnqueteQuestionControllerFactory.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ use Formation\Form\EnqueteReponse\EnqueteReponseForm;
use Formation\Service\EnqueteCategorie\EnqueteCategorieService;
use Formation\Service\EnqueteQuestion\EnqueteQuestionService;
use Formation\Service\EnqueteReponse\EnqueteReponseService;
use Formation\Service\Inscription\InscriptionService;
use Formation\Service\Session\SessionService;
use Interop\Container\ContainerInterface;

class EnqueteQuestionControllerFactory {
@@ -23,11 +25,15 @@ class EnqueteQuestionControllerFactory {
         * @var EntityManager $entityManager
         * @var EnqueteCategorieService $enqueteCategorieService
         * @var EnqueteReponseService $enqueteReponseService
         * @var InscriptionService $inscriptionService
         * @var SessionService $sessionService
         */
        $entityManager = $container->get('doctrine.entitymanager.orm_default');
        $enqueteCategorieService = $container->get(EnqueteCategorieService::class);
        $enqueteQuestionService = $container->get(EnqueteQuestionService::class);
        $enqueteReponseService = $container->get(EnqueteReponseService::class);
        $inscriptionService = $container->get(InscriptionService::class);
        $sessionService = $container->get(SessionService::class);

        /**
         * @var EnqueteCategorieForm $enqueteCategorieForm
@@ -43,6 +49,8 @@ class EnqueteQuestionControllerFactory {
        $controller->setEnqueteCategorieService($enqueteCategorieService);
        $controller->setEnqueteQuestionService($enqueteQuestionService);
        $controller->setEnqueteReponseService($enqueteReponseService);
        $controller->setInscriptionService($inscriptionService);
        $controller->setSessionService($sessionService);
        $controller->setEnqueteCategorieForm($enqueteCategorieForm);
        $controller->setEnqueteQuestionForm($enqueteQuestionForm);
        $controller->setEnqueteReponseForm($enqueteReponseForm);
+11 −25
Changes for module/Formation/src/Formation/Controller/ModuleController.php: 11 added lines, 25 removed lines.
Original line number Diff line number Diff line
@@ -3,25 +3,29 @@
namespace Formation\Controller;

use Application\Controller\AbstractController;
use Formation\Entity\Db\Formation;
use Formation\Entity\Db\Module;
use Formation\Form\Module\ModuleFormAwareTrait;
use Formation\Service\Formation\FormationServiceAwareTrait;
use Formation\Service\Module\ModuleServiceAwareTrait;
use Laminas\Http\Response;
use UnicaenApp\Service\EntityManagerAwareTrait;
use Laminas\View\Model\ViewModel;
use UnicaenApp\Service\EntityManagerAwareTrait;

class ModuleController extends AbstractController {
class ModuleController extends AbstractController
{
    use EntityManagerAwareTrait;
    use FormationServiceAwareTrait;
    use ModuleServiceAwareTrait;
    use ModuleFormAwareTrait;

    public function afficherAction()
    public function afficherAction(): ViewModel
    {
        $module = $this->getModuleService()->getRepository()->getRequestedModule($this);
        $formations = $this->getFormationService()->getRepository()->fetchFormationsByModule($module, 'libelle', 'asc', true);

        return new ViewModel([
            'module' => $module,
            'formations' => $formations,
        ]);
    }

@@ -121,37 +125,19 @@ class ModuleController extends AbstractController {

    public function catalogueAction(): ViewModel
    {
        /** @var Module[] $modules */
        $modules = $this->getEntityManager()->getRepository(Module::class)->findAll();
        usort($modules, function (Module $a, Module $b) { return $a->getLibelle() > $b->getLibelle(); });
        /** @var Formation[] $formations */
        $formations = $this->getEntityManager()->getRepository(Formation::class)->findAll();
        $modules = $this->getModuleService()->getRepository()->getModules();

        $catalogue = [];
        foreach ($modules as $module) {
            if ($module->estNonHistorise()) {
                $liste = [];
                foreach ($formations as $formation) {
                    if ($formation->estNonHistorise() AND $formation->getModule() === $module) {
                        $liste[] = $formation;
                    }
                }
                usort($liste, function (Formation $a, Formation $b) { return $a->getLibelle() > $b->getLibelle();});

                $liste = $this->getFormationService()->getRepository()->fetchFormationsByModule($module);
                $catalogue[$module->getId()]["module"] = $module;
                $catalogue[$module->getId()]["formations"] = $liste;
            }
        }

        {
            $liste = [];
            foreach ($formations as $formation) {
                if ($formation->estNonHistorise() AND $formation->getModule() === null) {
                    $liste[] = $formation;
                }
            }
            usort($liste, function (Formation $a, Formation $b) { return $a->getLibelle() > $b->getLibelle();});

            $liste = $this->getFormationService()->getRepository()->fetchFormationsByModule(null);
            $catalogue[-1]["module"] = null;
            $catalogue[-1]["formations"] = $liste;
        }
+4 −0
Changes for module/Formation/src/Formation/Controller/ModuleControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Formation\Controller;

use Doctrine\ORM\EntityManager;
use Formation\Form\Module\ModuleForm;
use Formation\Service\Formation\FormationService;
use Formation\Service\Module\ModuleService;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerExceptionInterface;
@@ -21,9 +22,11 @@ class ModuleControllerFactory {
    {
        /**
         * @var EntityManager $entityManager
         * @var FormationService $formationService
         * @var ModuleService $moduleService
         */
        $entityManager = $container->get('doctrine.entitymanager.orm_default');
        $formationService = $container->get(FormationService::class);
        $moduleService = $container->get(ModuleService::class);

        /**
@@ -33,6 +36,7 @@ class ModuleControllerFactory {

        $controller = new ModuleController();
        $controller->setEntityManager($entityManager);
        $controller->setFormationService($formationService);
        $controller->setModuleService($moduleService);
        $controller->setModuleForm($moduleForm);
        return $controller;
+3 −3
Changes for module/Formation/src/Formation/Entity/Db/Module.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ class Module implements HistoriqueAwareInterface
    use HistoriqueAwareTrait;

    private int $id;
    private ?string $libelle;
    private ?string $description;
    private ?string $lien;
    private ?string $libelle = null;
    private ?string $description = null;
    private ?string $lien = null;
    private Collection $formations;

    /**
Loading