Commit 51b66563 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'feature_saisie_these' into release_9.0.0

parents e63d0123 f7d9bbfe
Loading
Loading
Loading
Loading
+690 −0

File added.

Preview size limit exceeded, changes collapsed.

+8 −2
Changes for module/Application/config/module.config.php: 8 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ use Application\Entity\UserWrapperFactory;
use Application\Entity\UserWrapperFactoryFactory;
use Application\Event\UserAuthenticatedEventListenerFactory;
use Application\Event\UserRoleSelectedEventListener;
use Application\Form\Factory\RoleFormFactory;
use Application\Form\RoleForm;
use Application\Navigation\NavigationFactoryFactory;
use Application\ORM\Query\Functions\Npd;
use Application\ORM\Query\Functions\StrReduce;
@@ -215,7 +217,7 @@ return array(
    'service_manager' => array(
        'aliases' => array(
            'UserContextService' => 'UnicaenAuth\Service\UserContext',
            RoleService::class => 'RoleService',
            'RoleService' =>  RoleService::class,
            UserContextService::class => 'UserContextService',
        ),
        'invokables' => array(
@@ -227,7 +229,7 @@ return array(
            'UnicaenAuth\Service\UserContext' => UserContextServiceFactory::class,
            'UserAuthenticatedEventListener' => UserAuthenticatedEventListenerFactory::class,
            'Sygal\Memcached'                => MemcachedFactory::class,
            'RoleService' => RoleServiceFactory::class,
            RoleService::class => RoleServiceFactory::class,
            SourceCodeStringHelper::class => SourceCodeStringHelperFactory::class,
            UserWrapperFactory::class => UserWrapperFactoryFactory::class,
        ),
@@ -307,6 +309,7 @@ return array(
        ],
        'factories' => [
            'EcoleDoctoraleForm' => EcoleDoctoraleFormFactory::class,
            RoleForm::class => RoleFormFactory::class,
        ],
//        'initializers' => [
//            'UnicaenApp\Service\EntityManagerAwareInitializer',
@@ -314,6 +317,8 @@ return array(
    ],
    'public_files' => [
        'head_scripts' => [
            '050_select2' => "/vendor/select2-4.0.13/dist/js/select2.min.js",
            '050_select2_fr' => "/vendor/select2-4.0.13/dist/js/i18n/fr.js",
            '060_uploader' => "/vendor/jquery.ui.widget.js",
            '061_uploader' => "/vendor/jquery.iframe-transport.js",
            '062_uploader' => "/vendor/jquery.fileupload.js",
@@ -329,6 +334,7 @@ return array(
            '200_fa' => '/vendor/fontawesome-free-5.12.0-web/css/all.min.css',
            '300_bs' => '/vendor/bootstrap-select-1.14.0-beta3/css/bootstrap-select.min.css',
            '400_faa' => '/vendor/font-awesome-animation.min.css',
            '500_select2' => "/vendor/select2-4.0.13/dist/css/select2.min.css",
            '900_faa' => '/css/rapport-activite.css',
        ],
        'printable_stylesheets' => [
+42 −0
Changes for module/Application/config/others/admin.config.php: 42 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ return [
                        'index',
                        'incrementer-ordre',
                        'decrementer-ordre',
                        'ajouter',
                        'editer',
                        'supprimer',
                    ],
                    'roles' => [
                        'Administrateur technique'
@@ -79,6 +82,45 @@ return [
                    ],
                ],
            ],
            'role' => [
                'type'          => 'Segment',
                'options'       => [
                    'route'    => '/role',
                ],
                'may_terminate' => false,
                'child_routes' => [
                    'ajouterRole' => [
                        'type'          => Segment::class,
                        'options'       => [
                            'route'    => '/ajouter',
                            'defaults' => [
                                'controller'    => RoleController::class,
                                'action'        => 'ajouter',
                            ],
                        ],
                    ],
                    'editerRole' => [
                        'type'          => Segment::class,
                        'options'       => [
                            'route'    => '/editer/:role',
                            'defaults' => [
                                'controller'    => RoleController::class,
                                'action'        => 'editer',
                            ],
                        ],
                    ],
                    'supprimerRole' => [
                        'type'          => Segment::class,
                        'options'       => [
                            'route'    => '/supprimer/:role',
                            'defaults' => [
                                'controller'    => RoleController::class,
                                'action'        => 'supprimer',
                            ],
                        ],
                    ],
                ]
            ],
            'gestion-privilege' => [
                'type'          => Literal::class,
                'options'       => [
+98 −0
Changes for module/Application/config/others/autorisation-inscription.config.php: 98 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application;

use Application\Assertion\AutorisationInscription\AutorisationInscriptionAssertion;
use Application\Assertion\AutorisationInscription\AutorisationInscriptionAssertionFactory;
use Application\Controller\AutorisationInscriptionController;
use Application\Controller\Factory\AutorisationInscriptionControllerFactory;
use Application\Form\AutorisationInscriptionForm;
use Application\Form\Factory\AutorisationInscriptionFormFactory;
use Application\Provider\Privilege\AutorisationInscriptionPrivileges;
use Application\Service\AutorisationInscription\AutorisationInscriptionService;
use Application\Service\AutorisationInscription\AutorisationInscriptionServiceFactory;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;

return [
    'bjyauthorize'    => [
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'AutorisationInscription' => [],
            ],
        ],
        'rule_providers'     => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                    [
                        'privileges' => [
                            AutorisationInscriptionPrivileges::AUTORISATION_INSCRIPTION_AJOUTER,
                        ],
                        'resources'  => ['AutorisationInscription'],
                        'assertion' => AutorisationInscriptionAssertion::class,
                    ],
                ],
            ],
        ],
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => AutorisationInscriptionController::class,
                    'action'     => [
                        'ajouter'
                    ],
                    'privileges' => [
                        AutorisationInscriptionPrivileges::AUTORISATION_INSCRIPTION_AJOUTER,
                    ],
                    'assertion' => AutorisationInscriptionAssertion::class,
                ],
            ],
        ],
    ],
    'router' => [
        'routes' => [
            'autoriser-inscription' => [
                'type' => 'Literal',
                'options' => [
                    'route' => '/autoriser-inscription',
                    'defaults' => [
                        'controller' => AutorisationInscriptionController::class,
                    ],
                ],
                'may_terminate' => false,
                'child_routes' => [
                    'ajouter' => [
                        'type' => 'Segment',
                        'options' => [
                            'route' => '/ajouter/:rapport',
                            'constraints' => [
                                'rapport' => '\d+',
                            ],
                            'defaults' => [
                                'controller' => AutorisationInscriptionController::class,
                                'action' => 'ajouter',
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],

    'service_manager' => [
        'factories' => [
            AutorisationInscriptionService::class => AutorisationInscriptionServiceFactory::class,
            AutorisationInscriptionAssertion::class => AutorisationInscriptionAssertionFactory::class
        ],
    ],
    'controllers' => [
        'factories' => [
            AutorisationInscriptionController::class => AutorisationInscriptionControllerFactory::class,
        ],
    ],
    'form_elements'   => [
        'factories' => [
            AutorisationInscriptionForm::class => AutorisationInscriptionFormFactory::class
        ],
    ],
];
+14 −0
Changes for module/Application/config/others/rapports.config.php: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ return [
                    'controller' => RapportCsiController::class,
                    'action'     => [
                        'consulter',
                        'autoriser-reinscription' // à modifier ensuite
                    ],
                    'privileges' => [
                        RapportPrivileges::RAPPORT_CSI_LISTER_TOUT,
@@ -310,6 +311,19 @@ return [
                            ],
                        ],
                    ],
                    'autoriser-reinscription' => [
                        'type' => 'Segment',
                        'options' => [
                            'route' => '/autoriser-reinscription/:rapport',
                            'constraints' => [
                                'rapport' => '\d+',
                            ],
                            'defaults' => [
                                'controller' => RapportCsiController::class,
                                'action' => 'autoriser-reinscription',
                            ],
                        ],
                    ],
                ],
            ],

Loading