Commit f90f8729 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Corrections varié

parent 3500cd22
Loading
Loading
Loading
Loading
+1
Changes for module/Formation/SQL/003_privilege.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (nextval('
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (nextval('privilege_id_seq'), currval('categorie_privilege_id_seq'), 'modifier', 'Modifier un module de formation', 4);
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (nextval('privilege_id_seq'), currval('categorie_privilege_id_seq'), 'historiser', 'Historiser/Restaurer un module de formation', 5);
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (nextval('privilege_id_seq'), currval('categorie_privilege_id_seq'), 'supprimer', 'Supprimer un module de formation', 6);
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (nextval('privilege_id_seq'), currval('categorie_privilege_id_seq'), 'catalogue', 'Accéder au catalogue des formations', 7);

INSERT INTO CATEGORIE_PRIVILEGE (ID, CODE, LIBELLE, ORDRE) VALUES (nextval('categorie_privilege_id_seq'), 'formation_formations', 'Gestion des formations', 3150);
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (nextval('privilege_id_seq'), currval('categorie_privilege_id_seq'), 'index', 'Accès à l''index des formations', 1);
+1 −1
Changes for module/Formation/config/others/formation.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ return [
                                'label'    => 'Formations',
                                'route'    => 'formation/formation',
                                'resource' => PrivilegeController::getResourceId(FormationController::class, 'index') ,
                                'order'    => 90,
                                'order'    => 110,
                                'pages' => [
                                    'afficher' => [
                                        'label'    => "Affichage d'une formation",
+3 −2
Changes for module/Formation/config/others/module.config.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Formation;

use Formation\Controller\FormationController;
use Formation\Controller\ModuleController;
use Formation\Controller\ModuleControllerFactory;
use Formation\Form\Module\ModuleForm;
@@ -25,7 +26,7 @@ return [
                        'catalogue',
                    ],
                    'privileges' => [
                        ModulePrivileges::MODULE_INDEX,
                        ModulePrivileges::MODULE_CATALOGUE,
                    ],
                ],
                [
@@ -106,7 +107,7 @@ return [
                                'order'    => 100,
                                'pages' => [
                                    'afficher' => [
                                        'label'    => "Affichage d'une formation",
                                        'label'    => "Affichage d'un module de formation",
                                        'route'    => 'formation/module/afficher',
                                        'resource' => PrivilegeController::getResourceId(ModuleController::class, 'afficher') ,
                                        'order'    => 100,
+1
Changes for module/Formation/src/Formation/Provider/Privilege/ModulePrivileges.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,4 +12,5 @@ class ModulePrivileges extends Privileges {
    const MODULE_MODIFIER   = 'formation_module-modifier';
    const MODULE_HISTORISER = 'formation_module-historiser';
    const MODULE_SUPPRIMER  = 'formation_module-supprimer';
    const MODULE_CATALOGUE  = 'formation_module-catalogue';
}
 No newline at end of file
+29 −15
Changes for module/Formation/view/formation/enquete/afficher-questions.phtml: 29 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -27,11 +27,8 @@ $sans = array_filter($questions, function (EnqueteQuestion $a) { return $a->getC
    Liste des questions de l'enquête
</h1>




<div class="row">
    <div class="col-md-6">
    <div class="col-md-9">
        <ul>
            <?php foreach ($categories as $categorie) : ?>
                <li>
@@ -69,7 +66,7 @@ $sans = array_filter($questions, function (EnqueteQuestion $a) { return $a->getC
                        <a href="<?php echo $this->url('formation/enquete/categorie/supprimer', ['categorie' => $categorie->getId()], [], true); ?>"
                           class="ajax-modal" data-event="modification"
                        >
                            <span class="icon icon-historiser"></span></a>
                            <span class="icon icon-detruire"></span></a>
                    <?php endif; ?>

                    <ul>
@@ -168,22 +165,25 @@ $sans = array_filter($questions, function (EnqueteQuestion $a) { return $a->getC
                </li>
            <?php endif; ?>
        </ul>

    </div>







    <div class="float-end">
    <div class="col-md-3 float-end">
        <?php if ($canAjouterQuestion) : ?>
<!--            --><?php ///** @see \Formation\Controller\EnqueteController::ajouterEnqueteAction() */?>
<!--            <a href="--><?php ////echo $this->url('formation/enquete/enquete/ajouter', [], [], true); ?><!--"-->
<!--               class="btn btn-primary ajax-modal action" data-event="modification"-->
<!--            >-->
<!--                <span class="icon icon-ajouter"></span>-->
<!--                <span class="lettrine">E</span>-->
<!--                Ajouter une enquête-->
<!--            </a>-->
<!--            <br>-->
<!--            <br>-->
            <?php /** @see \Formation\Controller\EnqueteController::ajouterCategorieAction() */?>
            <a href="<?php echo $this->url('formation/enquete/categorie/ajouter', [], [], true); ?>"
               class="btn btn-primary ajax-modal action" data-event="modification"
            >
                <span class="icon icon-ajouter"></span>
                <span class="lettrine">C</span>
                Ajouter une catégorie
            </a>
            <br>
@@ -193,6 +193,7 @@ $sans = array_filter($questions, function (EnqueteQuestion $a) { return $a->getC
               class="btn btn-primary ajax-modal action" data-event="modification"
            >
                <span class="icon icon-ajouter"></span>
                <span class="lettrine">Q</span>
                Ajouter une question
            </a>
            <br/>
@@ -213,7 +214,20 @@ $sans = array_filter($questions, function (EnqueteQuestion $a) { return $a->getC

<style>
    a.btn.action {
        width:25rem;
        width:90%;
    }

    span.lettrine {
        position:relative;
        left:-0.60rem;
        top:0.25rem;
        font-weight:bolder;
        font-size: xx-small;
        text-shadow: 2px 0 0 #fff, -2px 0 0 #fff, 0 2px 0 #fff, 0 -2px 0 #fff, 1px 1px #fff, -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff;
    }

    span.lettrine {
        color: var(--bs-primary);
    }

    span.question-historisee {
Loading