Ajustement enquete (b9f100ca) · Commits · open-source / sygal

doc/release-notes/v5.2.X.md

+1 −2

Changes for doc/release-notes/v5.2.X.md: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -115,8 +115,7 @@ WITH d(code, lib, description, possible, valeur, ordre) AS (
		)
		SELECT cp.id, d.code, d.lib, d.description, d.possible, d.valeur, d.ordre
		FROM d
		JOIN unicaen_parametre_categorie cp ON cp.CODE = 'SOUTENANCE'

		JOIN unicaen_parametre_categorie cp ON cp.CODE = 'SOUTENANCE';

		INSERT INTO unicaen_parametre_categorie (code, libelle, description, ordre)
		VALUES ('FORMATION', 'Gestion des paramètres du module Formation', null, 900);

module/Formation/src/Formation/Controller/EnqueteQuestionController.php

+9 −0

Changes for module/Formation/src/Formation/Controller/EnqueteQuestionController.php: 9 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 DateInterval;
		use DateTime;
		use Doctrine\Common\Collections\ArrayCollection;
		use Formation\Entity\Db\EnqueteCategorie;
		@@ -11,6 +12,7 @@ use Formation\Entity\Db\EnqueteReponse;
		use Formation\Form\EnqueteCategorie\EnqueteCategorieFormAwareTrait;
		use Formation\Form\EnqueteQuestion\EnqueteQuestionFormAwareTrait;
		use Formation\Form\EnqueteReponse\EnqueteReponseFormAwareTrait;
		use Formation\Provider\Parametre\FormationParametres;
		use Formation\Service\EnqueteCategorie\EnqueteCategorieServiceAwareTrait;
		use Formation\Service\EnqueteQuestion\EnqueteQuestionServiceAwareTrait;
		use Formation\Service\EnqueteReponse\EnqueteReponseServiceAwareTrait;
		@@ -19,6 +21,7 @@ use Formation\Service\Session\SessionServiceAwareTrait;
		use Laminas\Http\Response;
		use UnicaenApp\Service\EntityManagerAwareTrait;
		use Laminas\View\Model\ViewModel;
		use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait;

		class EnqueteQuestionController extends AbstractController {
		use EntityManagerAwareTrait;
		@@ -26,6 +29,7 @@ class EnqueteQuestionController extends AbstractController {
		use EnqueteQuestionServiceAwareTrait;
		use EnqueteReponseServiceAwareTrait;
		use InscriptionServiceAwareTrait;
		use ParametreServiceAwareTrait;
		use SessionServiceAwareTrait;
		use EnqueteCategorieFormAwareTrait;
		use EnqueteQuestionFormAwareTrait;
		@@ -338,11 +342,16 @@ class EnqueteQuestionController extends AbstractController {

		$categories = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->findAll();

		$delai = $this->getParametreService()->getParametreByCode(FormationParametres::CATEGORIE, FormationParametres::DELAI_ENQUETE)->getValeur();
		$date = DateTime::createFromFormat('d/m/Y', $inscription->getSession()->getDateFin()->format('d/m/Y'));
		$date->add(new DateInterval('P'.$delai.'D'));

		return new ViewModel([
		'inscription' => $inscription,
		'questions' => $questions,
		'categories' => $categories,
		'form' => $form,
		'date' => $date,
		]);
		}

module/Formation/src/Formation/Controller/EnqueteQuestionControllerFactory.php

+8 −2

Changes for module/Formation/src/Formation/Controller/EnqueteQuestionControllerFactory.php: 8 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,12 +12,15 @@ use Formation\Service\EnqueteReponse\EnqueteReponseService;
		use Formation\Service\Inscription\InscriptionService;
		use Formation\Service\Session\SessionService;
		use Interop\Container\ContainerInterface;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use UnicaenParametre\Service\Parametre\ParametreService;

		class EnqueteQuestionControllerFactory {

		/**
		* @throws \Psr\Container\NotFoundExceptionInterface
		* @throws \Psr\Container\ContainerExceptionInterface
		* @throws NotFoundExceptionInterface
		* @throws ContainerExceptionInterface
		*/
		public function __invoke(ContainerInterface $container) : EnqueteQuestionController
		{
		@@ -26,6 +29,7 @@ class EnqueteQuestionControllerFactory {
		* @var EnqueteCategorieService $enqueteCategorieService
		* @var EnqueteReponseService $enqueteReponseService
		* @var InscriptionService $inscriptionService
		* @var ParametreService $parametreService
		* @var SessionService $sessionService
		*/
		$entityManager = $container->get('doctrine.entitymanager.orm_default');
		@@ -33,6 +37,7 @@ class EnqueteQuestionControllerFactory {
		$enqueteQuestionService = $container->get(EnqueteQuestionService::class);
		$enqueteReponseService = $container->get(EnqueteReponseService::class);
		$inscriptionService = $container->get(InscriptionService::class);
		$parametreService = $container->get(ParametreService::class);
		$sessionService = $container->get(SessionService::class);

		/**
		@@ -50,6 +55,7 @@ class EnqueteQuestionControllerFactory {
		$controller->setEnqueteQuestionService($enqueteQuestionService);
		$controller->setEnqueteReponseService($enqueteReponseService);
		$controller->setInscriptionService($inscriptionService);
		$controller->setParametreService($parametreService);
		$controller->setSessionService($sessionService);
		$controller->setEnqueteCategorieForm($enqueteCategorieForm);
		$controller->setEnqueteQuestionForm($enqueteQuestionForm);

module/Formation/src/Formation/Controller/IndexControllerFactory.php

+4 −0

Changes for module/Formation/src/Formation/Controller/IndexControllerFactory.php: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ use Doctrine\ORM\EntityManager;
		use Interop\Container\ContainerInterface;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use UnicaenParametre\Service\Parametre\ParametreService;

		class IndexControllerFactory {

		@@ -21,13 +22,16 @@ class IndexControllerFactory {
		/**
		* @var EntityManager $entityManager
		* @var DoctorantService $doctorantService
		* @var ParametreService $parametreService
		*/
		$entityManager = $container->get('doctrine.entitymanager.orm_default');
		$doctorantService = $container->get(DoctorantService::class);
		$parametreService = $container->get(ParametreService::class);

		$controller = new IndexController();
		$controller->setEntityManager($entityManager);
		$controller->setDoctorantService($doctorantService);
		$controller->setParametreService($parametreService);
		return $controller;
		}

module/Formation/view/formation/enquete-question/repondre-questions.phtml

+11 −0

Changes for module/Formation/view/formation/enquete-question/repondre-questions.phtml: 11 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ use Formation\Form\EnqueteReponse\EnqueteReponseForm;
		* @var EnqueteCategorie[] $categories
		* @var EnqueteQuestion[] $questions
		* @var EnqueteReponseForm $form
		* @var DateTime $date
		*/

		$categories = array_filter($categories, function (EnqueteCategorie $a) { return $a->estNonHistorise();});
		@@ -24,6 +25,16 @@ usort($categories, function (EnqueteCategorie $a, EnqueteCategorie $b) { return
		<?php echo $inscription->getDoctorant()->getIndividu()->getNomComplet(); ?>
		</h1>

		<div class="alert alert-warning">

		<span class="lead">
		<strong>
		<span class="icon icon-attention"></span>
		Attention, vous devez repondre et valider l'enquête pour le <?php echo $date->format('d/m/Y'); ?>.
		</strong>
		</span>
		</div>

		<?php echo $this->form()->openTag($form); ?>

		<?php foreach ($categories as $categorie) : ?>