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

DemandeExterne Assertion

parent c5b697ea

module/Application/src/Application/Service/Agent/AgentService.php

+17 −0
Changes for module/Application/src/Application/Service/Agent/AgentService.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Application\Service\Agent; 


use Application\Entity\Db\Agent;

use Application\Entity\Db\Complement;

use Application\Entity\Db\Traits\HasPeriodeTrait;

use Application\Service\AgentAffectation\AgentAffectationServiceAwareTrait;

use Application\Service\Complement\ComplementServiceAwareTrait;

use DateTime;
@@ -574,4 +575,20 @@ class AgentService { 
        return $result;

    }



    public function computesStructures(?Agent $agent, ?DateTime $date = null) : array

    {

        if ($date === null) $date = new DateTime();



        $qb = $this->getEntityManager()->getRepository(Structure::class)->createQueryBuilder('structure')

            ->addSelect('responsable')->leftJoin('structure.responsables', 'responsable')

            ->addSelect('gestionnaire')->leftJoin('structure.gestionnaires', 'gestionnaire')

            ->join('structure.affectations', 'affectation')

            ->andWhere('affectation.agent = :agent')->setParameter('agent', $agent)

        ;

        $qb = HasPeriodeTrait::decorateWithActif($qb,'affectation', $date);



        $result = $qb->getQuery()->getResult();

        return $result;

    }



}
 
 No newline at end of file

module/Application/view/layout/layout.phtml

+2 −0
Changes for module/Application/view/layout/layout.phtml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -42,10 +42,12 @@ $env = getenv('APPLICATION_ENV') ?: 'production'; 
                <span class="navbar-toggler-icon"></span>

            </button>

            <div class="collapse navbar-collapse" id="menuPrincipalNavbar">



                <?php echo $navigationHelper

                    ->menu('navigation')

                    ->setUlClass('navbar-nav me-auto')

                    ->setPartial('layout/menu-principal.phtml'); ?>



                <div class="navbar-text text-end">

                    <?php echo $this->appConnection(); ?>

                </div>

module/EntretienProfessionnel/src/EntretienProfessionnel/Controller/EntretienProfessionnelController.php

+6 −0
Changes for module/EntretienProfessionnel/src/EntretienProfessionnel/Controller/EntretienProfessionnelController.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -298,10 +298,16 @@ class EntretienProfessionnelController extends AbstractActionController 
            $fichesmetiers[] = $fiche->getFicheType();

        }



        $superieures = $this->getAgentService()->computeSuperieures($agent);

        $autorites = $this->getAgentService()->computeAutorites($agent);



        return new ViewModel([

            'entretien' => $entretien,



            'agent'         => $agent,

            'superieures'   => $superieures,

            'autorites'     => $autorites,



            'ficheposte'    => $ficheposte,

            'fichesmetiers' => $fichesmetiers,

            'connectedUser' => $this->getUserService()->getConnectedUser(),

module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/acceder.phtml

+7 −1
Changes for module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/acceder.phtml: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
 * @var User $connectedUser

 * @var Mail[] $mails

 * @var string[] $documents

 *

 * @var Agent[] $superieures

 * @var Agent[] $autorites

 */



use Application\Entity\Db\Agent;
@@ -160,7 +163,10 @@ if ($entretien->getEtat()->getCode() === EntretienProfessionnelEtats::ENTRETIEN_ 
<!--            --><?php //endif; ?>



    <div id="validation" class="tab-pane">

        <?php echo $this->partial('partial/validation', ['entretien' => $entretien, 'source' => 'renseignerAction', 'droits' => $droits, 'step' => $step]); ?>

        <?php echo $this->partial('partial/validation', [

                'entretien' => $entretien, 'source' => 'renseignerAction',

                'superieures' => $superieures, 'autorites' => $autorites,

                'droits' => $droits, 'step' => $step]); ?>

    </div>



    <div id="mails" class="tab-pane">

module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/partial/validation.phtml

+4 −0
Changes for module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/partial/validation.phtml: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,8 +4,12 @@ 
 * @var EntretienProfessionnel $entretien

 * @var array $droits

 * @var int $step

 *

 * @var Agent[] $superieures

 * @var Agent[] $autorites

 */



use Application\Entity\Db\Agent;

use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;

use EntretienProfessionnel\Entity\Db\EntretienProfessionnelConstant;

use EntretienProfessionnel\Provider\Privilege\EntretienproPrivileges;