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

Stagiare externe est un rôle auto

parent 1148e9eb
Loading
Loading
Loading
Loading
+3 −2
Changes for config/autoload/unicaen-privilege.global.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ $settings = [
            300 => 'UnicaenAuthentification\Provider\Identity\Basic',   // en 1er
            200 => 'UnicaenAuthentification\Provider\Identity\Db',      // en 2e
            100 => 'UnicaenAuthentification\Provider\Identity\Ldap',    // en 3e @deprecated
            010 => 'Application\Provider\IdentityProvider',             // en 3e
            000 => 'Structure\Provider\IdentityProvider',  // en 3e
            020 => 'Application\Provider\IdentityProvider',             // en 3e
            010 => 'Structure\Provider\IdentityProvider',  // en 3e
            001 => 'Formation\Provider\IdentityProvider',  // en 3e
        ],
    ],
    'navigation' => [
+3
Changes for module/Formation/config/module.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ use Formation\Event\InscriptionCloture\InscriptionClotureEvent;
use Formation\Event\InscriptionCloture\InscriptionClotureEventFactory;
use Formation\Event\SessionCloture\SessionClotureEvent;
use Formation\Event\SessionCloture\SessionClotureEventFactory;
use Formation\Provider\IdentityProvider;
use Formation\Provider\IdentityProviderFactory;
use Formation\Service\Evenement\NotificationFormationsOuvertesService;
use Formation\Service\Evenement\NotificationFormationsOuvertesServiceFactory;
use Formation\Service\Evenement\RappelAgentAvantFormationService;
@@ -190,6 +192,7 @@ return [

    'service_manager' => [
        'factories' => [
            IdentityProvider::class => IdentityProviderFactory::class,
            NotificationService::class => NotificationServiceFactory::class,
            UrlService::class => UrlServiceFactory::class,

+11
Changes for module/Formation/src/Formation/Controller/IndexController.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Formation\Controller;

use Application\Service\Agent\AgentServiceAwareTrait;
use Formation\Provider\Template\TextTemplates;
use Formation\Service\StagiaireExterne\StagiaireExterneServiceAwareTrait;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;
use UnicaenRenderer\Service\Rendu\RenduServiceAwareTrait;
@@ -15,6 +16,7 @@ class IndexController extends AbstractActionController

    use AgentServiceAwareTrait;
    use RenduServiceAwareTrait;
    use StagiaireExterneServiceAwareTrait;
    use UserServiceAwareTrait;


@@ -32,7 +34,16 @@ class IndexController extends AbstractActionController
                $this->redirect()->toRoute('home');
            }
        }
        $stagiaire = $this->getStagiaireExterneService()->getStagiaireExterneByUser($connectedUser);
        if ($stagiaire !== null && $stagiaire->getUtilisateur() === null) {
            $previous = $stagiaire->getUtilisateur();
            $stagiaire->setUtilisateur($connectedUser);
            $this->getStagiaireExterneService()->update($stagiaire);

            if ($connectedUser !== $previous) {
                $this->redirect()->toRoute('home');
            }
        }
        $rendu = $this->getRenduService()->generateRenduByTemplateCode(TextTemplates::MES_FORMATIONS_ACCUEIL, [], false);

        return new ViewModel([
+4
Changes for module/Formation/src/Formation/Controller/IndexControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace Formation\Controller;

use Application\Service\Agent\AgentService;
use Formation\Service\StagiaireExterne\StagiaireExterneService;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
@@ -23,15 +24,18 @@ class IndexControllerFactory
        /**
         * @var AgentService $agentService
         * @var RenduService $renduService
         * @var StagiaireExterneService $stagiaireExterneService
         * @var UserService $userService
         */
        $agentService = $container->get(AgentService::class);
        $renduService = $container->get(RenduService::class);
        $stagiaireExterneService = $container->get(StagiaireExterneService::class);
        $userService = $container->get(UserService::class);

        $controller = new IndexController();
        $controller->setAgentService($agentService);
        $controller->setRenduService($renduService);
        $controller->setStagiaireExterneService($stagiaireExterneService);
        $controller->setUserService($userService);
        return $controller;
    }
+4
Changes for module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.StagiaireExterne.dcm.xml: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@
        <field name="email"          column="email"         type="string"       length="1024"   />
        <field name="login"          column="login"         type="string"       length="1024"   />

        <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User"  field="utilisateur">
            <join-column name="utilisateur_id" referenced-column-name="ID"/>
        </many-to-one>

        <!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
        <field name="histoCreation"     type="datetime"                 column="histo_creation"     nullable="false"/>
        <field name="histoModification" type="datetime"                 column="histo_modification" nullable="false"/>
Loading