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

Application des niveaux + correction assertion ENTRETIENPRO_VALIDER_RESPONSABLE

parent 69248600

module/Application/src/Application/Controller/CorpsControllerFactory.php

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
namespace Application\Controller;



use Application\Form\ModifierNiveau\ModifierNiveauForm;

use Application\Service\Agent\AgentService;

use Application\Service\Categorie\CategorieService;

use Application\Service\Corps\CorpsService;

use Application\Service\Correspondance\CorrespondanceService;

module/Application/src/Application/Controller/MissionSpecifiqueAffectationController.php

+3 −6
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ use Application\Service\Agent\AgentServiceAwareTrait; 
use Application\Service\MissionSpecifique\MissionSpecifiqueAffectationServiceAwareTrait;

use Application\Service\MissionSpecifique\MissionSpecifiqueServiceAwareTrait;

use Application\Service\Structure\StructureServiceAwareTrait;

use Mpdf\MpdfException;

use UnicaenApp\Form\Element\SearchAndSelect;

use UnicaenDocument\Service\Exporter\ExporterServiceAwareTrait;

use Zend\Http\Request;
@@ -25,7 +24,7 @@ class MissionSpecifiqueAffectationController extends AbstractActionController { 


    use AgentMissionSpecifiqueFormAwareTrait;



    public function indexAction()

    public function indexAction() : ViewModel

    {

        $fromQueries  = $this->params()->fromQuery();

        $agentId      = $fromQueries['agent'];
@@ -47,7 +46,8 @@ class MissionSpecifiqueAffectationController extends AbstractActionController { 
        ]);

    }



    public function afficherAction() {

    public function afficherAction() : ViewModel

    {

        $affectation = $this->getMissionSpecifiqueAffectationService()->getRequestedAffectation($this);



        $vm = new ViewModel();
@@ -196,9 +196,6 @@ class MissionSpecifiqueAffectationController extends AbstractActionController { 
        return $vm;

    }



    /**

     * @throws MpdfException

     */

    public function genererLettreTypeAction()

    {

        $affectation = $this->getMissionSpecifiqueAffectationService()->getRequestedAffectation($this);

module/Application/src/Application/Service/FichePoste/FichePosteService.php

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ class FichePosteService { 
        }



        foreach ($activites as $activite) {

            foreach ($activite->getFormations() as $formation) {

            foreach ($activite->getFormationListe() as $formation) {

                $dictionnaire[$formation->getId()]["object"] = $formation;

                $dictionnaire[$formation->getId()]["raison"][] = $activite;

                $dictionnaire[$formation->getId()]["conserve"] = true;

module/Application/src/Application/View/Helper/partial/fiches-postes-as-table.phtml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ if ($retour) $query['retour'] = $retour; 
            <th> Modification </th>

        <?php endif; ?>

        <?php if ($displays['action']) : ?>

            <th class="cell-action"> Action </th>

            <th class="cell-action" style="width: 11rem;"> Action </th>

        <?php endif; ?>

    </tr>

    </thead>

module/Application/view/application/activite/index.phtml

+20 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ $this->headTitle('Missions principales'); 
$canVisualiser  = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_AFFICHER));

$canAjouter     = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_AJOUTER));

$canEditer      = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_MODIFIER));

$canModifierNiveaux      = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_MODIFIER));

$canHistoriser  = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_HISTORISER));

$canEffacer     = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_DETRUIRE));

?>
@@ -38,6 +39,7 @@ $canEffacer = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePri 
        <thead>

            <tr>

                <th> Mission </th>

                <th> Niveaux </th>

                <th> Description </th>

                <th> Modification </th>

                <th style="width:10rem;"> Action </th>
@@ -49,6 +51,24 @@ $canEffacer = $this->isAllowed(ActivitePrivileges::getResourceId(ActivitePri 
                    <td>

                        <?php echo $activite->getLibelle(); ?> <br/>

                    </td>

                    <td>

                        <?php echo $this->niveauEnveloppe($activite->getNiveaux()) ?>

                        <?php if ($canModifierNiveaux) : ?>

                            <?php if ($activite->getNiveaux()) : ?>

                                <?php /**  @see \Application\Controller\ActiviteController::modifierNiveauxAction() */ ?>

                                <a href="<?php echo $this->url('activite/modifier-niveaux', ['activite' => $activite->getId()], [], true); ?>"

                                   class="ajax-modal" data-event="modification"

                                >

                                    <span class="icon editer"></span></a>

                            <?php else : ?>

                                <?php /**  @see \Application\Controller\ActiviteController::ajouterNiveauxAction() */ ?>

                                <a href="<?php echo $this->url('activite/ajouter-niveaux', ['activite' => $activite->getId()], [], true); ?>"

                                   class="ajax-modal" data-event="modification"

                                >

                                    <span class="icon ajouter"></span></a>

                            <?php endif; ?>

                        <?php endif; ?>

                    </td>

                    <td>

                        #Desc: <?php echo count($activite->getDescriptions()); ?> <br/>

                       <?php echo count($activite->getApplicationCollection()); ?>/<?php echo count($activite->getCompetenceCollection()); ?>/<?php echo count($activite->getFormationCollection()); ?>