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

Merge branch 'indicateur-de-structure' into develop

parents 6e22d7a1 c1ad661f
Loading
Loading
Loading
Loading
+4 −0
Changes for module/Indicateur/config/module.config.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ use Indicateur\Form\IndicateurHydrator;
use Indicateur\Service\Factory\IndicateurServiceFactory;
use Indicateur\Service\IndicateurService;
use Indicateur\View\Helper\CompletIndicateurIndividuHelper;
use Indicateur\View\Helper\CompletIndicateurStructureHelper;
use Indicateur\View\Helper\CompletIndicateurTheseHelper;
use Indicateur\View\Helper\ResumeIndicateurIndividuHelper;
use Indicateur\View\Helper\ResumeIndicateurStructureHelper;
use Indicateur\View\Helper\ResumeIndicateurTheseHelper;
use Zend\Mvc\Router\Http\Literal;
use Zend\Mvc\Router\Http\Segment;
@@ -212,8 +214,10 @@ return array(
        'invokables' => [
            'completIndicateurThese'     => CompletIndicateurTheseHelper::class,
            'completIndicateurIndividu'  => CompletIndicateurIndividuHelper::class,
            'completIndicateurStructure' => CompletIndicateurStructureHelper::class,
            'resumeIndicateurThese'      => ResumeIndicateurTheseHelper::class,
            'resumeIndicateurIndividu'   => ResumeIndicateurIndividuHelper::class,
            'resumeIndicateurStructure'  => ResumeIndicateurStructureHelper::class,
        ],
    ],
    'view_manager' => [
+10 −0
Changes for module/Indicateur/src/Indicateur/Controller/IndicateurController.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ class IndicateurController extends AbstractActionController {
        $indicateurs = $this->getIndicateurService()->findAll();

        foreach ($indicateurs as $indicateur) {
            $id = $indicateur->getId();

            if ($indicateur->isActif()) {
                $resultats[$indicateur->getId()] = $this->getIndicateurService()->fetch($indicateur->getId());
            }
@@ -175,6 +177,14 @@ class IndicateurController extends AbstractActionController {
                'Email'                 => 'EMAIL',
            ];
        }
        if ($indicateur->getDisplayAs() == Indicateur::STRUCTURE) {
            $headers = [
                'id'                    => 'ID',
                'Sigle'                 => 'SIGLE',
                'Libelle'               => 'LIBELLE',
                'Type'                  => 'TYPE_STRUCTURE_ID',
            ];
        }


        $records = [];
+1 −0
Changes for module/Indicateur/src/Indicateur/Form/IndicateurForm.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ class IndicateurForm extends Form {
                'value_options' => [
                    Indicateur::THESE => 'Thèse',
                    Indicateur::INDIVIDU => 'Individu',
                    Indicateur::STRUCTURE => 'Structure',
                ],
            ],
        ]);
+1 −0
Changes for module/Indicateur/src/Indicateur/Model/Indicateur.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ class Indicateur {

    const THESE = 'THESE';
    const INDIVIDU = 'INDIVIDU';
    const STRUCTURE = 'STRUCTURE';

    /** @var int */
    private $id;
+54 −0
Changes for module/Indicateur/src/Indicateur/View/Helper/CompletIndicateurStructureHelper.php: 54 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Indicateur\View\Helper;

use Indicateur\Model\Indicateur;
use Zend\Form\View\Helper\AbstractHelper;

class CompletIndicateurStructureHelper extends AbstractHelper
{
    /**
     * @param Indicateur $indicateur
     * @param array $data
     * @return string
     */
    public function render($indicateur, $data) {

        $rubriques = [
            'id'                    => 'ID',
            'Sigle'                 => 'SIGLE',
            'Libelle'               => 'LIBELLE',
            'Type'                  => 'TYPE_STRUCTURE_ID',
        ];

        $html  = '';
        $html .= '<table class="table table-extra-condensed">';
            $html .= '<thead>';
            $html .= '<tr>';
            foreach ($rubriques as $clef => $valeur) {
                $html .= '<th> '.$clef.' </th>';
            }
            $html .= '</tr>';
            $html .= '</thead>';
            $html .= '<tbody>';
            foreach($data as $entry) {
                $html .= '<tr>';
                foreach ($rubriques as $clef => $valeur) {
                    if ($clef === 'Type') {
                        switch($entry[$valeur]) {
                            case "1" : $html .= '<td>' . "Établissement" . '</td>'; break;
                            case "2" : $html .= '<td>' . "École doctorale" . '</td>'; break;
                            case "3" : $html .= '<td>' . "Unité de recherche" . '</td>'; break;
                            default : $html .= '<td>' . '<i>'.$entry[$valeur].'</i>' . '</td>'; break;
                        }
                    } else {
                        $html .= '<td>' . $entry[$valeur] . '</td>';
                    }
                }
                $html .= '</tr>';
            }
            $html .= '</tbody>';
        $html .= '</table>';
        return $html;
    }
}
 No newline at end of file
Loading