diff --git a/data/privileges.php b/data/privileges.php index 6b4e85cce0027302aabae5315439b6e9346f283d..42888d623e77cdabc2663293e7eb1268c0c6d0af 100644 --- a/data/privileges.php +++ b/data/privileges.php @@ -171,7 +171,7 @@ return [ 'offre-emploi-postuler' => 'Postuler à une offre d\'emploi', 'candidature-valider' => 'Valider une candidature', 'candidature-visualisation' => 'Visualiser les candidatures d\'une offre', - 'edition-centre-cout-type' => 'Édition des centres de cout d\'un type de mission', +// 'edition-centre-cout-type' => 'Édition des centres de cout d\'un type de mission', ], ], diff --git a/module/Application/src/Provider/Privilege/Privileges.php b/module/Application/src/Provider/Privilege/Privileges.php index b4bfd7099e82e475a96cccfcaa8ce1b4b78428bc..fa9c78041a13df1333d2997d6eb9d43eb74f7baa 100755 --- a/module/Application/src/Provider/Privilege/Privileges.php +++ b/module/Application/src/Provider/Privilege/Privileges.php @@ -176,7 +176,7 @@ class Privileges extends \UnicaenPrivilege\Provider\Privilege\Privileges { const MISSION_DEVALIDATION = 'mission-devalidation'; const MISSION_DEVALIDATION_REALISE = 'mission-devalidation-realise'; const MISSION_EDITION = 'mission-edition'; - const MISSION_EDITION_CENTRE_COUT_TYPE = 'mission-edition-centre-cout-type'; +// const MISSION_EDITION_CENTRE_COUT_TYPE = 'mission-edition-centre-cout-type'; const MISSION_EDITION_REALISE = 'mission-edition-realise'; const MISSION_EDITION_TYPE = 'mission-edition-type'; const MISSION_OFFRE_EMPLOI_AJOUTER = 'mission-offre-emploi-ajouter'; diff --git a/module/Mission/config/type.config.php b/module/Mission/config/type.config.php index 2d0ff049f7b7885341c459f3de9311a1ebf1f272..bacc356c38ef502c10ed726a34dd09e85e74544a 100644 --- a/module/Mission/config/type.config.php +++ b/module/Mission/config/type.config.php @@ -27,18 +27,18 @@ return [ 'action' => 'saisir', 'privileges' => Privileges::MISSION_EDITION_TYPE, ], - 'centre-couts' => [ - 'route' => '/centre-couts/:typeMission', - 'controller' => Controller\MissionTypeController::class, - 'action' => 'centreCouts', - 'privileges' => Privileges::MISSION_EDITION_CENTRE_COUT_TYPE, - ], - 'centre-couts-supprimer' => [ - 'route' => '/centre-couts-supprimer/:typeMission/:centreCoutTypeMission', - 'controller' => Controller\MissionTypeController::class, - 'action' => 'centreCoutsSupprimer', - 'privileges' => Privileges::MISSION_EDITION_CENTRE_COUT_TYPE, - ], +// 'centre-couts' => [ +// 'route' => '/centre-couts/:typeMission', +// 'controller' => Controller\MissionTypeController::class, +// 'action' => 'centreCouts', +// 'privileges' => Privileges::MISSION_EDITION_CENTRE_COUT_TYPE, +// ], +// 'centre-couts-supprimer' => [ +// 'route' => '/centre-couts-supprimer/:typeMission/:centreCoutTypeMission', +// 'controller' => Controller\MissionTypeController::class, +// 'action' => 'centreCoutsSupprimer', +// 'privileges' => Privileges::MISSION_EDITION_CENTRE_COUT_TYPE, +// ], 'supprimer' => [ 'route' => '/supprimer/:typeMission', 'controller' => Controller\MissionTypeController::class, diff --git a/module/Mission/src/Controller/MissionTypeController.php b/module/Mission/src/Controller/MissionTypeController.php index 32a59441433bec385426c13910d5173f046b55d7..f6b390923a8e6b3c472ca913b0b5e41876d4794b 100644 --- a/module/Mission/src/Controller/MissionTypeController.php +++ b/module/Mission/src/Controller/MissionTypeController.php @@ -41,6 +41,7 @@ class MissionTypeController extends AbstractController } + public function visualiserAction() { @@ -48,10 +49,11 @@ class MissionTypeController extends AbstractController $tab = $this->params()->fromQuery('tab', 'fiche'); - return compact( 'typeMission', 'tab'); + return compact('typeMission', 'tab'); } + public function saisirAction() { @@ -93,13 +95,15 @@ class MissionTypeController extends AbstractController /** * @var TypeMission $entity */ - $entity = $this->getEvent()->getParam('typeMission'); - $canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); + $entity = $this->getEvent()->getParam('typeMission'); + //TODO décommenter pour mise en place centre couts par mission + $canEditCC = false; + // $canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); if ($this->getRequest()->isPost()) { $centreCoutsId = $this->getRequest()->getPost()->get('centreCouts'); - $cenCoutsIds = $entity->getCentreCoutsIds(); - if(!in_array($centreCoutsId,$cenCoutsIds)){ + $cenCoutsIds = $entity->getCentreCoutsIds(); + if (!in_array($centreCoutsId, $cenCoutsIds)) { $centreCouts = $this->getServiceCentreCout()->get($centreCoutsId); @@ -124,13 +128,15 @@ class MissionTypeController extends AbstractController return $vm; } + + public function CentreCoutsSupprimerAction(): \Laminas\Http\Response { /** * @var TypeMission $entity */ - $entity = $this->getEvent()->getParam('typeMission'); - $centreCoutsLinker = $this->getEvent()->getParam('centreCoutTypeMission'); + $entity = $this->getEvent()->getParam('typeMission'); + $centreCoutsLinker = $this->getEvent()->getParam('centreCoutTypeMission'); $this->getServiceMissionType()->removeCentreCoutLinker($centreCoutsLinker); diff --git a/module/Mission/view/mission/mission-type/index.phtml b/module/Mission/view/mission/mission-type/index.phtml index 48a76c0b097464fb1e19fa7ba80f75728c2d48aa..afca00666bdd4584a8e570eab8c5be83fa0d26c6 100644 --- a/module/Mission/view/mission/mission-type/index.phtml +++ b/module/Mission/view/mission/mission-type/index.phtml @@ -10,7 +10,8 @@ $this->headTitle()->append("Gestion des types de missions"); echo $this->messenger()->addCurrentMessagesFromFlashMessenger(); $canEdit = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_TYPE)); $canEditPlafond = $this->isAllowed(Privileges::getResourceId(Privileges::PLAFONDS_CONFIG_MISSION)); -$canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); +//TODO décommenter pour mise en place centre couts par mission +//$canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); $canSupprimer = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_SUPPRESSION_TYPE)); ?> <h1 class="page-header">Gestion des types de missions</h1> @@ -24,7 +25,8 @@ $canSupprimer = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_S <th>Besoin de formation</th> <th>Type de rémunération</th> <th>Type de rémunération majoré</th> - <?php if ($canSupprimer || $canEdit || $canEditCC || $canEditPlafond): ?> + <?php //TODO décommenter pour mise en place centre couts par mission ?> + <?php if ($canSupprimer || $canEdit || /*$canEditCC ||*/ $canEditPlafond): ?> <th>Action</th> <?php endif; ?> </tr> @@ -43,9 +45,11 @@ $canSupprimer = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_S <td><?php if ($missionType->getTauxRemuMajore()): echo $missionType->getTauxRemuMajore()->getLibelle(); endif; ?></td> - <?php if ($canSupprimer || $canEdit || $canEditCC || $canEditPlafond): ?> + <?php //TODO décommenter pour mise en place centre couts par mission ?> + <?php if ($canSupprimer || $canEdit ||/* $canEditCC ||*/ $canEditPlafond): ?> <td style="text-align: center"> - <?php if ($canEdit ||$canEditCC || $canEditPlafond): + <?php //TODO décommenter pour mise en place centre couts par mission ?> + <?php if ($canEdit ||/*$canEditCC ||*/ $canEditPlafond): if($canEdit): ?> <a class="ajax-modal " data-event="type-edition" href="<?= $this->url("missions-type/saisir", ['typeMission' => $missionType->getId()]) ?>" diff --git a/module/Mission/view/mission/mission-type/saisir.phtml b/module/Mission/view/mission/mission-type/saisir.phtml index 6ff5bc90ffc29c9a0f270f7f9eaaa0a402395e1e..7d53058a246f1e436b8e44866bebf5ca43d7f78d 100755 --- a/module/Mission/view/mission/mission-type/saisir.phtml +++ b/module/Mission/view/mission/mission-type/saisir.phtml @@ -22,7 +22,8 @@ $tabs = [ $id = $form->get("id")->getValue(); $canEdit = $this->isAllowed(Privileges::getResourceId(Privileges::PLAFONDS_CONFIG_MISSION)); -$canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); +//TODO décommenter pour mise en place centre couts par mission +//$canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); if ($id && $canEdit) { @@ -33,13 +34,14 @@ if ($id && $canEdit) { ]; } -if ($id && $canEditCC) { - - $tabs[] = [ - 'id' => 'centre-couts', - 'label' => '<i class="fas fa-signal"></i> Centre de coûts', - 'url' => $this->url('missions-type/centre-couts', ['typeMission' => $id]), - ]; -} +//TODO décommenter pour mise en place centre couts par mission +//if ($id && $canEditCC) { +// +// $tabs[] = [ +// 'id' => 'centre-couts', +// 'label' => '<i class="fas fa-signal"></i> Centre de coûts', +// 'url' => $this->url('missions-type/centre-couts', ['typeMission' => $id]), +// ]; +//} echo $this->tabajax($tabs, $tab); diff --git a/module/Mission/view/mission/mission-type/visualiser.phtml b/module/Mission/view/mission/mission-type/visualiser.phtml index ad5f969d8f8ec542d0a846f6b13fa97790abd0d7..5bf76fb1e78a8f8ac5315a63acc5807c1c2738d1 100644 --- a/module/Mission/view/mission/mission-type/visualiser.phtml +++ b/module/Mission/view/mission/mission-type/visualiser.phtml @@ -33,7 +33,8 @@ $tabs = [ $id = $typeMission->getId(); $canEditPlafond = $this->isAllowed(Privileges::getResourceId(Privileges::PLAFONDS_CONFIG_MISSION)); -$canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); +//TODO décommenter pour mise en place centre couts par mission +//$canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE)); if ($id && $canEditPlafond) { @@ -44,13 +45,14 @@ if ($id && $canEditPlafond) { ]; } -if ($id && $canEditCC) { - - $tabs[] = [ - 'id' => 'centre-couts', - 'label' => '<i class="fas fa-eur"></i> Centre de coûts', - 'url' => $this->url('missions-type/centre-couts', ['typeMission' => $id]), - ]; -} +//TODO décommenter pour mise en place centre couts par mission +//if ($id && $canEditCC) { +// +// $tabs[] = [ +// 'id' => 'centre-couts', +// 'label' => '<i class="fas fa-eur"></i> Centre de coûts', +// 'url' => $this->url('missions-type/centre-couts', ['typeMission' => $id]), +// ]; +//} echo $this->tabajax($tabs, $tab);