Commit a0079d2b authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- Traitement ajusté des retours ESUP

 - Réorganisation de la partie ADMIN
 - Mise en page
 - En cours
parent 2d519d97
Loading
Loading
Loading
Loading
Loading
+130 −13
Changes for config/merged/signature.config.php: 130 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ namespace UnicaenCalendrier;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Regex;
use Laminas\Router\Http\Segment;
use UnicaenSignature\Controller\AdministrationController;
use UnicaenSignature\Controller\Factory\AdministrationControllerFactory;
use UnicaenSignature\Controller\InternalLetterfileController;
use UnicaenSignature\Controller\InternalLetterfileControllerFactory;
use UnicaenSignature\Controller\ProcessController;
use UnicaenSignature\Controller\ProcessControllerFactory;
use UnicaenSignature\Controller\SignatureAssetsController;
use UnicaenSignature\Controller\SignatureAssetsControllerFactory;
use UnicaenSignature\Controller\SignatureController;
use UnicaenPrivilege\Guard\PrivilegeController;
use UnicaenSignature\Controller\SignatureControllerFactory;
@@ -30,7 +30,6 @@ use UnicaenSignature\Service\SignatureServiceFactory;
use UnicaenSignature\Service\SignatureConfigurationService;
use UnicaenSignature\Service\SignatureConfigurationServiceFactory;
use UnicaenSignature\View\Helpers\MomentFactory;
use UnicaenSignature\View\Helpers\Ui;
use UnicaenSignature\View\Helpers\UiFactory;

return [
@@ -59,6 +58,37 @@ return [
                    'roles'      => []
                ],

                ///////////////////////////////////////////////////////////
                /// ADMINISTRATION
                [
                    'controller' => AdministrationController::class,
                    'action'     => [
                        'index',
                        'simpleSignature',
                        'simpleSignatureDelete',
                        'simpleSignatureSend',
                        'simpleSignatureStatus',
                        'simpleSignatureNew',
                        'process',
                        'letterfile',
                    ],
                    'privileges' => [
                        SignaturePrivileges::SIGNATURE_INDEX,
                    ],
                    'roles'      => []
                ],
                [
                    'controller' => AdministrationController::class,
                    'action'     => [
                        'process',
                    ],
                    'privileges' => [
                        SignaturePrivileges::SIGNATURE_ADMIN_CONFIG,
                    ],
                    'roles'      => []
                ],
                ///////////////////////////////////////////////////////////

                [
                    'controller' => SignatureController::class,
                    'action'     => [
@@ -141,7 +171,103 @@ return [
                    ],
                ],
                'may_terminate' => true,


                'child_routes' => [
                    'administration'    => [
                        'type'          => Literal::class,
                        'options'       => [
                            'route'    => '/administration',
                            'defaults' => [
                                'controller' => AdministrationController::class,
                                'action'     => 'index',
                            ],
                        ],
                        'may_terminate' => true,
                        'child_routes'  => [
                            'process'                 => [
                                'type'    => Literal::class,
                                'options' => [
                                    'route'    => '/process',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'process',
                                    ],
                                ],
                            ],
                            'process-config'          => [
                                'type'    => Literal::class,
                                'options' => [
                                    'route'    => '/process-config',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'processConfig',
                                    ],
                                ],
                            ],
                            'simple-signature'        => [
                                'type'    => Literal::class,
                                'options' => [
                                    'route'    => '/simple-signature',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'simpleSignature',
                                    ],
                                ],
                            ],
                            'simple-signature-new'    => [
                                'type'    => Segment::class,
                                'options' => [
                                    'route'    => '/simple-signature-new/:key',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'simpleSignatureNew',
                                    ],
                                ],
                            ],
                            'simple-signature-send'   => [
                                'type'    => Segment::class,
                                'options' => [
                                    'route'    => '/simple-signature-send/:id',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'simpleSignatureSend',
                                    ],
                                ],
                            ],
                            'simple-signature-status' => [
                                'type'    => Segment::class,
                                'options' => [
                                    'route'    => '/simple-signature-status/:id',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'simpleSignatureStatus',
                                    ],
                                ],
                            ],
                            'simple-signature-delete' => [
                                'type'    => Segment::class,
                                'options' => [
                                    'route'    => '/simple-signature-delete/:id',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'simpleSignatureDelete',
                                    ],
                                ],
                            ],

                            'letterfile' => [
                                'type'    => Literal::class,
                                'options' => [
                                    'route'    => '/letterfile',
                                    'defaults' => [
                                        'controller' => AdministrationController::class,
                                        'action'     => 'letterfile',
                                    ],
                                ],
                            ],
                        ]
                    ],

                    //////////////////////////////////////////////////////////////////////// < PROCESS
                    'process'           => [
@@ -258,15 +384,6 @@ return [
                            ]
                        ]
                    ],
                    'new' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/new/:key',
                            'defaults' => [
                                'action' => 'new'
                            ]
                        ]
                    ],
                    'send'              => [
                        'type'    => Segment::class,
                        'options' => [
@@ -395,8 +512,8 @@ return [

    'controllers' => [
        'factories' => [
            AdministrationController::class     => AdministrationControllerFactory::class,
            InternalLetterfileController::class => InternalLetterfileControllerFactory::class,
            SignatureAssetsController::class => SignatureAssetsControllerFactory::class,
            SignatureController::class          => SignatureControllerFactory::class,
            SignatureTypeController::class      => SignatureTypeControllerFactory::class,
            ProcessController::class            => ProcessControllerFactory::class,
+1 −1
Changes for config/module.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ return [

    'public_files' => [
        'stylesheets' => [
            //'10000_signature' => 'css/unicaen-signature.css',
            '10000_signature_fontello' => 'css/unicaen-signature.css',
        ],
    ],

+0 −32
Changes for public/dist/assets/fontello-04d4173a.svg: 0 added lines, 32 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Copyright (C) 2024 by original authors @ fontello.com</metadata>
<defs>
<font id="fontello" horiz-adv-x="1000" >
<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
<missing-glyph horiz-adv-x="1000" />
<glyph glyph-name="minus" unicode="&#xe70d;" d="M786 439v-107q0-22-16-38t-38-15h-678q-23 0-38 15t-16 38v107q0 23 16 38t38 16h678q23 0 38-16t16-38z" horiz-adv-x="785.7" />

<glyph glyph-name="ok-circled" unicode="&#xe85b;" d="M717 440q0 16-10 26l-51 50q-11 11-25 11t-25-11l-228-227-126 126q-11 11-25 11t-25-11l-51-50q-10-10-10-26 0-15 10-25l202-202q10-10 25-10 15 0 26 10l303 303q10 10 10 25z m140-90q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />

<glyph glyph-name="minus-circled" unicode="&#xe85d;" d="M679 314v72q0 14-11 25t-25 10h-429q-14 0-25-10t-10-25v-72q0-14 10-25t25-10h429q14 0 25 10t11 25z m178 36q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />

<glyph glyph-name="help-circled" unicode="&#xe85e;" d="M500 82v107q0 8-5 13t-13 5h-107q-8 0-13-5t-5-13v-107q0-8 5-13t13-5h107q8 0 13 5t5 13z m143 375q0 49-31 91t-77 65-95 23q-136 0-207-119-9-13 4-24l74-55q4-4 10-4 9 0 14 7 30 38 48 51 19 14 48 14 27 0 48-15t21-33q0-21-11-34t-38-25q-35-15-65-48t-29-70v-20q0-8 5-13t13-5h107q8 0 13 5t5 13q0 10 12 27t30 28q18 10 28 16t25 19 25 27 16 34 7 45z m214-107q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />

<glyph glyph-name="file-pdf" unicode="&#xe861;" d="M819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z m-287 331q18-14 47-31 33 4 65 4 82 0 99-27 9-13 1-29 0-1-1-1l-1-2v0q-3-21-39-21-27 0-64 11t-73 29q-123-13-219-46-85-146-135-146-8 0-15 4l-14 7q0 0-3 2-6 6-4 20 5 23 32 51t73 54q8 5 13-3 1-1 1-2 29 47 60 110 38 76 58 146-13 46-17 89t4 71q6 22 23 22h12q13 0 20-8 10-12 5-38-1-3-2-4 0-2 0-5v-17q-1-68-8-107 31-91 82-133z m-321-229q29 13 76 88-29-22-49-47t-27-41z m222 513q-9-23-2-73 1 4 4 24 0 2 4 24 1 3 3 5-1 0-1 1-1 1-1 2 0 12-7 20 0-1 0-1v-2z m-70-368q76 30 159 45-1 0-7 5t-9 8q-43 37-71 98-15-48-46-110-17-31-26-46z m361 9q-13 13-78 13 42-16 69-16 8 0 10 1 0 0-1 2z" horiz-adv-x="857.1" />

<glyph glyph-name="user-1" unicode="&#xe8b2;" d="M714 69q0-60-35-104t-84-44h-476q-49 0-84 44t-35 104q0 48 5 90t17 85 33 73 52 50 76 19q73-72 174-72t175 72q42 0 75-19t52-50 33-73 18-85 4-90z m-143 495q0-88-62-151t-152-63-151 63-63 151 63 152 151 63 152-63 62-152z" horiz-adv-x="714.3" />

<glyph glyph-name="users" unicode="&#xe8b3;" d="M331 350q-90-3-148-71h-75q-45 0-77 22t-31 66q0 197 69 197 4 0 25-11t54-24 66-12q38 0 75 13-3-21-3-37 0-78 45-143z m598-356q0-66-41-105t-108-39h-488q-68 0-108 39t-41 105q0 30 2 58t8 61 14 61 24 54 35 45 48 30 62 11q6 0 24-12t41-26 59-27 76-12 75 12 60 27 41 26 24 12q34 0 62-11t47-30 35-45 24-54 15-61 8-61 2-58z m-572 713q0-59-42-101t-101-42-101 42-42 101 42 101 101 42 101-42 42-101z m393-214q0-89-63-152t-151-62-152 62-63 152 63 151 152 63 151-63 63-151z m321-126q0-43-31-66t-77-22h-75q-57 68-147 71 45 65 45 143 0 16-3 37 37-13 74-13 33 0 67 12t54 24 24 11q69 0 69-197z m-71 340q0-59-42-101t-101-42-101 42-42 101 42 101 101 42 101-42 42-101z" horiz-adv-x="1071.4" />

<glyph glyph-name="cancel-circled" unicode="&#xe8b6;" d="M641 224q0 14-10 25l-101 101 101 101q10 11 10 25 0 15-10 26l-51 50q-10 11-25 11-15 0-25-11l-101-101-101 101q-11 11-25 11-16 0-26-11l-50-50q-11-11-11-26 0-14 11-25l101-101-101-101q-11-11-11-25 0-15 11-26l50-50q10-11 26-11 14 0 25 11l101 101 101-101q10-11 25-11 15 0 25 11l51 50q10 11 10 26z m216 126q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />

<glyph glyph-name="info-circled" unicode="&#xe8b7;" d="M571 82v89q0 8-5 13t-12 5h-54v286q0 8-5 13t-13 5h-178q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h53v-179h-53q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h250q7 0 12 5t5 13z m-71 500v89q0 8-5 13t-13 5h-107q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h107q8 0 13 5t5 13z m357-232q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />

<glyph glyph-name="hourglass-2" unicode="&#xf252;" d="M786 779q0-146-60-258t-148-171q89-59 148-171t60-258h53q8 0 13-5t5-12v-36q0-8-5-13t-13-5h-821q-8 0-13 5t-5 13v36q0 7 5 12t13 5h53q0 146 60 258t149 171q-90 59-149 171t-60 258h-53q-8 0-13 5t-5 12v36q0 8 5 13t13 5h821q8 0 13-5t5-13v-36q0-7-5-12t-13-5h-53z m-72 0h-571q0-115 47-215h477q47 100 47 215z m-31-679q-31 79-82 135t-108 79h-129q-57-23-108-79t-81-135h508z" horiz-adv-x="857.1" />

<glyph glyph-name="plus" unicode="&#x1f513;" d="M786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q23 0 38-16t16-38z" horiz-adv-x="785.7" />
</font>
</defs>
</svg>
−4.93 KiB

File deleted.

−4.07 KiB

File deleted.

Loading