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

Premier lot de correctif suite à la visio du 11/07/2022

parent 9fe60959
Loading
Loading
Loading
Loading
+12 −0
Changes for module/Formation/config/others/enquete.config.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ return [
                    'controller' => EnqueteQuestionController::class,
                    'action' => [
                        'repondre-questions',
                        'valider-questions',
                    ],
                    'privileges' => [
                        EnquetePrivileges::ENQUETE_REPONSE_REPONDRE,
@@ -312,6 +313,17 @@ return [
                                    ],
                                ],
                            ],
                            'valider-questions' => [
                                'type'  => Segment::class,
                                'may_terminate' => true,
                                'options' => [
                                    'route'    => '/valider-questions/:inscription',
                                    'defaults' => [
                                        'controller' => EnqueteQuestionController::class,
                                        'action'     => 'valider-questions',
                                    ],
                                ],
                            ],
                        ],
                    ],
                ],
+27 −0
Changes for module/Formation/src/Formation/Controller/EnqueteQuestionController.php: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace Formation\Controller;

use Application\Controller\AbstractController;
use DateTime;
use Doctrine\Common\Collections\ArrayCollection;
use Formation\Entity\Db\EnqueteCategorie;
use Formation\Entity\Db\EnqueteQuestion;
@@ -338,4 +339,30 @@ class EnqueteQuestionController extends AbstractController {
            'form' => $form,
        ]);
    }

    public function validerQuestionsAction() : ViewModel
    {
        $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this);

        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            if ($data["reponse"] === "oui") {
                $inscription->setValidationEnquete(new DateTime());
                $this->getInscriptionService()->update($inscription);
            }
            exit();
        }

        $vm = new ViewModel();
        if ($inscription !== null) {
            $vm->setTemplate('formation/default/confirmation');
            $vm->setVariables([
                'title' => "Validation de l'enquête",
                'text' => "La validation est définitive, après celle-ci vous ne pourrez pas revenir sur l'enquête. <br/> Êtes-vous sûr·e de vouloir continuer ?",
                'action' => $this->url()->fromRoute('formation/enquete/valider-questions', ["inscription" => $inscription->getId()], [], true),
            ]);
        }
        return $vm;
    }
}
 No newline at end of file
+0 −9
Changes for module/Formation/src/Formation/Controller/IndexController.php: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ namespace Formation\Controller;
use Application\Controller\AbstractController;
use Doctorant\Entity\Db\Doctorant;
use Individu\Entity\Db\Individu;
use Formation\Entity\Db\EnqueteReponse;
use Formation\Entity\Db\Inscription;
use Formation\Entity\Db\Session;
use UnicaenApp\Service\EntityManagerAwareTrait;
@@ -37,17 +36,10 @@ class IndexController extends AbstractController
            $preparations = array_filter($sessions, function(Session $a) { return $a->getEtat()->getCode() === Session::ETAT_PREPARATION;});
            /** @var Inscription[] $inscription */
            $inscriptions = $this->getEntityManager()->getRepository(Inscription::class)->findInscriptionsByDoctorant($doctorant);
            /** @var EnqueteReponse[] $reponses */
            $reponses = $this->getEntityManager()->getRepository(EnqueteReponse::class)->findEnqueteReponseByDoctorant($doctorant);
            $resultats = [];
            foreach ($reponses as $reponse) {
                if ($reponse->estNonHistorise()) $resultats[$reponse->getInscription()->getId()][] = $reponse;
            }
        } else {
            $ouvertes = [];
            $preparations = [];
            $inscriptions = [];
            $resultats = [];
        }

        return new ViewModel([
@@ -55,7 +47,6 @@ class IndexController extends AbstractController
            'ouvertes' => $ouvertes,
            'preparations' => $preparations,
            'inscriptions' => $inscriptions,
            'resultats' => $resultats,
        ]);
    }

+21 −6
Changes for module/Formation/src/Formation/Controller/SessionController.php: 21 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Entity\Db\These;
use Formation\Service\Formation\FormationServiceAwareTrait;
use Formation\Service\Presence\PresenceServiceAwareTrait;
use Laminas\Http\Response;
use Notification\Exception\NotificationException;
use Structure\Service\Etablissement\EtablissementServiceAwareTrait;
use Application\Service\File\FileServiceAwareTrait;
use DateTime;
@@ -47,7 +48,7 @@ class SessionController extends AbstractController
        $this->renderer = $renderer;
    }

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

@@ -81,6 +82,7 @@ class SessionController extends AbstractController
            $form->setData($data);
            if ($form->isValid()) {
                $this->getSessionService()->create($session);
                /** @var Etat $enPrepration */
                $enPrepration = $this->getEntityManager()->getRepository(Etat::class)->findOneBy(["code" => Etat::CODE_PREPARATION]);
                $session->setEtat($enPrepration);
                $this->getSessionService()->update($session);
@@ -163,6 +165,9 @@ class SessionController extends AbstractController
        return $vm;
    }

    /**
     * @throws NotificationException
     */
    public function changerEtatAction()
    {
        $session = $this->getSessionService()->getRepository()->getRequestedSession($this);
@@ -187,13 +192,18 @@ class SessionController extends AbstractController
            if ($etat !== null) {
                $session->setEtat($etat);
                $this->getSessionService()->update($session);
                //todo ceci est un test ...
                if ($session->getEtat()->getCode() === Etat::CODE_FERME) {

                switch ($session->getEtat()->getCode()) {
                    case Etat::CODE_FERME :
                        $this->getNotificationService()->triggerSessionImminente($session);
                        $this->getNotificationService()->triggerInscriptionEchec($session);
                }
                if ($session->getEtat()->getCode() === Etat::CODE_CLOTURER) {
                        break;
                    case Etat::CODE_CLOTURER :
                        $this->getNotificationService()->triggerSessionTerminee($session);
                        break;
                    case Etat::CODE_ANNULEE :
                        $this->getNotificationService()->triggerSessionAnnulee($session);
                        break;
                }
            }
        }
@@ -205,6 +215,9 @@ class SessionController extends AbstractController
        ]);
    }

    /**
     * @throws NotificationException
     */
    public function classerInscriptionsAction() : Response
    {
        $session = $this->getSessionService()->getRepository()->getRequestedSession($this);
@@ -265,7 +278,7 @@ class SessionController extends AbstractController
    {
        $session = $this->getSessionService()->getRepository()->getRequestedSession($this);

        $headers = ['Liste', 'Dénomination étudiant', 'Adresse électronique', 'Établissement', 'École doctorale', 'Unité de recherche'];
        $headers = ['Liste', 'Dénomination étudiant', 'Adresse électronique', 'Établissement', 'École doctorale', 'Unité de recherche', 'Desinscription', 'Motif de desinscription'];

        $inscriptions = $session->getInscriptions()->toArray();
        $records = [];
@@ -283,6 +296,8 @@ class SessionController extends AbstractController
                'Établissement' => implode("/",$etablissements),
                'École doctorale' => implode("/",$ecoles),
                'Unité de recherche' => implode("/",$unites),
                'Desinscription' => $inscription->getHistoDestruction()->format('d/m/Y'),
                'Motif de desinscription' => $inscription->getDescription(),
            ];
            $records[] = $entry;
        }
+5 −4
Changes for module/Formation/src/Formation/Entity/Db/EnqueteReponse.php: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -9,11 +9,12 @@ class EnqueteReponse implements HistoriqueAwareInterface {
    use HistoriqueAwareTrait;

    const NIVEAUX = [
        1 => "Pas satisfait",
        2 => "Peu satisfait",
        3 => "Sans Avis",
        4 => "Assez satisfait",
        5 => "Très satisfait",
        4 => "Assez satisfait",
        3 => "Sans Avis",
        2 => "Peu satisfait",
        1 => "Pas satisfait",

    ];

    /** @var int */
Loading