Commit 5ab30faf authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Première version de la page de dépôt des rapports annuels

parent e82a57fa
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Application/config/module.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -277,6 +277,9 @@ return array(
            '062_uploader' => "/js/jquery.fileupload.js",
            '063_uploader' => "/js/unicaen.uploader.widget.js",
        ],
        'inline_scripts' => [
            '070_bootstrap-confirmation' => 'vendor/bootstrap-confirmation-2.4.4/bootstrap-confirmation.min.js',
        ],
        'stylesheets'           => [
            '050_bootstrap-theme' => false,
            '100_charte' => '/css/charte.css',
+249 −0
Changes for module/Application/config/others/fichier-these.config.php: 249 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

/**
 * Config concernant les fichiers liés à une thèse.
 */

use Application\Controller\Factory\FichierTheseControllerFactory;
use Application\Controller\FichierTheseController;
use Application\Controller\Plugin\UrlFichierThese;
use Application\Provider\Privilege\ThesePrivileges;
use Application\Provider\Privilege\ValidationPrivileges;
use Application\Service\FichierThese\FichierTheseServiceFactory;
use UnicaenAuth\Guard\PrivilegeController;

return [
    'bjyauthorize'    => [
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'deposes',
                    ],
                    'privileges' => ValidationPrivileges::THESE_VALIDATION_RDV_BU,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'lister-fichiers',
                    ],
                    'privileges' => ThesePrivileges::THESE_CONSULTATION_DEPOT,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'telecharger-fichier',
                        'apercevoir-fichier',
                    ],
                    'privileges' => ThesePrivileges::THESE_TELECHARGEMENT_FICHIER,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'apercevoir-page-de-couverture',
                    ],
                    'role' => ThesePrivileges::THESE_TELECHARGEMENT_FICHIER,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'televerser-fichier',
                        'supprimer-fichier',
                    ],
                    'privileges' => ThesePrivileges::THESE_DEPOT_VERSION_INITIALE,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'televerser-fichier',
                        'supprimer-fichier',
                    ],
                    'privileges' => ThesePrivileges::THESE_DEPOT_VERSION_CORRIGEE,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'fusionnerConsole',
                    ],
                    'roles' => [],
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'recuperer-fusion',
                    ],
                    'roles' => [],
                ],
            ],
        ],
    ],
    'router' => [
        'routes' => [
            'fichier' => [
                'type'          => 'Segment',
                'options'       => [
                    'route' => '/[:language/]fichier',
                    'defaults'      => [
                        '__NAMESPACE__' => 'Application\Controller',
                        'controller' => 'FichierThese',
                        'language'   => 'fr_FR',
                    ],
                ],
                'may_terminate' => false,
                'child_routes'  => [
                    'deposes' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route' => '/deposes',
                            'defaults'      => [
                                'action' => 'deposes',
                            ],
                        ],
                    ],
                    'these' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route' => '/these/:these',
                            'constraints'   => [
                                'these' => '\d+',
                            ],
                        ],
                        'may_terminate' => false,
                        'child_routes'  => [
                            'lister-fichiers'     => [
                                'type'     => 'Segment',
                                'options'  => [
                                    'route' => '/lister-fichiers',
                                    'defaults' => [
                                        'action' => 'lister-fichiers',
                                        /* @see FichierTheseController::listerFichiersAction() */
                                    ],
                                ],
                            ],
                            'televerser'  => [
                                'type'     => 'Segment',
                                'options'  => [
                                    'route' => '/televerser',
                                    'defaults' => [
                                        'action' => 'televerser-fichier',
                                        /* @see FichierTheseController::televerserFichierAction() */
                                    ],
                                ],
                            ],
                            'telecharger' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/telecharger/:fichier[/:fichierNom]',
                                    'constraints' => [
                                        'fichier' => '[a-zA-Z0-9-]{36}',
                                    ],
                                    'defaults'    => [
                                        'action' => 'telecharger-fichier',
                                        /* @see FichierTheseController::telechargerFichierAction() */
                                    ],
                                ],
                            ],
                            'apercevoir' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/apercevoir/:fichier[/:fichierNom]',
                                    'constraints' => [
                                        'fichier' => '[a-zA-Z0-9-]{36}',
                                    ],
                                    'defaults'    => [
                                        'action' => 'apercevoir-fichier',
                                    ],
                                ],
                            ],
                            'apercevoir-page-de-couverture' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/apercevoir-page-de-couverture',
                                    'defaults'    => [
                                        'action' => 'apercevoir-page-de-couverture',
                                    ],
                                ],
                            ],
                            'supprimer' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/supprimer/:fichier[/:fichierNom]',
                                    'constraints' => [
                                        'fichier' => '[a-zA-Z0-9-]{36}',
                                    ],
                                    'defaults'    => [
                                        'action' => 'supprimer-fichier',
                                    ],
                                ],
                            ],
                            'recuperer-fusion' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/recuperer-fusion/:outputFile',
                                    'defaults'    => [
                                        'action' => 'recuperer-fusion',
                                    ],
                                ],
                            ],
                        ],
                    ], // 'these'
                ],
            ], // 'fichier'
        ],
    ],
    'console' => [
        'router' => [
            'routes' => [
                'fusionner' => [
                    'options' => [
                        'route'    => 'fichier fusionner --these= --versionFichier= [--removeFirstPage] [--notifier=]',
                        'defaults' => [
                            'controller' => 'Application\Controller\FichierThese',
                            'action'     => 'fusionnerConsole',
                        ],
                    ],
                ],
            ],
        ],
    ],
    'navigation'      => [
        'default' => [
            'home' => [
                'pages' => [
                    'admin' => [
                        'pages' => [
                            'fichiers-deposes' => [
                                'label'    => 'Fichiers de thèses',
                                'route'    => 'fichier/deposes',
                                'order'    => 100,
                                'resource' => PrivilegeController::getResourceId('Application\Controller\FichierThese', 'deposes'),
                            ],
                            'rapport-annuel' => [
                                'label'    => 'Rapport annuel',
                                'route'    => 'fichier/deposes',
                                'order'    => 100,
                                'resource' => PrivilegeController::getResourceId('Application\Controller\FichierThese', 'deposes'),
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],
    'service_manager' => [
        'factories' => [
            'FichierTheseService' => FichierTheseServiceFactory::class,
        ],
    ],
    'controllers' => [
        'factories' => [
            'Application\Controller\FichierThese' => FichierTheseControllerFactory::class,
        ],
    ],
    'controller_plugins' => [
        'invokables' => [
            'urlFichierThese'       => UrlFichierThese::class,
        ],
    ],
];
+4 −197
Changes for module/Application/config/others/fichier.config.php: 4 added lines, 197 removed lines.
Original line number Diff line number Diff line
<?php

/**
 * Config concernant les fichiers NON liés à une thèse.
 */

use Application\Command\CheckWSValidationFichierCinesCommandFactory;
use Application\Command\ValidationFichierCinesCommandFactory;
use Application\Controller\Factory\FichierControllerFactory;
use Application\Controller\Factory\FichierTheseControllerFactory;
use Application\Controller\FichierTheseController;
use Application\Controller\Plugin\UrlFichier;
use Application\Controller\Plugin\UrlFichierThese;
use Application\Provider\Privilege\FichierPrivileges;
use Application\Provider\Privilege\ThesePrivileges;
use Application\Provider\Privilege\ValidationPrivileges;
use Application\Service\Fichier\FichierService;
use Application\Service\Fichier\FichierServiceFactory;
use Application\Service\FichierThese\FichierTheseServiceFactory;
use Application\Service\File\FileService;
use Application\Service\File\FileServiceFactory;
use Application\Service\NatureFichier\NatureFichierService;
@@ -44,66 +42,6 @@ return [
        ],
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'deposes',
                    ],
                    'privileges' => ValidationPrivileges::THESE_VALIDATION_RDV_BU,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'lister-fichiers',
                    ],
                    'privileges' => ThesePrivileges::THESE_CONSULTATION_DEPOT,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'telecharger-fichier',
                        'apercevoir-fichier',
                    ],
                    'privileges' => ThesePrivileges::THESE_TELECHARGEMENT_FICHIER,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'apercevoir-page-de-couverture',
                    ],
                    'role' => ThesePrivileges::THESE_TELECHARGEMENT_FICHIER,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'televerser-fichier',
                        'supprimer-fichier',
                    ],
                    'privileges' => ThesePrivileges::THESE_DEPOT_VERSION_INITIALE,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'televerser-fichier',
                        'supprimer-fichier',
                    ],
                    'privileges' => ThesePrivileges::THESE_DEPOT_VERSION_CORRIGEE,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'fusionnerConsole',
                    ],
                    'roles' => [],
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'recuperer-fusion',
                    ],
                    'roles' => [],
                ],

                [
                    'controller' => 'Application\Controller\Fichier',
                    'action'     => [
@@ -134,10 +72,8 @@ return [
            ],
        ],
    ],

    'router' => [
        'routes' => [

            'fichier' => [
                'type'          => 'Segment',
                'options'       => [
@@ -150,109 +86,6 @@ return [
                ],
                'may_terminate' => false,
                'child_routes'  => [

                    /*--------------- Thèse --------------*/
                    'these' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route' => '/these/:these',
                            'constraints'   => [
                                'these' => '\d+',
                            ],
                            'defaults'      => [
//                                'controller' => 'These',
                            ],
                        ],
                        'may_terminate' => false,
                        'child_routes'  => [
                            'lister-fichiers'     => [
                                'type'     => 'Segment',
                                'options'  => [
                                    'route' => '/lister-fichiers',
                                    'defaults' => [
                                        'action' => 'lister-fichiers',
                                        /* @see FichierTheseController::listerFichiersAction() */
                                    ],
                                ],
                            ],
                            'televerser'  => [
                                'type'     => 'Segment',
                                'options'  => [
                                    'route' => '/televerser',
                                    'defaults' => [
                                        'action' => 'televerser-fichier',
                                    ],
                                ],
                            ],
                            'telecharger' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/telecharger/:fichier[/:fichierNom]',
                                    'constraints' => [
                                        'fichier' => '[a-zA-Z0-9-]{36}',
                                    ],
                                    'defaults'    => [
                                        'action' => 'telecharger-fichier',
                                    ],
                                ],
                            ],
                            'apercevoir' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/apercevoir/:fichier[/:fichierNom]',
                                    'constraints' => [
                                        'fichier' => '[a-zA-Z0-9-]{36}',
                                    ],
                                    'defaults'    => [
                                        'action' => 'apercevoir-fichier',
                                    ],
                                ],
                            ],
                            'apercevoir-page-de-couverture' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/apercevoir-page-de-couverture',
                                    'defaults'    => [
                                        'action' => 'apercevoir-page-de-couverture',
                                    ],
                                ],
                            ],
                            'supprimer' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/supprimer/:fichier[/:fichierNom]',
                                    'constraints' => [
                                        'fichier' => '[a-zA-Z0-9-]{36}',
                                    ],
                                    'defaults'    => [
                                        'action' => 'supprimer-fichier',
                                    ],
                                ],
                            ],
                            'recuperer-fusion' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/recuperer-fusion/:outputFile',
                                    'defaults'    => [
                                        'action' => 'recuperer-fusion',
                                    ],
                                ],
                            ],
                        ],
                    ], // 'these'

                    /*--------------- Thèse --------------*/
                    'deposes' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route' => '/deposes',
                            'defaults'      => [
                                'action' => 'deposes',
                            ],
                        ],
                    ],

                    /*--------------- Hors Thèse --------------*/
                    'telecharger' => [
                        'type'          => 'Segment',
                        'options'       => [
@@ -279,7 +112,6 @@ return [
                            ],
                        ],
                    ],

                    'televerser-fichiers-communs' => [
                        'type'          => 'Segment',
                        'options'       => [
@@ -302,22 +134,6 @@ return [
                    ],
                ],
            ], // 'fichier'

        ],
    ],
    'console' => [
        'router' => [
            'routes' => [
                'fusionner' => [
                    'options' => [
                        'route'    => 'fichier fusionner --these= --versionFichier= [--removeFirstPage] [--notifier=]',
                        'defaults' => [
                            'controller' => 'Application\Controller\FichierThese',
                            'action'     => 'fusionnerConsole',
                        ],
                    ],
                ],
            ],
        ],
    ],
    'navigation'      => [
@@ -326,12 +142,6 @@ return [
                'pages' => [
                    'admin' => [
                        'pages' => [
                            'fichiers-deposes' => [
                                'label'    => 'Fichiers de thèses',
                                'route'    => 'fichier/deposes',
                                'order'    => 100,
                                'resource' => PrivilegeController::getResourceId('Application\Controller\FichierThese', 'deposes'),
                            ],
                            'fichiers-communs' => [
                                'label'    => 'Fichiers communs',
                                'route'    => 'fichier/lister-fichiers-communs',
@@ -353,7 +163,6 @@ return [
        'factories' => [
            FileService::class => FileServiceFactory::class,
            FichierService::class => FichierServiceFactory::class,
            'FichierTheseService' => FichierTheseServiceFactory::class,
            'ValidationFichierCinesCommand' => ValidationFichierCinesCommandFactory::class,
            'CheckWSValidationFichierCinesCommand' => CheckWSValidationFichierCinesCommandFactory::class,
        ],
@@ -361,13 +170,11 @@ return [
    'controllers' => [
        'factories' => [
            'Application\Controller\Fichier' => FichierControllerFactory::class,
            'Application\Controller\FichierThese' => FichierTheseControllerFactory::class,
        ],
    ],
    'controller_plugins' => [
        'invokables' => [
            'urlFichier'            => UrlFichier::class,
            'urlFichierThese'       => UrlFichierThese::class,
        ],
    ],
];
+162 −0

File added.

Preview size limit exceeded, changes collapsed.

+14 −0
Changes for module/Application/config/others/these.config.php: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ use Application\Controller\Factory\TheseConsoleControllerFactory;
use Application\Controller\Factory\TheseControllerFactory;
use Application\Controller\Factory\TheseObserverControllerFactory;
use Application\Controller\Plugin\Url\UrlThesePluginFactory;
use Application\Controller\RapportAnnuelController;
use Application\Controller\TheseConsoleController;
use Application\Controller\TheseController;
use Application\Entity\Db\Diffusion;
@@ -882,6 +883,19 @@ return [
                                'etape' => WfEtape::CODE_DEPOT_VERSION_ORIGINALE,
                                'visible' => 'Assertion\\These',
                            ],
                            'rapport-annuel' => [
                                'id'       => 'rapport-annuel',
                                'label'    => 'Rapports annuels',
                                'route'    => 'rapport-annuel/lister',
                                'withtarget' => true,
                                'paramsInject' => [
                                    'these',
                                ],
                                'icon' => 'glyphicon glyphicon-duplicate',
                                'resource' => PrivilegeController::getResourceId(RapportAnnuelController::class, 'lister'),
//                                'etape' => null,
//                                'visible' => 'Assertion\\These',
                            ],

                            'divider-these' => [
                                'label'    => null,
Loading