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

Ajustement

parent e2a8a161

config/unicaen-enquete.global.php.dist

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?php



namespace UnicaenEnquete;



use UnicaenEnquete\Controller\EnqueteController;

use UnicaenPrivilege\Guard\PrivilegeController;



return [



    'navigation' => [

        'default' => [

            'home' => [

                'pages' => [

                    'ressources' => [

                        'pages' => [

                            'enquete' => [

                                'label' => "Enquêtes",

                                'route' => 'enquete/enquete',

                                'resource' => PrivilegeController::getResourceId(EnqueteController::class, 'index'),

                                'order' => 1000 + 900,

                                'icon' => 'fas fa-angle-right',

                            ],

                        ],

                    ],

                ],

            ],

        ],

    ],

];
 
 No newline at end of file

src/Service/Resultat/ResultatService.php

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ class ResultatService { 
     */

    public function generateResultatArray(Enquete $enquete, array $resultats) : array

    {



        $counts = [];

        $results = [];
@@ -48,7 +49,7 @@ class ResultatService { 
                /** @var Instance $item */

                foreach ($resultats as $item) {

                    if ($item->estNonHistorise()) {

                        $reponse = $item->getReponseFor($question);

                        $reponse = ($item->getEnquete())?->getReponseFor($question);

                        if ($reponse) {

                            if ($reponse->getReponse()) $results[$question->getId()][$reponse->getReponse()][] = $item->getId();

                            if ($reponse->getReponse() === "0") {

src/Service/Resultat/ResultatServiceAwareTrait.php

+1 −1
Original line number Diff line number Diff line 
<?php



namespace  Enquete\Service\Resultat;

namespace  UnicaenEnquete\Service\Resultat;



trait ResultatServiceAwareTrait {

view/unicaen-enquete/enquete/index.phtml

+12 −5
Original line number Diff line number Diff line
@@ -63,15 +63,22 @@ $canSupprimer = $this->isAllowed(EnquetePrivileges::getResourceId(EnquetePrivile 
            </td>

            <td class="action">

                <?php if ($canAfficher) : ?>

                    <?php /** @see \Enquete\Controller\EnqueteController::afficherAction(); */ ?>

                    <?php /** @see \UnicaenEnquete\Controller\EnqueteController::afficherAction(); */ ?>

                    <a href="<?php echo $this->url('enquete/enquete/afficher', ['enquete' => $enquete->getId()], [], true); ?>">

                        <span class="icon icon-voir"></span>

                        Accéder

                    </a>

                    <br>

                    <?php /** @see \UnicaenEnquete\Controller\ResultatController::resultatsAction(); */ ?>

                    <a href="<?php echo $this->url('enquete/resultats', ['enquete' => $enquete->getId()], [], true); ?>">

                        <span class="icon icon-diagramme"></span>

                        Voir résultats

                    </a>

                    <br>



                <?php endif; ?>

                <?php if ($canModifier) : ?>

                    <?php /** @see \Enquete\Controller\EnqueteController::modifierAction(); */ ?>

                    <?php /** @see \UnicaenEnquete\Controller\EnqueteController::modifierAction(); */ ?>

                    <a href="<?php echo $this->url('enquete/enquete/modifier', ['enquete' => $enquete->getId()], [], true); ?>"

                       class="ajax-modal" data-event="modification"

                    >
@@ -82,14 +89,14 @@ $canSupprimer = $this->isAllowed(EnquetePrivileges::getResourceId(EnquetePrivile 
                <?php endif; ?>

                <?php if ($canHistoriser) : ?>

                    <?php if ($enquete->estNonHistorise()) : ?>

                        <?php /** @see \Enquete\Controller\EnqueteController::historiserAction(); */ ?>

                        <?php /** @see \UnicaenEnquete\Controller\EnqueteController::historiserAction(); */ ?>

                        <a href="<?php echo $this->url('enquete/enquete/historiser', ['enquete' => $enquete->getId()], [], true); ?>"

                        >

                            <span class="icon icon-historiser"></span>

                            Historiser

                        </a>

                    <?php else : ?>

                        <?php /** @see \Enquete\Controller\EnqueteController::restaurerAction(); */ ?>

                        <?php /** @see \UnicaenEnquete\Controller\EnqueteController::restaurerAction(); */ ?>

                        <a href="<?php echo $this->url('enquete/enquete/restaurer', ['enquete' => $enquete->getId()], [], true); ?>"

                        >

                            <span class="icon icon-restaurer"></span>
@@ -99,7 +106,7 @@ $canSupprimer = $this->isAllowed(EnquetePrivileges::getResourceId(EnquetePrivile 
                    <br>

                <?php endif; ?>

                <?php if ($canSupprimer) : ?>

                    <?php /** @see \Enquete\Controller\EnqueteController::supprimerAction(); */ ?>

                    <?php /** @see \UnicaenEnquete\Controller\EnqueteController::supprimerAction(); */ ?>

                    <a href="<?php echo $this->url('enquete/enquete/supprimer', ['enquete' => $enquete->getId()], [], true); ?>"

                       class="ajax-modal" data-event="modification"

                    >

view/unicaen-enquete/resultat/resultats.phtml

+14 −5
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ $nbElements = count($elements); 
    Affichage des résultats de l'enquête <em><?php echo $enquete->getTitre(); ?></em>

</h1>



<?php if (empty($elements)) : ?>

    <div class="alert alert-info">

        <span class="icon icon-attention"></span>

        Aucun élément

    </div>

<?php else : ?>

    <?php /** @var Question $question */ ?>

    <?php foreach ($enquete->getQuestions() as $question) : ?>

    <h2> <?php echo $question->getLibelle(); ?> </h2>
@@ -306,6 +312,7 @@ $nbElements = count($elements); 
    <?php endif; ?>

<?php endforeach; ?>





    <h2> Reponses brut </h2>



    <?php
@@ -337,6 +344,8 @@ $nbElements = count($elements); 
</span>





<?php endif; ?>



<style>

    tr.num {

        text-align: right;