Commit 91172524 authored by Florian Joriot's avatar Florian Joriot
Browse files

Ajout privilèges d'administration taux et type de mission

parent ead32170
Loading
Loading
Loading
Loading
+6 −0
Changes for data/privileges.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -159,6 +159,12 @@ return [
            'validation-realise'     => 'Validation des heures réalisées',
            'devalidation-realise'   => 'Dévalidation des heures réalisées',
            'autovalidation-realise' => 'Auto-validation des heures réalisées',
            'visualisation-type'     => 'Visualisation des types de mission',
            'edition-type'           => 'Edition des types de mission',
            'suppression-type'       => 'Suppression des types de mission',
            'visualisation-taux'     => 'Visualisation des taux de mission',
            'edition-taux'           => 'Edition des taux de mission',
            'suppression-taux'       => 'Suppression des taux de mission',
        ],
    ],

+6 −0
Changes for module/Application/src/Provider/Privilege/Privileges.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -165,9 +165,15 @@ class Privileges extends \UnicaenAuth\Provider\Privilege\Privileges {
    const MISSION_DEVALIDATION_REALISE                         = 'mission-devalidation-realise';
    const MISSION_EDITION                                      = 'mission-edition';
    const MISSION_EDITION_REALISE                              = 'mission-edition-realise';
    const MISSION_EDITION_TAUX                                 = 'mission-edition-taux';
    const MISSION_EDITION_TYPE                                 = 'mission-edition-type';
    const MISSION_SUPPRESSION_TAUX                             = 'mission-suppression-taux';
    const MISSION_SUPPRESSION_TYPE                             = 'mission-suppression-type';
    const MISSION_VALIDATION                                   = 'mission-validation';
    const MISSION_VALIDATION_REALISE                           = 'mission-validation-realise';
    const MISSION_VISUALISATION                                = 'mission-visualisation';
    const MISSION_VISUALISATION_TAUX                           = 'mission-visualisation-taux';
    const MISSION_VISUALISATION_TYPE                           = 'mission-visualisation-type';
    const MODIF_SERVICE_DU_ASSOCIATION                         = 'modif-service-du-association';
    const MODIF_SERVICE_DU_EDITION                             = 'modif-service-du-edition';
    const MODIF_SERVICE_DU_EXPORT_CSV                          = 'modif-service-du-export-csv';
+27 −7
Changes for module/Mission/config/module.config.php: 27 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ return [
            'privileges' => [
                Privileges::MISSION_EDITION,
            ],
            //'assertion'  => Assertion\MissionAssertion::class,
        ],
        [
            'controller' => MissionController::class,
@@ -187,7 +186,6 @@ return [
            'privileges' => [
                Privileges::MISSION_VALIDATION,
            ],
            //'assertion'  => Assertion\MissionAssertion::class,
        ],
        [
            'controller' => MissionController::class,
@@ -198,20 +196,42 @@ return [
            //'assertion'  => Assertion\MissionAssertion::class,
        ],
        [
            //TODO droit acces
            'controller' => MissionTauxController::class,
            'action'     => ['index', 'supprimer', 'supprimerValeur', 'saisir', 'saisirValeur'],
            'action'     => ['index'],
            'privileges' => [
                Privileges::MISSION_VISUALISATION,
                Privileges::MISSION_VISUALISATION_TAUX,
            ],
        ],
        [
            'controller' => MissionTauxController::class,
            'action'     => ['saisir', 'saisirValeur'],
            'privileges' => [
                Privileges::MISSION_EDITION_TAUX,
            ],
        ],
        [
            'controller' => MissionTauxController::class,
            'action'     => ['supprimer', 'supprimerValeur'],
            'privileges' => [
                Privileges::MISSION_SUPPRESSION_TAUX,
            ],
        ],

        [
            //TODO droit acces
            'controller' => MissionTypeController::class,
            'action'     => ['index'],
            'privileges' => [
                Privileges::MISSION_VISUALISATION_TYPE,
            ],
            'controller' => MissionTypeController::class,
            'action'     => ['index', 'supprimer', 'saisir'],
            'privileges' => [
                Privileges::MISSION_VISUALISATION,
                Privileges::MISSION_EDITION_TYPE,
            ],
            'controller' => MissionTypeController::class,
            'action'     => ['index', 'supprimer', 'saisir'],
            'privileges' => [
                Privileges::MISSION_SUPPRESSION_TYPE,
            ],
        ],
    ],
+23 −2
Changes for module/Mission/view/mission/mission-taux/index.phtml: 23 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3,11 +3,14 @@
 * @var $this              \Application\View\Renderer\PhpRenderer
 */

use Application\Provider\Privilege\Privileges;
use Mission\Entity\Db\MissionTauxRemu;
use Mission\Entity\Db\MissionTauxRemuValeur;


$this->headTitle()->append("Gestion des taux de missions");
$canEdit      = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_TAUX));
$canSupprimer = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_SUPPRESSION_TAUX));
echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
?>
<h1 class="page-header">Gestion des taux de missions</h1>
@@ -23,7 +26,10 @@ $anneeSplit = explode('/', $annee); ?>
        <th style="text-align: center">Libelle</th>
        <th style="text-align: center">Code</th>
        <th style="text-align: center">Valeurs de l'année <?php echo $annee ?></th>
        <?php if ($canSupprimer || $canEdit): ?>
            <th style="text-align: center">Action</th>
        <?php endif; ?>

    </tr>
    </thead>

@@ -43,19 +49,23 @@ $anneeSplit = explode('/', $annee); ?>
                    if ($tauxRemuValeur->getDateEffet() >= new DateTime($dateDebutAnnee) && $tauxRemuValeur->getDateEffet() < new DateTime($dateFinAnnee)):
                        $dateValide = true; ?>
                        <?php $newDate = $tauxRemuValeur->getDateEffet()->format('d/m/Y'); ?>
                        <?php if ($canEdit): ?>

                        <a class="ajax-modal " data-event="taux-valeur-edition"
                           href="<?= $this->url("missions-taux/saisir-valeur", ['missionTauxRemu' => $tauxRemu, 'missionTauxRemuValeur' => $tauxRemuValeur->getId()]) ?>"
                           title="Modifier la valeur du taux">
                            <?php echo $tauxRemuValeur->getValeur() ?> - <?php echo $newDate ?><br>
                        </a>
                        <?php else: ?>
                            <?php echo $tauxRemuValeur->getValeur() ?> - <?php echo $newDate ?><br>
                        <?php endif; ?>
                    <?php else:
                        $taux = $taux . "valeur: " . $tauxRemuValeur->getValeur() . " - Date: " . $tauxRemuValeur->getDateEffet()->format('d/m/Y') . "\n";
                    endif;
                endforeach;
                if ($taux != "") : ?>
                    <i class="fa-solid fa-circle-question" title="<?= $taux ?>"></i>
                <?php elseif (!$dateValide): ?>
                <?php elseif (!$dateValide && $canEdit): ?>
                    <a class="ajax-modal " data-event="taux-valeur-edition"
                       href="<?= $this->url("missions-taux/saisir-valeur", ['missionTauxRemu' => $tauxRemu->getId()], []) ?>"
                       title="Ajouter une valeur">
@@ -63,23 +73,33 @@ $anneeSplit = explode('/', $annee); ?>
                    </a>
                <?php endif; ?>
            </td>
            <td><a class="ajax-modal " data-event="taux-edition"
            <?php if ($canSupprimer || $canEdit): ?>

                <td>
                    <?php if ($canEdit): ?>
                        <a class="ajax-modal " data-event="taux-edition"
                           href="<?= $this->url("missions-taux/saisir", ['missionTauxRemu' => $tauxRemu->getId()], []) ?>"
                           title="Modifier le taux"><i class="fas fa-pen-to-square"></i></a>
                    <?php endif; ?>
                    <?php if ($canSupprimer): ?>

                        <a class="pop-ajax " data-title="Suppression d'un taux" data-content="Êtes-vous sur de vouloir supprimer"
                           data-confirm="true"
                           data-submit-reload="true"
                           href="<?= $this->url("missions-taux/supprimer", ['missionTauxRemu' => $tauxRemu->getId()]) ?>"
                           title="Supprimer le taux"><i class="fas fa-trash-can"></i></a>
                    <?php endif; ?>

                </td>
            <?php endif; ?>

        </tr>

    <?php endforeach; ?>
    </tbody>

</table>
<?php if ($canEdit): ?>
    <div>
        <a class="btn btn-primary ajax-modal " data-event="taux-edition"
           href="<?= $this->url("missions-taux/saisir", []) ?>"
@@ -87,6 +107,7 @@ $anneeSplit = explode('/', $annee); ?>
            <i class="fas fa-plus"></i> Ajouter un taux
        </a>
    </div>
<?php endif; ?>


<script type="text/javascript">
+14 −2
Changes for module/Mission/view/mission/mission-type/index.phtml: 14 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@
 * @var $this              \Application\View\Renderer\PhpRenderer
 */

use Application\Provider\Privilege\Privileges;

$this->headTitle()->append("Gestion des types de missions");
echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
$canEdit      = true;
$canSupprimer = true;
$canEdit      = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_EDITION_TYPE));
$canSupprimer = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_SUPPRESSION_TYPE));
?>
<h1 class="page-header">Gestion des types de missions</h1>

@@ -16,7 +18,9 @@ $canSupprimer = true;
        <th style="text-align: center">Libelle</th>
        <th style="text-align: center">Code</th>
        <th style="text-align: center">Type de rémunération</th>
        <?php if ($canSupprimer || $canEdit): ?>
            <th style="text-align: center">Action</th>
        <?php endif; ?>
    </tr>
    </thead>
    <tbody>
@@ -26,12 +30,16 @@ $canSupprimer = true;
            <td style="text-align: center"><?php echo $missionType->getLibelle(); ?></td>
            <td style="text-align: center"><?php echo $missionType->getCode() ?></td>
            <td style="text-align: center"><?php echo $missionType->getMissionTauxRemu()->getLibelle() ?></td>
            <?php if ($canSupprimer || $canEdit): ?>
                <td style="text-align: center">
                    <?php if ($canEdit): ?>
                        <a class="ajax-modal " data-event="type-edition"
                           href="<?= $this->url("missions-type/saisir", ['typeMission' => $missionType->getId()]) ?>"
                           title="Modifier le type">
                            <i class="fas fa-pen-to-square"></i>
                        </a>
                    <?php endif; ?>
                    <?php if ($canSupprimer): ?>
                        <a class="pop-ajax" data-event="type-suppression" data-content="Êtes-vous sur de vouloir supprimer"
                           data-confirm="true"
                           data-submit-reload="true"
@@ -39,11 +47,14 @@ $canSupprimer = true;
                           title="Supprimer le type">
                            <i class="fas fa-trash-can"></i>
                        </a>
                    <?php endif; ?>
                </td>
            <?php endif; ?>
        </tr>
    <?php endforeach; ?>
    </tbody>
</table>
<?php if ($canEdit): ?>
    <div>
        <a class="btn btn-primary ajax-modal " data-event="type-edition"
           href="<?= $this->url("missions-type/saisir", []) ?>"
@@ -51,6 +62,7 @@ $canSupprimer = true;
            <i class="fas fa-plus"></i> Ajouter un type
        </a>
    </div>
<?php endif; ?>

<script type="text/javascript">
    $(function () {