Commit 8fa39a56 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Ajout du CanAddHeures pour préparer l'ajout d'heures à des missions validées

parent b652e3bf
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Mission/config/saisie.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@

namespace Mission;

use Application\Entity\Db\WfEtape;
use Application\Provider\Privilege\Privileges;
use UnicaenPrivilege\Assertion\AssertionFactory;
use UnicaenPrivilege\Guard\PrivilegeController;
@@ -135,6 +134,7 @@ return [
    'rules' => [
        [
            'privileges' => [
                Assertion\SaisieAssertion::CAN_ADD_HEURES,
                Privileges::MISSION_EDITION,
                Privileges::MISSION_VALIDATION,
                Privileges::MISSION_DEVALIDATION
+14 −4
Changes for module/Mission/src/Assertion/SaisieAssertion.php: 14 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ use Laminas\Permissions\Acl\Resource\ResourceInterface;
 */
class SaisieAssertion extends AbstractAssertion
{
    use WorkflowServiceAwareTrait;
    const CAN_ADD_HEURES = 'can-add-heures';

    use WorkflowServiceAwareTrait;


    protected function assertController($controller, $action = null, $privilege = null)
@@ -90,12 +91,11 @@ class SaisieAssertion extends AbstractAssertion
        // Si le rôle n'est pas renseigné alors on s'en va...
        if (!$role instanceof Role) return false;

        // pareil si le rôle ne possède pas le privilège adéquat
        if ($privilege && !$role->hasPrivilege($privilege)) return false;

        switch (true) {
            case $entity instanceof Mission:
                switch ($privilege) {
                    case self::CAN_ADD_HEURES: // Attention à bien avoir généré le fournisseur de privilèges si vous utilisez la gestion des privilèges d'UnicaenAuth
                        return $this->assertMissionAddHeures($role, $entity);
                    case Privileges::MISSION_EDITION: // Attention à bien avoir généré le fournisseur de privilèges si vous utilisez la gestion des privilèges d'UnicaenAuth
                        return $this->assertMissionEdition($role, $entity);
                    case Privileges::MISSION_VALIDATION:
@@ -122,6 +122,16 @@ class SaisieAssertion extends AbstractAssertion



    protected function assertMissionAddHeures(Role $role, Mission $mission)
    {
        return $this->asserts([
            $mission->canAddHeures(),
            $this->assertMission($role, $mission),
        ]);
    }



    protected function assertMissionEdition(Role $role, Mission $mission)
    {
        return $this->asserts([
+3 −1
Changes for module/Mission/src/Service/MissionService.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ namespace Mission\Service;
use Application\Provider\Privilege\Privileges;
use Application\Service\AbstractEntityService;
use Application\Service\Traits\SourceServiceAwareTrait;
use Doctrine\ORM\Query;
use Mission\Assertion\SaisieAssertion;
use Mission\Entity\Db\Candidature;
use Mission\Entity\Db\Mission;
use Mission\Entity\Db\VolumeHoraireMission;
@@ -110,6 +110,7 @@ class MissionService extends AbstractEntityService
            'valide',
            'validation',
            'canSaisie',
            'canAddHeures',
            'canValider',
            'canDevalider',
            'canSupprimer',
@@ -118,6 +119,7 @@ class MissionService extends AbstractEntityService
        $triggers = [
            '/' => function (Mission $original, array $extracted) {
                $extracted['canSaisie'] = $this->getAuthorize()->isAllowed($original, Privileges::MISSION_EDITION);
                $extracted['canAddHeures'] = $this->getAuthorize()->isAllowed($original, SaisieAssertion::CAN_ADD_HEURES);
                $extracted['canValider'] = $this->getAuthorize()->isAllowed($original, Privileges::MISSION_VALIDATION);
                $extracted['canDevalider'] = $this->getAuthorize()->isAllowed($original, Privileges::MISSION_DEVALIDATION);
                $extracted['canSupprimer'] = $this->getAuthorize()->isAllowed($original, Privileges::MISSION_EDITION);