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

Entete avec selecteur + chemin resp

parent d6aa6c9b

module/Application/src/Application/Controller/IndexController.php

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ use EntretienProfessionnel\Service\Campagne\CampagneServiceAwareTrait; 
use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;

use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait;

use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;

use Structure\Controller\StructureController;

use Structure\Provider\Role\RoleProvider;

use Structure\Service\Structure\StructureServiceAwareTrait;

use UnicaenAuthentification\Service\Traits\UserContextServiceAwareTrait;
@@ -71,12 +72,14 @@ class IndexController extends AbstractActionController 
//                case RoleConstant::VALIDATEUR :

//                    return $this->redirect()->toRoute('index-validateur', [], [], true);

                case RoleProvider::GESTIONNAIRE :

                    /** @see StructureController::descriptionAction() */

                    $structures = $this->getStructureService()->getStructuresByGestionnaire($connectedUser);

                    if (!empty($structures)) return $this->redirect()->toRoute('structure/afficher', ['structure' => $structures[0]->getId()], [], true);

                    if (!empty($structures)) return $this->redirect()->toRoute('structure/description', ['structure' => $structures[0]->getId()], [], true);

                    break;

                case RoleProvider::RESPONSABLE :

                    $structures = $this->getStructureService()->getStructuresByResponsable($connectedUser);

                    if (!empty($structures)) return $this->redirect()->toRoute('structure/afficher', ['structure' => $structures[0]->getId()], [], true);

                    /** @see StructureController::descriptionAction() */

                    if (!empty($structures)) return $this->redirect()->toRoute('structure/description', ['structure' => $structures[0]->getId()], [], true);

                    break;

                case Agent::ROLE_SUPERIEURE :

                    /** @see IndexController::indexSuperieurAction() */

module/EntretienProfessionnel/src/EntretienProfessionnel/Controller/CampagneController.php

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ use Laminas\Mvc\Controller\AbstractActionController; 
use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;

use Laminas\View\Model\ViewModel;

use Structure\Service\Structure\StructureServiceAwareTrait;

use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;



/** @method FlashMessenger flashMessenger() */
@@ -31,6 +32,7 @@ class CampagneController extends AbstractActionController { 
    use RappelCampagneAvancementServiceAwareTrait;

    use StructureServiceAwareTrait;

    use CampagneFormAwareTrait;

    use UserServiceAwareTrait;



    public function indexAction() : ViewModel

    {
@@ -160,6 +162,9 @@ class CampagneController extends AbstractActionController { 
    {

        $campagne = $this->getCampagneService()->getRequestedCampagne($this);

        $structure = $this->getStructureService()->getRequestedStructure($this);

        $role = $this->getUserService()->getConnectedRole();

        $utilisateur = $this->getUserService()->getConnectedUser();

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole($utilisateur, $role);



        $structures = $this->getStructureService()->getStructuresFilles($structure, true);

        $agentsAll = $this->getAgentService()->getAgentsByStructuresAndDate($structures, $campagne->getDateDebut());
@@ -211,6 +216,7 @@ class CampagneController extends AbstractActionController { 
            'campagne' => $campagne,

            'campagnes' => $campagnes,

            'structure' => $structure,

            'selecteur' => $selecteur,

            'structures' => $structures,

            'agents' => $agents,

module/EntretienProfessionnel/src/EntretienProfessionnel/Controller/CampagneControllerFactory.php

+5 −1
Original line number Diff line number Diff line
@@ -8,11 +8,12 @@ use EntretienProfessionnel\Service\Campagne\CampagneService; 
use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnelService;

use EntretienProfessionnel\Service\Evenement\RappelCampagneAvancementService;

use EntretienProfessionnel\Service\Notification\NotificationService;

use Interop\Container\ContainerInterface;

use Laminas\Mvc\Controller\AbstractActionController;

use Psr\Container\ContainerExceptionInterface;

use Psr\Container\ContainerInterface;

use Psr\Container\NotFoundExceptionInterface;

use Structure\Service\Structure\StructureService;

use UnicaenUtilisateur\Service\User\UserService;



class CampagneControllerFactory extends AbstractActionController

{
@@ -31,6 +32,7 @@ class CampagneControllerFactory extends AbstractActionController 
         * @var NotificationService $notificationService

         * @var RappelCampagneAvancementService $rappelCampagneAvancementService

         * @var StructureService $structureService

         * @var UserService $userService

         */

        $agentService = $container->get(AgentService::class);

        $campagneService = $container->get(CampagneService::class);
@@ -38,6 +40,7 @@ class CampagneControllerFactory extends AbstractActionController 
        $notificationService = $container->get(NotificationService::class);

        $rappelCampagneAvancementService = $container->get(RappelCampagneAvancementService::class);

        $structureService = $container->get(StructureService::class);

        $userService = $container->get(UserService::class);



        /**

         * @var CampagneForm $campagneForm
@@ -51,6 +54,7 @@ class CampagneControllerFactory extends AbstractActionController 
        $controller->setNotificationService($notificationService);

        $controller->setRappelCampagneAvancementService($rappelCampagneAvancementService);

        $controller->setStructureService($structureService);

        $controller->setUserService($userService);

        $controller->setCampagneForm($campagneForm);

        return $controller;

    }

module/EntretienProfessionnel/view/entretien-professionnel/campagne/partial/entete.phtml

+29 −5
Original line number Diff line number Diff line
@@ -11,11 +11,27 @@ use Structure\Entity\Db\Structure; 


?>





<div class="row">

    <div class="col-md-8">

        <h1 class="page-header">

            <strong><?php echo $structure->getLibelleLong(); ?></strong>

            <br>

            <?php echo $structure->getType()->getLibelle(); ?>

        </h1>

    </div>

    <div class="col-md-4">

        <?php if (! empty($selecteur)) : ?>

            <label for="structure-selecteur">Structure à afficher : <br/></label>

            <select id="structure-selecteur" name="structure-selecteur" class="bootstrap-select">

                <option value="">Aucune sélection</option>

                <?php foreach ($selecteur as $s) : ?>

                    <option value="<?php echo $s->getId(); ?>" <?php if ($structure->getId() == $s->getId()) echo "selected"; ?>><?php echo $s->getLibelleCourt(); ?></option>

                <?php endforeach; ?>

            </select>

        <?php endif; ?>

    </div>

</div>



<div role="tabpanel">

    <ul class="nav nav-tabs" role="tablist">
@@ -72,4 +88,12 @@ use Structure\Entity\Db\Structure; 
            window.location.reload();

        });

    });

    $(function() {

        $('select#structure-selecteur').change(function() {

            let id = $('select#structure-selecteur option:selected').val();

            if (id !== "" && id !== "<?php echo $structure->getId(); ?>") {

                window.location.href = './' + id;

            }

        });

    });

</script>

module/EntretienProfessionnel/view/entretien-professionnel/campagne/structure.phtml

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ use Structure\Entity\Db\Structure; 
 *

 * @var Structure $structure

 * @var Structure[] $structures

 * @var Structure[] $selecteur

 *

 * @var Agent[] $agents

 * @var Agent[] $obligatoires
@@ -34,7 +35,7 @@ foreach ($facultatifs as $facultatif) { 
$this->headTitle("Campagne d'entretien professionnel " . $campagne->getAnnee() . " - " . $structure->getLibelleLong())

?>



<?php echo $this->partial('partial/entete', ['structure' => $structure, 'campagnes' => $campagnes, 'current' => 'campagne_'.$campagne->getId()]); ?>

<?php echo $this->partial('partial/entete', ['structure' => $structure, 'campagnes' => $campagnes, 'current' => 'campagne_'.$campagne->getId(), 'selecteur' => $selecteur]); ?>



<h1 class="page-header">

    Campagne d'entretien professionnel <?php echo $campagne->getAnnee(); ?>