Simplification de qques services (fee37bd6) · Commits · open-source / emc2

module/Application/src/Application/Entity/Db/AgentAffectation.php

+6 −7

Original line number	Diff line number	Diff line
		@@ -47,13 +47,12 @@ class AgentAffectation implements HasPeriodeInterface {

		public function getTemoin(string $temoin) : bool
		{
		switch ($temoin) {
		case 'principale' : return $this->isPrincipale();
		case 'hierarchique' : return $this->isHierarchique();
		case 'fonctionnelle' : return $this->isFonctionnelle();
		default :
		throw new RuntimeException("Le temoin [" . $temoin . "] est inconnu ou non géré.", 0);
		}
		return match ($temoin) {
		'principale' => $this->isPrincipale(),
		'hierarchique' => $this->isHierarchique(),
		'fonctionnelle' => $this->isFonctionnelle(),
		default => throw new RuntimeException("Le temoin [" . $temoin . "] est inconnu ou non géré.", 0),
		};
		}

		public function isPrincipale() : bool

module/Formation/config/merged/formation-instance-inscrit.config.php

+8 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,14 @@ return [
		'controller' => FormationInstanceInscritController::class,
		'action' => [
		'formations',
		],
		'roles' => [
		'Agent', 'Stagiaire externe'
		],
		],
		[
		'controller' => FormationInstanceInscritController::class,
		'action' => [
		'inscriptions',
		'inscription-interne',
		'inscription-externe',

module/Formation/src/Formation/Controller/FormationInstanceController.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ use Formation\Provider\Etat\SessionEtats;
		use Formation\Service\Formation\FormationServiceAwareTrait;
		use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
		use Formation\Service\Notification\NotificationServiceAwareTrait;
		use Formation\Service\Presence\PresenceAwareTrait;
		use Formation\Service\Presence\PresenceServiceAwareTrait;
		use Laminas\Http\Request;
		use Laminas\Http\Response;
		use Laminas\Mvc\Controller\AbstractActionController;
		@@ -29,7 +29,7 @@ class FormationInstanceController extends AbstractActionController
		use MailServiceAwareTrait;
		use NotificationServiceAwareTrait;
		use ParametreServiceAwareTrait;
		use PresenceAwareTrait;
		use PresenceServiceAwareTrait;
		use FormationInstanceFormAwareTrait;

		public function indexAction(): ViewModel

module/Formation/src/Formation/Controller/FormationInstanceInscritController.php

+10 −5

Original line number	Diff line number	Diff line
		@@ -2,14 +2,11 @@

		namespace Formation\Controller;

		use Application\Entity\Db\Interfaces\HasSourceInterface;
		use Application\Form\SelectionAgent\SelectionAgentFormAwareTrait;
		use Application\Service\Agent\AgentServiceAwareTrait;
		use Formation\Entity\Db\DemandeExterne;
		use Formation\Entity\Db\Inscription;
		use Formation\Form\Inscription\InscriptionFormAwareTrait;
		use Formation\Provider\Etat\DemandeExterneEtats;
		use Formation\Provider\Etat\InscriptionEtats;
		use Formation\Provider\Etat\SessionEtats;
		use Formation\Provider\Parametre\FormationParametres;
		use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait;
		@@ -87,13 +84,21 @@ class FormationInstanceInscritController extends AbstractActionController
		{
		$utilisateur = $this->getUserService()->getConnectedUser();
		$agent = $this->getAgentService()->getAgentByUser($utilisateur);
		$stagiaire = null;
		$inscriptions = null;

		if ($agent !== null) $inscriptions = $this->getInscriptionService()->getInscriptionsByAgent($agent);
		else {
		$stagiaire = $this->getStagiaireExterneService()->getStagiaireExterneByUser($utilisateur);
		if ($stagiaire) $inscriptions = $this->getInscriptionService()->getInscriptionbyStagiaire($stagiaire);
		}

		$formations = $this->getInscriptionService()->getInscriptionsByAgent($agent);
		$mail = $this->getParametreService()->getParametreByCode(FormationParametres::TYPE, FormationParametres::MAIL_DRH_FORMATION);

		return new ViewModel([
		'agent' => $agent,
		'formations' => $formations,
		'stagiaire' => $stagiaire,
		'inscriptions' => $inscriptions,
		'mailcontact' => ($mail) ? $mail->getValeur() : null,
		]);
		}

module/Formation/src/Formation/Controller/ImportationLagafController.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
		use Formation\Service\HasFormationCollection\HasFormationCollectionServiceAwareTrait;
		use Formation\Service\Inscription\InscriptionServiceAwareTrait;
		use Formation\Service\InscriptionFrais\InscriptionFraisServiceAwareTrait;
		use Formation\Service\Presence\PresenceAwareTrait;
		use Formation\Service\Presence\PresenceServiceAwareTrait;
		use Formation\Service\Seance\SeanceServiceAwareTrait;
		use Formation\Service\Stagiaire\StagiaireServiceAwareTrait;
		use Laminas\Mvc\Controller\AbstractActionController;
		@@ -39,7 +39,7 @@ class ImportationLagafController extends AbstractActionController
		use SeanceServiceAwareTrait;
		use InscriptionServiceAwareTrait;
		use InscriptionFraisServiceAwareTrait;
		use PresenceAwareTrait;
		use PresenceServiceAwareTrait;
		use StagiaireServiceAwareTrait;
		use UserServiceAwareTrait;
		use HasFormationCollectionServiceAwareTrait;