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

[EMC2] Déclaration pour un agent de son statut de mobilité

parent dd05850e
Loading
Loading
Loading
Loading
+1 −0
Changes for documentation/release/4.2.0.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Version 4.2.0 (XX/11/2023)
- [Mes Formations] Importation/Complétion d'un plan de formation depuis un CSV
- [Mes Formations] Possibilité de vider un plan de formation
- [EMC2] Déclaration de type de mobilité
- [EMC2] Déclaration pour un agent de son statut de mobilité
- 

Modification en BD
+4 −4
Changes for module/Application/config/merged/agent-mobilite.config.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -118,13 +118,13 @@ return [
                                    ],
                                ],
                            ],
                            'detruire' => [
                            'supprimer' => [
                                'type' => Segment::class,
                                'options' => [
                                    'route' => '/detruire/:agent-mobilite',
                                    'route' => '/supprimer/:agent-mobilite',
                                    'defaults' => [
                                        /** @see AgentMobiliteController::supprimer() */
                                        'action' => 'detruire'
                                        /** @see AgentMobiliteController::supprimerAction() */
                                        'action' => 'supprimer'
                                    ],
                                ],
                            ],
+18 −4
Changes for module/Application/src/Application/Controller/AgentMobiliteController.php: 18 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -73,14 +73,28 @@ class AgentMobiliteController extends AgentController {
        return $vm;
    }

    public function historiserAction() : Response
    public function historiserAction() : ViewModel
    {
        $agentMobilite = $this->getAgentMobiliteService()->getRequestedAgentMobilite($this);
        $this->getAgentMobiliteService()->historise($agentMobilite);

        $retour = $this->params()->fromQuery('retour');
        if ($retour) return $this->redirect()->toUrl($retour);
        return $this->redirect()->toRoute('agent/afficher', ['agent' => $agentMobilite->getAgent()->getId()], ['fragment' => "mobilite"], true);
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            if ($data["reponse"] === "oui") $this->getAgentMobiliteService()->historise($agentMobilite);
            exit();
        }

        $vm = new ViewModel();
        if ($agentMobilite !== null) {
            $vm->setTemplate('default/confirmation');
            $vm->setVariables([
                'title' => "Historisation du statut de mobilité pour l'agent·e " . $agentMobilite->getAgent()->getDenomination(),
                'text' => "L'historisation supprimera votre statut. <br/>Êtes-vous sûr&middot;e de vouloir continuer ?",
                'action' => $this->url()->fromRoute('agent/mobilite/historiser', ["agent-mobilite" => $agentMobilite->getId()], [], true),
            ]);
        }
        return $vm;
    }

    public function restaurerAction() : Response
+3 −1
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.AgentMobilite.dcm.xml: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@
<doctrine-mapping> <!--xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"-->
    <entity name="Application\Entity\Db\AgentMobilite" table="agent_carriere_mobilite">

        <id name="id" type="string" column="id" />
        <id name="id" type="integer" column="id">
            <generator strategy="IDENTITY"/>
        </id>

        <many-to-one target-entity="Application\Entity\Db\Agent"  field="agent">
            <join-column name="agent_id" referenced-column-name="c_individu"/>
+1 −1
Changes for module/Application/src/Application/Form/AgentMobilite/AgentMobiliteForm.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class AgentMobiliteForm extends Form
    {
        //--agent déduiu de l'action
        //Cible
        $cible = new SearchAndSelect('cible', ['label' => "Agent·e :"]);
        $cible = new SearchAndSelect('agent', ['label' => "Agent·e :"]);
        $cible
            ->setAutocompleteSource($this->urlAgent)
            ->setSelectionRequired(true)
Loading