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

WIP

parent 35401c4a
Loading
Loading
Loading
Loading
+11
Changes for module/Formation/config/merged/formation-instance-inscrit.config.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ return [
                    'action' => [
                        'afficher-agent',
                        'ajouter-agent',
                        'ajouter-stagiaire-externe',
                        'historiser-agent',
                        'restaurer-agent',
                        'supprimer-agent',
@@ -264,6 +265,16 @@ return [
                            ],
                        ],
                    ],
                    'ajouter-stagiaire-externe' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/ajouter-stagiaire-externe/:session',
                            'defaults' => [
                                /** @see FormationInstanceInscritController::ajouterStagiaireExterneAction() */
                                'action'     => 'ajouter-stagiaire-externe',
                            ],
                        ],
                    ],
                    'ajouter-agent' => [
                        'type'  => Segment::class,
                        'options' => [
+19
Changes for module/Formation/config/merged/stagiaire-externe.config.php: 19 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ return [
                        StagiaireexternePrivileges::STAGIAIREEXTERNE_SUPPRIMER,
                    ],
                ],
                [
                    'controller' => StagiaireExterneController::class,
                    'action' => [
                        'rechercher',
                    ],
                    'privileges' => [
                        StagiaireexternePrivileges::STAGIAIREEXTERNE_RECHERCHER,
                    ],
                ],
            ],
        ],
    ],
@@ -172,6 +181,16 @@ return [
                            ],
                        ],
                    ],
                    'rechercher' => [
                        'type'  => Literal::class,
                        'options' => [
                            'route'    => '/rechercher',
                            'defaults' => [
                                /** @see StagiaireExterneController::rechercherAction() */
                                'action' => 'rechercher',
                            ],
                        ],
                    ],
                ],
            ],
        ],
+51
Changes for module/Formation/src/Formation/Controller/FormationInstanceInscritController.php: 51 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -111,6 +111,57 @@ class FormationInstanceInscritController extends AbstractActionController
        return $vm;
    }

    public function ajouterStagiaireExterneAction() : ViewModel
    {
        $session = $this->getFormationInstanceService()->getRequestedFormationInstance($this, 'session');

        $inscrit = new FormationInstanceInscrit();
        $inscrit->setInstance($session);

        $form = $this->getSelectionAgentForm();
        $form->setAttribute('action', $this->url()->fromRoute('formation-instance/ajouter-stagiaire-externe', ['session' => $session->getId()], [], true));
        $form->bind($inscrit);

//        /** @see  StagiaireExterneController::rechercherAction */
//        $urlLarge = $this->url()->fromRoute('stagiaire-externe/rechercher', [], [], true);
//        /** @var SearchAndSelect $sas */
//        $sas = $form->get('agent');
//        $sas->setLabel("Recherche d'un·e stagiaire externe");
//        $sas->setAutocompleteSource($urlLarge);

//        $request = $this->getRequest();
//        if ($request->isPost()) {
//            $data = $request->getPost();
//            $form->setData($data);
//
//            if ($form->isValid()) {
//                if (!$instance->hasAgent($inscrit->getAgent())) {
//                    $inscrit->setListe($instance->getListeDisponible());
//                    $inscrit->setSource(HasSourceInterface::SOURCE_EMC2);
//                    $this->getFormationInstanceInscritService()->create($inscrit);
//                    $this->getEtatInstanceService()->setEtatActif($inscrit,InscriptionEtats::ETAT_VALIDER_DRH);
//                    $this->getFormationInstanceInscritService()->update($inscrit);
//
//                    $texte = ($instance->getListeDisponible() === FormationInstanceInscrit::PRINCIPALE) ? "principale" : "complémentaire";
//                    $this->flashMessenger()->addSuccessMessage("L'agent <strong>" . $inscrit->getAgent()->getDenomination() . "</strong> vient d'être ajouté&middot;e en <strong>liste " . $texte . "</strong>.");
//
//                    if ($instance->getFormation()->getRattachement() === Formation::RATTACHEMENT_PREVENTION) $this->getNotificationService()->triggerPrevention($inscrit);
//
//                } else {
//                    $this->flashMessenger()->addErrorMessage("L'agent <strong>" . $inscrit->getAgent()->getDenomination() . "</strong> est déjà inscrit&middot;e à l'instance de formation.");
//                }
//            }
//        }

        $vm = new ViewModel();
        $vm->setTemplate('default/default-form');
        $vm->setVariables([
            'title' => "Ajout d'un·e stagiaire externe pour la session de formation",
            'form' => $form,
        ]);
        return $vm;
    }

        public function historiserAgentAction() : Response
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
+14
Changes for module/Formation/src/Formation/Controller/StagiaireExterneController.php: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Formation\Form\StagiaireExterne\StagiaireExterneFormAwareTrait;
use Formation\Service\StagiaireExterne\StagiaireExterneServiceAwareTrait;
use Laminas\Http\Response;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\JsonModel;
use Laminas\View\Model\ViewModel;

class StagiaireExterneController extends AbstractActionController
@@ -14,6 +15,8 @@ class StagiaireExterneController extends AbstractActionController
    use StagiaireExterneServiceAwareTrait;
    use StagiaireExterneFormAwareTrait;

    /** CRUD **********************************************************************************************************/
    
    public function indexAction(): ViewModel
    {
        $stagiaires = $this->getStagiaireExterneService()->getStagiaireExternes('nom', 'ASC', true);
@@ -144,4 +147,15 @@ class StagiaireExterneController extends AbstractActionController
        return $vm;
    }

    /** RECHERCHE *****************************************************************************************************/

    public function rechercherAction(): JsonModel
    {
        if (($term = $this->params()->fromQuery('term'))) {
            $stagiaires = $this->getStagiaireExterneService()->getStagiairesExternesByTerm($term);
            $result = $this->getStagiaireExterneService()->formatStagiaireExterneJSON($stagiaires);
            return new JsonModel($result);
        }
        exit;
    }
}
 No newline at end of file
+1
Changes for module/Formation/src/Formation/Provider/Privilege/StagiaireexternePrivileges.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,4 +12,5 @@ class StagiaireexternePrivileges extends Privileges
    const STAGIAIREEXTERNE_MODIFIER = 'stagiaireexterne-stagiaireexterne_modifier';
    const STAGIAIREEXTERNE_HISTORISER = 'stagiaireexterne-stagiaireexterne_historiser';
    const STAGIAIREEXTERNE_SUPPRIMER = 'stagiaireexterne-stagiaireexterne_supprimer';
    const STAGIAIREEXTERNE_RECHERCHER = 'stagiaireexterne-stagiaireexterne_rechercher';
}
Loading