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

onglet 1 et 2 de l'entretien ok

parent 741db0c3

module/Application/view/application/entretien-professionnel/partial/formulaire.phtml

+12 −2
Changes for module/Application/view/application/entretien-professionnel/partial/formulaire.phtml: 12 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ $DEBUG = false; 




use Application\Entity\Db\EntretienProfessionnel;

use Application\Provider\Privilege\EntretienproPrivileges;



$canValiderAgent        = $this->isAllowed($entretien, EntretienproPrivileges::ENTRETIENPRO_VALIDER_AGENT);

$canValiderResponsable  = $this->isAllowed($entretien, EntretienproPrivileges::ENTRETIENPRO_VALIDER_RESPONSABLE);

$canValiderDrh          = $this->isAllowed($entretien, EntretienproPrivileges::ENTRETIENPRO_VALIDER_DRH);

$canRenseigner = $canValiderDrh OR $canValiderResponsable OR $canValiderAgent;



$retour = $this->url('entretien-professionnel/renseigner', ['entretien' => $entretien->getId()], ['force_canonical' => false], true);
@@ -58,6 +64,7 @@ $now = new DateTime(); 
    }

?>



<?php if ($canRenseigner) : ?>

    <?php if (($entretien->getDateEntretien() > $now) AND ($entretien->getValidationResponsable() === null OR $entretien->getValidationResponsable()->estHistorise())) : ?>

        <?php

            /** @see \Autoform\View\Helper\InstanceAsFormulaireHelper */
@@ -67,7 +74,10 @@ $now = new DateTime(); 
            echo $this->instanceAsFormulaire()->render($instance, $url, $data);

        ?>

    <?php else : ?>

    NON MODIF

        <?php echo $this->instanceAsText()->render($instance); ?>

    <?php endif; ?>

<?php else : ?>

    <div class="alert alert-danger">

        Vous ne pouvez vous le formulaire d'entretien professionnel.

    </div>

<?php endif; ?>

module/Application/view/application/entretien-professionnel/partial/parcours.phtml

+3 −2
Changes for module/Application/view/application/entretien-professionnel/partial/parcours.phtml: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ use Application\Entity\Db\AgentFormation; 
use Application\Entity\Db\EntretienProfessionnel;

use Application\Entity\Db\ParcoursDeFormation;

use Application\Provider\Privilege\AgentPrivileges;

use Application\Provider\Privilege\EntretienproPrivileges;



$agent = $entretien->getAgent();



$canVoir        = $this->isAllowed($agent, AgentPrivileges::AGENT_ELEMENT_VOIR);

$canAjouter     = $this->isAllowed($agent, AgentPrivileges::AGENT_ELEMENT_AJOUTER);
@@ -30,10 +31,10 @@ $droits = [ 
    'valider' => $canValider,

];

$options = [];

$options['modification'] = $canModifier;

$options['droits'] = $droits;

$options['retour'] = $this->url('entretien-professionnel/renseigner', ['entretien' => $entretien->getId()], ['fragment' => 'parcours'], true);



$agent = $entretien->getAgent();



/** @var AgentApplication $agentApplication */

/** @var AgentCompetence $agentCompetence */