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

Correction ordre des histogramme et sql

parent cd5fc8c7

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        "guzzlehttp/guzzle": "^6.3",

        "ramsey/uuid": "^3.3",

        "twig/twig": "^3.0",

        "unicaen/alerte": "^1.0",

        "unicaen/alerte": "^1.1",

        "unicaen/app": "^5.1",

        "unicaen/auth": "^5.1",

        "unicaen/auth-token": "^5.0",

doc/release-notes/5.0.0/formation/001_table.sql

+1 −0
Changes for doc/release-notes/5.0.0/formation/001_table.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ create unique index formation_enquete_categorie_id_uindex on formation_enquete_c 
create table formation_enquete_question

(

    id                       serial        not null        constraint formation_enquete_question_pkey primary key,

    categorie_id             integer                       constraint formation_enquete_question_categorie_id_fk references formation_enquete_categorie,

    libelle                  varchar(1024) not null,

    description              text,

    ordre                    integer       not null,

module/Formation/view/formation/enquete-reponse/recherche/afficher-resultats.phtml

+8 −8
Changes for module/Formation/view/formation/enquete-reponse/recherche/afficher-resultats.phtml: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -109,11 +109,11 @@ usort($categories, function (EnqueteCategorie $a, EnqueteCategorie $b) { return 
                        label: 'Nombre de réponses',

                        data: [<?php echo implode(",", $histogramme[$question->getId()]); ?>],

                        backgroundColor: [

                            'rgb(156,0,0,1)',

                            'rgb(222,76,0,1)',

                            'rgb(255,171,3,1)',

                            'rgb(161,191,0,1)',

                            'rgb(18,199,0,1)',

                            'rgb(161,191,0,1)',

                            'rgb(255,171,3,1)',

                            'rgb(222,76,0,1)',

                            'rgb(156,0,0,1)',

                        ],



                        borderWidth: 1
@@ -187,11 +187,11 @@ usort($sans, function (EnqueteQuestion $a, EnqueteQuestion $b) { return $a->getO 
                                label: 'Nombre de réponses',

                                data: [<?php echo implode(",", $histogramme[$question->getId()]); ?>],

                                backgroundColor: [

                                    'rgb(156,0,0,1)',

                                    'rgb(222,76,0,1)',

                                    'rgb(255,171,3,1)',

                                    'rgb(161,191,0,1)',

                                    'rgb(18,199,0,1)',

                                    'rgb(161,191,0,1)',

                                    'rgb(255,171,3,1)',

                                    'rgb(222,76,0,1)',

                                    'rgb(156,0,0,1)',

                                ],



                                borderWidth: 1