Adaptation formation : type par defaut + bug suivi manuelle de la formation (38ebaefd) · Commits · open-source / emc2

module/Application/src/Application/View/Helper/partial/formation-bloc.phtml

+1 −0

Changes for module/Application/src/Application/View/Helper/partial/formation-bloc.phtml: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ ksort($groupes);
		</td>
		<td class="niveau">
		<?php if ($entite instanceof FormationElement) : ?>
		<!-- --><?php //echo $entite->getHistoCreation()->format('Y'); ?>
		<?php echo explode(" - ",$entite->getCommentaire())[0]; ?>
		<?php endif; ?>
		</td>

+5 −0

Changes for module/Formation/src/Formation/Controller/FormationController.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ use Formation\Entity\Db\Formation;
		use Formation\Form\Formation\FormationFormAwareTrait;
		use Formation\Service\Formation\FormationServiceAwareTrait;
		use Formation\Service\FormationGroupe\FormationGroupeServiceAwareTrait;
		use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
		use UnicaenEtat\Service\Etat\EtatServiceAwareTrait;
		use Zend\Http\Request;
		use Zend\Mvc\Controller\AbstractActionController;
		@@ -21,6 +22,7 @@ use Zend\View\Model\ViewModel;
		class FormationController extends AbstractActionController
		{
		use EtatServiceAwareTrait;
		use FormationInstanceServiceAwareTrait;
		use FormationServiceAwareTrait;
		use FormationGroupeServiceAwareTrait;
		use ParcoursDeFormationServiceAwareTrait;
		@@ -91,11 +93,14 @@ class FormationController extends AbstractActionController
		}
		}

		$instances = $this->getFormationInstanceService()->getFormationsInstancesByFormation($formation);

		$vm = new ViewModel();
		$vm->setTemplate('formation/formation/modifier');
		$vm->setVariables([
		'title' => 'Edition d\'une formation',
		'formation' => $formation,
		'instances' => $instances,
		'form' => $form,
		]);
		return $vm;

+4 −0

Changes for module/Formation/src/Formation/Controller/FormationControllerFactory.php: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ use Application\Service\CompetenceElement\CompetenceElementService;
		use Formation\Form\Formation\FormationForm;
		use Formation\Service\Formation\FormationService;
		use Formation\Service\FormationGroupe\FormationGroupeService;
		use Formation\Service\FormationInstance\FormationInstanceService;
		use Interop\Container\ContainerInterface;
		use UnicaenEtat\Service\Etat\EtatService;

		@@ -21,10 +22,12 @@ class FormationControllerFactory
		* @var EtatService $etatService
		* @var FormationService $formationService
		* @var FormationGroupeService $formationGroupeService
		* @var FormationInstanceService $formationInstanceService
		*/
		$etatService = $container->get(EtatService::class);
		$formationService = $container->get(FormationService::class);
		$formationGroupeService = $container->get(FormationGroupeService::class);
		$formationInstanceService = $container->get(FormationInstanceService::class);

		/**
		* @var FormationForm $formationForm
		@@ -47,6 +50,7 @@ class FormationControllerFactory
		$controller->setEtatService($etatService);
		$controller->setFormationService($formationService);
		$controller->setFormationGroupeService($formationGroupeService);
		$controller->setFormationInstanceService($formationInstanceService);
		$controller->setFormationForm($formationForm);

		$controller->setApplicationElementService($applicationElementService);

+1 −1

Changes for module/Formation/src/Formation/Controller/FormationInstanceController.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ class FormationInstanceController extends AbstractActionController
		use ParametreServiceAwareTrait;
		use FormationInstanceFormAwareTrait;


		/ NB: par defaut les instances de formation sont toutes en autoinscription ************************************/

		public function ajouterAction()
		@@ -40,6 +39,7 @@ class FormationInstanceController extends AbstractActionController
		$formation = $this->getFormationService()->getRequestedFormation($this);

		$instance = new FormationInstance();
		$instance->setType(FormationInstance::TYPE_INTERNE);
		$instance->setAutoInscription(true);
		$instance->setNbPlacePrincipale(0);
		$instance->setNbPlaceComplementaire(0);

+1 −1

Changes for module/Formation/src/Formation/Controller/ImportationLagafController.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -554,7 +554,7 @@ class ImportationLagafController extends AbstractActionController {
		if (!$agent->hasFormation($formation)) {
		$formationElement = new FormationElement();
		$formationElement->setFormation($formation);
		$formationElement->setCommentaire("LAGAF");
		$formationElement->setCommentaire($instance->getDebut() . " - LAGAF");
		$this->getHasFormationCollectionService()->addFormation($agent, $formationElement);
		$nbElement++;
		}