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

[Structure] Retrait des onglets de formations maintenant délégué à mes-formations/GeFor/...

parent b46ee31e
Loading
Loading
Loading
Loading
+1
Changes for documentation/release/3.1.5.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@
* [FIX] correction de la route de retour lors de l'abonnement/désabonnement à une formation
* [Formation] Ajout d'un bouton pour changer l'état vers un état donné sans respecter le circuit
* [Structure] Retrait de la nommination manuelle des responsables et gestionnaires (on se fie plus qu'au référentiel)
* [Structure] Retrait des onglets de formations maintenant délégué à mes-formations/GeFor/...

**Modifications de la base de donnée**

−17
Changes for module/Structure/src/Structure/Controller/StructureController.php: 0 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ use DateTime;
use EntretienProfessionnel\Service\Campagne\CampagneServiceAwareTrait;
use EntretienProfessionnel\Service\Delegue\DelegueServiceAwareTrait;
use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;
use Formation\Entity\Db\Formation;
use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait;
use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;
use Laminas\Http\Request;
use Laminas\Http\Response;
use Laminas\Mvc\Controller\AbstractActionController;
@@ -39,11 +36,9 @@ use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
class StructureController extends AbstractActionController {
    use AgentServiceAwareTrait;
    use AgentMissionSpecifiqueServiceAwareTrait;
    use DemandeExterneServiceAwareTrait;
    use EtatServiceAwareTrait;
    use FichePosteServiceAwareTrait;
    use FicheProfilServiceAwareTrait;
    use FormationInstanceInscritServiceAwareTrait;
    use StructureServiceAwareTrait;
    use StructureAgentForceServiceAwareTrait;
    use SpecificitePosteServiceAwareTrait;
@@ -129,12 +124,6 @@ class StructureController extends AbstractActionController {

        $fichespostes_pdf = $this->getAgentService()->getFichesPostesPdfByAgents($allAgents);

        //formations
        $demandesNonValidees =  $this->getDemandeExterneService()->getDemandesExternesNonValideesByAgents($allAgents, Formation::getAnnee());
        $demandesValidees =  $this->getDemandeExterneService()->getDemandesExternesValideesByAgents($allAgents, Formation::getAnnee());
        $inscriptionsNonValidees = $this->getFormationInstanceInscritService()->getInscriptionsNonValideesByAgents($allAgents, Formation::getAnnee());
        $inscriptionsValidees = $this->getFormationInstanceInscritService()->getInscriptionsValideesByAgents($allAgents, Formation::getAnnee());

        return new ViewModel([
            'selecteur' => $selecteur,

@@ -161,12 +150,6 @@ class StructureController extends AbstractActionController {
            'entretiensArray' => $entretiensArray,
            'delegues' => $delegues,

            //formations
            'demandesNonValidees' => $demandesNonValidees,
            'demandesValidees' => $demandesValidees,
            'inscriptionsNonValidees' => $inscriptionsNonValidees,
            'inscriptionsValidees' => $inscriptionsValidees,

            // - Fiches de recrutement - //
//            'fichesRecrutements' => $fichesRecrutements,
//            'profils' => $profils,
−8
Changes for module/Structure/src/Structure/Controller/StructureControllerFactory.php: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ use Application\Service\SpecificitePoste\SpecificitePosteService;
use EntretienProfessionnel\Service\Campagne\CampagneService;
use EntretienProfessionnel\Service\Delegue\DelegueService;
use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnelService;
use Formation\Service\DemandeExterne\DemandeExterneService;
use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritService;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
@@ -42,10 +40,8 @@ class StructureControllerFactory {
         * @var CampagneService $campagneService
         * @var EtatService $etatService
         * @var DelegueService $delegueService
         * @var DemandeExterneService $demandeService
         * @var FichePosteService $fichePosteService
         * @var FicheProfilService $ficheProfilService
         * @var FormationInstanceInscritService $formationInstanceInscritService
         * @var SpecificitePosteService $specificiteService
         * @var StructureService $structureService
         * @var StructureAgentForceService $structureAgentForceService
@@ -58,11 +54,9 @@ class StructureControllerFactory {
        $entretienService = $container->get(EntretienProfessionnelService::class);
        $campagneService = $container->get(CampagneService::class);
        $etatService = $container->get(EtatService::class);
        $demandeService = $container->get(DemandeExterneService::class);
        $delegueService = $container->get(DelegueService::class);
        $fichePosteService = $container->get(FichePosteService::class);
        $ficheProfilService = $container->get(FicheProfilService::class);
        $formationInstanceInscritService = $container->get(FormationInstanceInscritService::class);
        $specificiteService = $container->get(SpecificitePosteService::class);
        $structureService = $container->get(StructureService::class);
        $structureAgentForceService = $container->get(StructureAgentForceService::class);
@@ -90,10 +84,8 @@ class StructureControllerFactory {
        $controller->setCampagneService($campagneService);
        $controller->setEtatService($etatService);
        $controller->setDelegueService($delegueService);
        $controller->setDemandeExterneService($demandeService);
        $controller->setFichePosteService($fichePosteService);
        $controller->setFicheProfilService($ficheProfilService);
        $controller->setFormationInstanceInscritService($formationInstanceInscritService);
        $controller->setSpecificitePosteService($specificiteService);
        $controller->setStructureService($structureService);
        $controller->setStructureAgentForceService($structureAgentForceService);
−28
Changes for module/Structure/view/structure/structure/afficher.phtml: 0 added lines, 28 removed lines.
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@
 * @var EntretienProfessionnel[] $entretiensArray
 * @var Delegue[] $delegues
 *
 * // FORMATION ///////////////////////////
 * @var DemandeExterne[] $demandesNonValidees
 * @var DemandeExterne[] $demandesValidees
 * @var FormationInstanceInscrit[] $inscriptionsNonValidees
 * @var FormationInstanceInscrit[] $inscriptionsValidees
 */

use Application\Entity\Db\Agent;
@@ -42,8 +37,6 @@ use Application\Entity\Db\FichePoste;
use EntretienProfessionnel\Entity\Db\Campagne;
use EntretienProfessionnel\Entity\Db\Delegue;
use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;
use Formation\Entity\Db\DemandeExterne;
use Formation\Entity\Db\FormationInstanceInscrit;
use Structure\Entity\Db\Structure;
use Structure\Entity\Db\StructureGestionnaire;
use Structure\Entity\Db\StructureResponsable;
@@ -139,18 +132,6 @@ $canAfficherStructure = $this->isAllowed($structure, StructurePrivileges::STRU
<!--                </a>-->
<!--            </li>-->

            <li class="nav-item">
                <a href="#formation-demande" class="nav-link" aria-controls="formation-demande">
                    Demandes de <br/> formations
                </a>
            </li>
            <li class="nav-item">
                <a href="#formation-liste" class="nav-link" aria-controls="formation-liste">
                    Listes des <br/> formations
                </a>
            </li>


            <li class="nav-item">
                <a href="#extraction" class="nav-link" aria-controls="extraction">
                    Extractions  <br/> &nbsp;
@@ -224,15 +205,6 @@ $canAfficherStructure = $this->isAllowed($structure, StructurePrivileges::STRU
<!--                    --><?php //echo $this->partial('partial/profil', ['structure' => $structure, 'profils' => $profils, 'fichesRecrutements' => $fichesRecrutements]); ?>
<!--                </div>-->

                <!-- Demande de formation ------------------------------->
                <div id="formation-demande" class="tab-pane">
                    <?php echo $this->partial('partial/demande-formation', ['inscriptions' => $inscriptionsNonValidees, 'demandes' => $demandesNonValidees]); ?>
                </div>

                <div id="formation-liste" class="tab-pane">
                    <?php echo $this->partial('partial/liste-formation', ['inscriptions' => $inscriptionsValidees, 'demandes' => $demandesValidees]); ?>
                </div>

                <!-- Extraction ------------------------------------------------------------------------------------->
                <div id="extraction" class="tab-pane">
                    <?php echo $this->partial('partial/extraction', ['structure' => $structure]); ?>
−134

File deleted.

Loading