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

[FIX] source manquante pour les inscriptions manuelles

parent 4ff860ef
Loading
Loading
Loading
Loading
+7
Changes for module/Formation/src/Formation/Controller/FormationInstanceInscritController.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ use Laminas\Http\Response;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
use Laminas\View\Model\ViewModel;
use UnicaenDbImport\Entity\Db\Source;
use UnicaenEtat\Service\Etat\EtatServiceAwareTrait;
use UnicaenMail\Service\Mail\MailServiceAwareTrait;
use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait;
@@ -45,6 +46,10 @@ class FormationInstanceInscritController extends AbstractActionController
    use InscriptionFormAwareTrait;
    use SelectionAgentFormAwareTrait;

    private Source $sourceEMC2;
    public function setSourceEmc2(Source $source) { $this->sourceEMC2 = $source; }



    public function afficherAgentAction() : ViewModel
    {
@@ -75,6 +80,7 @@ class FormationInstanceInscritController extends AbstractActionController
                if (!$instance->hasAgent($inscrit->getAgent())) {
                    $inscrit->setListe($instance->getListeDisponible());
                    $inscrit->setEtat($this->getEtatService()->getEtatByCode(InscriptionEtats::ETAT_VALIDER_DRH));
                    $inscrit->setSource($this->sourceEMC2);
                    $this->getFormationInstanceInscritService()->create($inscrit);

                    $texte = ($instance->getListeDisponible() === FormationInstanceInscrit::PRINCIPALE) ? "principale" : "complémentaire";
@@ -251,6 +257,7 @@ class FormationInstanceInscritController extends AbstractActionController
                if ($inscription->getJustificationAgent() === null) {
                    $this->flashMessenger()->addErrorMessage("<strong> Échec de l'inscription </strong> <br/> Veuillez justifier votre demande d'inscription !");
                } else {
                    $inscription->setSource($this->sourceEMC2);
                    $this->getFormationInstanceInscritService()->create($inscription);
                    $this->flashMessenger()->addSuccessMessage("Demande d'inscription faite.");
                    $this->getNotificationService()->triggerInscriptionAgent($agent, $instance);
+6
Changes for module/Formation/src/Formation/Controller/FormationInstanceInscritControllerFactory.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ use Formation\Service\Notification\NotificationService;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use UnicaenDbImport\Entity\Db\Service\Source\SourceService;
use UnicaenEtat\Service\Etat\EtatService;
use UnicaenMail\Service\Mail\MailService;
use UnicaenParametre\Service\Parametre\ParametreService;
@@ -72,6 +73,11 @@ class FormationInstanceInscritControllerFactory
        $controller->setUserService($userService);
        $controller->setInscriptionForm($inscriptionForm);
        $controller->setSelectionAgentForm($selectionAgentForm);

        $sourceService = $container->get(SourceService::class);
        $source = $sourceService->getRepository()->findOneBy(['code' => 'EMC2']);
        $controller->setSourceEmc2($source);

        return $controller;
    }
}
 No newline at end of file
+6 −2
Changes for module/Formation/src/Formation/Service/DemandeExterne/DemandeExterneService.php: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ use Structure\Service\Structure\StructureServiceAwareTrait;
use Structure\Entity\Db\Structure;
use UnicaenApp\Exception\RuntimeException;
use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenDbImport\Entity\Db\Source;
use UnicaenEtat\Entity\Db\Etat;
use UnicaenEtat\Service\Etat\EtatServiceAwareTrait;
use UnicaenValidation\Entity\Db\ValidationInstance;
@@ -51,6 +52,9 @@ class DemandeExterneService {
    use ValidationTypeServiceAwareTrait;
    use ValidationInstanceServiceAwareTrait;

    private Source $sourceEMC2;
    public function setSourceEmc2(Source $source) { $this->sourceEMC2 = $source; }

    /** GESTION ENTITE ************************************************************************************************/

    public function create(DemandeExterne $demande) : DemandeExterne
@@ -369,7 +373,7 @@ class DemandeExterneService {
        $session->setNbPlacePrincipale(1);
        $session->setNbPlaceComplementaire(0);
        $session->setType("stage externe");
        //source ... todo
        $session->setSource($this->sourceEMC2);
        $this->getFormationInstanceService()->create($session);

        //inscription
@@ -378,7 +382,7 @@ class DemandeExterneService {
        $inscription->setInstance($session);
        $inscription->setEtat($this->getEtatService()->getEtatByCode(InscriptionEtats::ETAT_VALIDER_DRH));
        $inscription->setListe(FormationInstanceInscrit::PRINCIPALE);
        //source ... todo
        $inscription->setSource($this->sourceEMC2);
        $this->getFormationInstanceInscritService()->create($inscription);

        $absence = $volume - $suivi;
+6
Changes for module/Formation/src/Formation/Service/DemandeExterne/DemandeExterneServiceFactory.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use Structure\Service\Structure\StructureService;
use UnicaenDbImport\Entity\Db\Service\Source\SourceService;
use UnicaenEtat\Service\Etat\EtatService;
use UnicaenValidation\Service\ValidationInstance\ValidationInstanceService;
use UnicaenValidation\Service\ValidationType\ValidationTypeService;
@@ -64,6 +65,11 @@ class DemandeExterneServiceFactory {
        $service->setStructureService($structureService);
        $service->setValidationInstanceService($validationInstanceService);
        $service->setValidationTypeService($validationTypeService);

        $sourceService = $container->get(SourceService::class);
        $source = $sourceService->getRepository()->findOneBy(['code' => 'EMC2']);
        $service->setSourceEmc2($source);

        return $service;
    }
}
 No newline at end of file