Merge remote-tracking branch 'origin/master'

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',
 
         ],
     ],

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';

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,

module/Mission/src/Controller/MissionTypeController.php

@@ -41,6 +41,7 @@ class MissionTypeController extends AbstractController
     }
 
 
+
     public function visualiserAction()
     {
 
@@ -52,6 +53,7 @@ class MissionTypeController extends AbstractController
     }
 
 
+
     public function saisirAction()
     {
 
@@ -94,7 +96,9 @@ class MissionTypeController extends AbstractController
          * @var TypeMission $entity
          */
         $entity = $this->getEvent()->getParam('typeMission');
-        $canEditCC = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_CENTRE_COUT_TYPE));
+        //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');
@@ -124,6 +128,8 @@ class MissionTypeController extends AbstractController
         return $vm;
     }
 
+
+
     public function CentreCoutsSupprimerAction(): \Laminas\Http\Response
     {
         /**

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()]) ?>"

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);

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);