update avant demo (4b48fbb1) · Commits · open-source / emc2

documentation/bd_and_data/version_4x/004_unicaen_parametre.sql

+10 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,16 @@ create table unicaen_indicateur_tableau_indicateur
		primary key (tableau_id, indicateur_id)
		);


		create table unicaen_indicateur_abonnement
		(
		id serial not null constraint abonnement_pk primary key,
		user_id integer not null constraint indicateur_abonnement_user_id_fk references unicaen_utilisateur_user on delete cascade,
		indicateur_id integer not null constraint indicateur_abonnement_indicateur_definition_id_fk references unicaen_indicateur_indicateur on delete cascade,
		frequence varchar(256),
		dernier_envoi timestamp
		);
		create unique index abonnement_id_uindex on unicaen_indicateur_abonnement (id);
		-- TABLES - EVENEMENT ----------------------------------------------------------------------

		create table unicaen_evenement_etat

documentation/bd_and_data/version_4x/071_formations_base.sql

+4 −0

Original line number	Diff line number	Diff line
		@@ -958,6 +958,10 @@ SELECT cp.id, d.code, d.libelle, d.description, d.valeurs_possibles, d.ordre
		FROM d
		JOIN unicaen_parametre_categorie cp ON cp.CODE = 'FORMATION';

		-- NATURE FICHIER ----------------------------------------------------------------

		INSERT INTO fichier_nature (code, libelle) VALUES ('DEMANDEEXTERNE_DEVIS', 'Devis de demande externe');

		-- ENQUETE -----------------------------------------------------------------------

		INSERT INTO formation_enquete_categorie (libelle, description, ordre)

module/Formation/config/merged/plan-de-formation.config.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ return [
		'route' => '/gerer-formations/:plan-de-formation',
		'defaults' => [
		'controller' => PlanDeFormationController::class,
		'action' => 'ajouter-formation',
		'action' => 'gerer-formations',
		],
		],
		],

module/Formation/src/Formation/Controller/DemandeExterneController.php

+12 −10

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ use Laminas\View\Model\JsonModel;
		use Laminas\View\Model\ViewModel;
		use UnicaenEtat\Service\EtatInstance\EtatInstanceServiceAwareTrait;
		use UnicaenEtat\Service\EtatType\EtatTypeServiceAwareTrait;
		use UnicaenValidation\Service\ValidationInstance\ValidationInstanceServiceAwareTrait;

		/** @method FlashMessenger flashMessenger() */

		@@ -36,6 +37,7 @@ class DemandeExterneController extends AbstractActionController {
		use FichierServiceAwareTrait;
		use NatureServiceAwareTrait;
		use NotificationServiceAwareTrait;
		use ValidationInstanceServiceAwareTrait;

		use DemandeExterneFormAwareTrait;
		use Demande2FormationFormAwareTrait;
		@@ -46,11 +48,11 @@ class DemandeExterneController extends AbstractActionController {
		{
		$fromQueries = $this->params()->fromQuery();
		$params = [
		'agent' => $this->getAgentService()->getAgent($fromQueries['agent']['id']),
		'organisme' => $fromQueries['organisme']['id'],
		'etat' => $this->getEtatTypeService()->getEtatType((trim($fromQueries['etat'])!=='')?trim($fromQueries['etat']):null),
		'historise' => $fromQueries['historise'],
		'annee' => $fromQueries['annee'],
		'agent' => $this->getAgentService()->getAgent($fromQueries['agent']['id']??null),
		'organisme' => $fromQueries['organisme']['id']??null,
		'etat' => $this->getEtatTypeService()->getEtatType((isset($fromQueries['etat']) && trim($fromQueries['etat'])!=='')?trim($fromQueries['etat']):null),
		'historise' => $fromQueries['historise']??null,
		'annee' => $fromQueries['annee']??null,
		];

		$demandes = $this->getDemandeExterneService()->getDemandesExternesWithFiltre($params);
		@@ -190,7 +192,7 @@ class DemandeExterneController extends AbstractActionController {
		$validation = $demande->getValidationActiveByTypeCode(DemandeExterneValidations::FORMATION_DEMANDE_AGENT);
		if ($validation === null) {
		if ($data["reponse"] === "oui") {
		$this->getDemandeExterneService()->addValidationAgent($demande);
		$this->getValidationInstanceService()->setValidationActive($demande,DemandeExterneValidations::FORMATION_DEMANDE_AGENT);
		$this->getEtatInstanceService()->setEtatActif($demande, DemandeExterneEtats::ETAT_VALIDATION_AGENT);
		$this->getDemandeExterneService()->update($demande);
		$this->getNotificationService()->triggerValidationAgent($demande);
		@@ -226,7 +228,7 @@ class DemandeExterneController extends AbstractActionController {
		if ($demande->getJustificationResponsable() === null) {
		$this->flashMessenger()->addErrorMessage("<strong> Échec de la validation </strong> <br/> Veuillez justifier votre validation !");
		} else {
		$this->getDemandeExterneService()->addValidationResponsable($demande);
		$this->getValidationInstanceService()->setValidationActive($demande, DemandeExterneValidations::FORMATION_DEMANDE_RESPONSABLE);
		$this->getDemandeExterneService()->update($demande);
		$this->flashMessenger()->addSuccessMessage("Validation effectuée.");
		$this->getNotificationService()->triggerValidationResponsableAgent($demande);
		@@ -262,7 +264,7 @@ class DemandeExterneController extends AbstractActionController {
		if ($demande->getJustificationRefus() === null) {
		$this->flashMessenger()->addErrorMessage("<strong> Échec du refus </strong> <br/> Veuillez justifier votre refus !");
		} else {
		$this->getDemandeExterneService()->addValidationRefus($demande);
		$this->getValidationInstanceService()->setValidationActive($demande, DemandeExterneValidations::FORMATION_DEMANDE_REFUS);
		$this->getEtatInstanceService()->setEtatActif($demande, DemandeExterneEtats::ETAT_REJETEE);
		$this->getDemandeExterneService()->update($demande);
		$this->flashMessenger()->addSuccessMessage("Refus effectué.");
		@@ -295,7 +297,7 @@ class DemandeExterneController extends AbstractActionController {
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getDemandeExterneService()->addValidationDrh($demande);
		$this->getValidationInstanceService()->setValidationActive($demande, DemandeExterneValidations::FORMATION_DEMANDE_DRH);
		$this->getDemandeExterneService()->update($demande);
		$this->flashMessenger()->addSuccessMessage("Validation effectuée.");
		$this->getNotificationService()->triggerValidationDrh($demande);
		@@ -332,7 +334,7 @@ class DemandeExterneController extends AbstractActionController {
		if ($demande->getJustificationRefus() === null) {
		$this->flashMessenger()->addErrorMessage("<strong> Échec du refus </strong> <br/> Veuillez justifier votre refus !");
		} else {
		$this->getDemandeExterneService()->addValidationRefus($demande);
		$this->getValidationInstanceService()->setValidationActive($demande, DemandeExterneValidations::FORMATION_DEMANDE_REFUS);
		$this->getEtatInstanceService()->setEtatActif($demande, DemandeExterneEtats::ETAT_REJETEE);
		$this->getDemandeExterneService()->update($demande);
		$this->flashMessenger()->addSuccessMessage("Refus effectué.");

module/Formation/src/Formation/Controller/DemandeExterneControllerFactory.php

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ use Psr\Container\ContainerInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use UnicaenEtat\Service\EtatInstance\EtatInstanceService;
		use UnicaenEtat\Service\EtatType\EtatTypeService;
		use UnicaenValidation\Service\ValidationInstance\ValidationInstanceService;

		class DemandeExterneControllerFactory
		{
		@@ -36,6 +37,7 @@ class DemandeExterneControllerFactory
		* @var FichierService $fichierService
		* @var NatureService $natureService
		* @var NotificationService $notificationService
		* @var ValidationInstanceService $validationInstanceService
		*/
		$agentService = $container->get(AgentService::class);
		$demandeExterneService = $container->get(DemandeExterneService::class);
		@@ -44,6 +46,7 @@ class DemandeExterneControllerFactory
		$fichierService = $container->get(FichierService::class);
		$natureService = $container->get(NatureService::class);
		$notificationService = $container->get(NotificationService::class);
		$validationInstanceService = $container->get(ValidationInstanceService::class);

		/**
		* @var DemandeExterneForm $demandeExterneForm
		@@ -65,6 +68,7 @@ class DemandeExterneControllerFactory
		$controller->setFichierService($fichierService);
		$controller->setNatureService($natureService);
		$controller->setNotificationService($notificationService);
		$controller->setValidationInstanceService($validationInstanceService);

		$controller->setDemandeExterneForm($demandeExterneForm);
		$controller->setDemande2formationForm($demande2formationForm);