Commit 4423af5d authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into FJ_Correction_bug

parents 547d4c3e 0a23e99d
Loading
Loading
Loading
Loading
+16
Changes for code/test3.php: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,3 +7,19 @@
 * @var $viewName   string
 * @var $viewFile   string
 */

/** @var \Application\Service\ContextService $c */
$c = $container->get(\Application\Service\ContextService::class);

$roleId = $c->getSelectedIdentityRole()->getRoleId();
var_dump($roleId);


$p = $c->getIntervenant()->getStatut()->getPrivileges();
foreach ($p as $priv => $ok) {
    if (!$ok) unset($p[$priv]);
}

//$p = $r->getPrivileges();

var_dump(array_keys($p));
 No newline at end of file
+17 −14
Changes for composer.lock: 17 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -3150,16 +3150,16 @@
        },
        {
            "name": "laminas/laminas-ldap",
            "version": "2.12.0",
            "version": "2.13.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-ldap.git",
                "reference": "b07b8714363d5acb82af74efb9e96d5436e1b044"
                "reference": "308f7749b12e2c14e91f51ddca4e2296fafe2367"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/laminas/laminas-ldap/zipball/b07b8714363d5acb82af74efb9e96d5436e1b044",
                "reference": "b07b8714363d5acb82af74efb9e96d5436e1b044",
                "url": "https://api.github.com/repos/laminas/laminas-ldap/zipball/308f7749b12e2c14e91f51ddca4e2296fafe2367",
                "reference": "308f7749b12e2c14e91f51ddca4e2296fafe2367",
                "shasum": ""
            },
            "require": {
@@ -3212,7 +3212,7 @@
                    "type": "community_bridge"
                }
            ],
            "time": "2021-12-03T12:08:21+00:00"
            "time": "2022-03-19T15:18:53+00:00"
        },
        {
            "name": "laminas/laminas-loader",
@@ -4864,24 +4864,30 @@
        },
        {
            "name": "laminas/laminas-view",
            "version": "2.19.1",
            "version": "2.20.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-view.git",
                "reference": "5f2ed1af896543e986090afb6433e32409c99d4d"
                "reference": "2cd6973a3e042be3d244260fe93f435668f5c2b4"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/laminas/laminas-view/zipball/5f2ed1af896543e986090afb6433e32409c99d4d",
                "reference": "5f2ed1af896543e986090afb6433e32409c99d4d",
                "url": "https://api.github.com/repos/laminas/laminas-view/zipball/2cd6973a3e042be3d244260fe93f435668f5c2b4",
                "reference": "2cd6973a3e042be3d244260fe93f435668f5c2b4",
                "shasum": ""
            },
            "require": {
                "container-interop/container-interop": "^1.2",
                "ext-dom": "*",
                "ext-filter": "*",
                "ext-json": "*",
                "laminas/laminas-escaper": "^2.5",
                "laminas/laminas-eventmanager": "^3.4",
                "laminas/laminas-json": "^3.3",
                "laminas/laminas-servicemanager": "^3.10",
                "laminas/laminas-stdlib": "^3.6",
                "php": "^7.4 || ~8.0.0 || ~8.1.0"
                "php": "^7.4 || ~8.0.0 || ~8.1.0",
                "psr/container": "^1 || ^2"
            },
            "conflict": {
                "container-interop/container-interop": "<1.2",
@@ -4891,11 +4897,9 @@
                "zendframework/zend-view": "*"
            },
            "require-dev": {
                "ext-dom": "*",
                "laminas/laminas-authentication": "^2.5",
                "laminas/laminas-coding-standard": "~2.3.0",
                "laminas/laminas-console": "^2.6",
                "laminas/laminas-escaper": "^2.5",
                "laminas/laminas-feed": "^2.15",
                "laminas/laminas-filter": "^2.13.0",
                "laminas/laminas-http": "^2.15",
@@ -4908,7 +4912,6 @@
                "laminas/laminas-paginator": "^2.11.0",
                "laminas/laminas-permissions-acl": "^2.6",
                "laminas/laminas-router": "^3.0.1",
                "laminas/laminas-servicemanager": "^3.4",
                "laminas/laminas-uri": "^2.5",
                "phpspec/prophecy": "^1.12",
                "phpspec/prophecy-phpunit": "^2.0",
@@ -4964,7 +4967,7 @@
                    "type": "community_bridge"
                }
            ],
            "time": "2022-01-12T16:20:05+00:00"
            "time": "2022-02-22T13:52:44+00:00"
        },
        {
            "name": "mpdf/mpdf",
+1 −1
Changes for data/indicateurs.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ return [
                'enabled'           => true,
                'libelle_singulier' => '%s intervenant a saisi des enseignements dont l\'étape, l\'élément pédagogique ou la période ont disparu',
                'libelle_pluriel'   => '%s intervenants ont saisi des enseignements dont l\'étape, l\'élément pédagogique ou la période ont disparu',
                'route'             => 'intervenant/services',
                'route'             => 'intervenant/services-prevus',
                'irrecevables'      => false,
            ],
        ],
+1 −1
Changes for data/workflow_etapes.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ return [
    "SERVICE_SAISIE"                 => [
        "LIBELLE_INTERVENANT" => "Je saisis mes enseignements prévisionnels",
        "LIBELLE_AUTRES"      => "J'accède aux enseignements prévisionnels",
        "ROUTE"               => "intervenant/services",
        "ROUTE"               => "intervenant/services-prevus",
        "DESC_NON_FRANCHIE"   => "Aucun enseignement prévisionnel n'a été saisi",
        "OBLIGATOIRE"         => true,
    ],
+17 −12
Changes for module/Application/config/intervenant.config.php: 17 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -182,14 +182,13 @@ return [
                            ],
                        ],
                    ],
                    'services'                => [
                    'services-prevus'         => [
                        'type'    => 'Segment',
                        'options' => [
                            'route'    => '/:intervenant/services',
                            'route'    => '/:intervenant/services-prevus',
                            'defaults' => [
                                'controller' => 'Application\Controller\Intervenant',
                                'action'                   => 'services',
                                'type-volume-horaire-code' => Entity\Db\TypeVolumeHoraire::CODE_PREVU,
                                'action'     => 'services-prevus',
                            ],
                        ],
                    ],
@@ -210,8 +209,7 @@ return [
                            'route'    => '/:intervenant/services-realises',
                            'defaults' => [
                                'controller' => 'Application\Controller\Intervenant',
                                'action'                   => 'services',
                                'type-volume-horaire-code' => Entity\Db\TypeVolumeHoraire::CODE_REALISE,
                                'action'     => 'services-realises',
                            ],
                        ],
                    ],
@@ -415,16 +413,16 @@ return [
                                'resource'     => PrivilegeController::getResourceId('Application\Controller\ModificationServiceDu', 'saisir'),
                                'order'        => 4,
                            ],
                            'service'                 => [
                            'services-prevus'         => [
                                'label'               => "Enseignements prévisionnels",
                                'title'               => "Enseignements prévisionnels de l'intervenant",
                                'route'               => 'intervenant/services',
                                'route'               => 'intervenant/services-prevus',
                                'paramsInject'        => [
                                    'intervenant',
                                ],
                                'workflow-etape-code' => WfEtape::CODE_SERVICE_SAISIE,
                                'withtarget'          => true,
                                'resource'            => PrivilegeController::getResourceId('Application\Controller\Intervenant', 'services'),
                                'resource'            => PrivilegeController::getResourceId('Application\Controller\Intervenant', 'services-prevus'),
                                'visible'             => Assertion\ServiceAssertion::class,
                                'order'               => 6,
                            ],
@@ -448,7 +446,7 @@ return [
                                ],
                                'workflow-etape-code' => WfEtape::CODE_SERVICE_SAISIE_REALISE,
                                'withtarget'          => true,
                                'resource'            => PrivilegeController::getResourceId('Application\Controller\Intervenant', 'services'),
                                'resource'            => PrivilegeController::getResourceId('Application\Controller\Intervenant', 'services-realises'),
                                'visible'             => Assertion\ServiceAssertion::class,
                                'order'               => 13,
                            ],
@@ -477,11 +475,18 @@ return [
                ],
                [
                    'controller' => 'Application\Controller\Intervenant',
                    'action'     => ['services'],
                    'action'     => ['services-prevus'],
                    'privileges' => [
                        Privileges::ENSEIGNEMENT_PREVU_VISUALISATION,
                        Privileges::ENSEIGNEMENT_REALISE_VISUALISATION,
                        Privileges::REFERENTIEL_PREVU_VISUALISATION,
                    ],
                    'assertion'  => Assertion\ServiceAssertion::class,
                ],
                [
                    'controller' => 'Application\Controller\Intervenant',
                    'action'     => ['services-realises'],
                    'privileges' => [
                        Privileges::ENSEIGNEMENT_REALISE_VISUALISATION,
                        Privileges::REFERENTIEL_REALISE_VISUALISATION,
                    ],
                    'assertion'  => Assertion\ServiceAssertion::class,
Loading