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

Merge branch 'indicateur-lien-vers-entity' into develop

parents e59b0e85 f5e80963

module/Indicateur/src/Indicateur/View/Helper/CompletIndicateurIndividuHelper.php

+5 −1
Original line number Diff line number Diff line
@@ -38,7 +38,11 @@ class CompletIndicateurIndividuHelper extends AbstractHelper 
        foreach($data as $entry) {

            $html .= '<tr>';

            foreach ($rubriques as $clef => $valeur) {

                $html .= '<td>' . $entry[$valeur] . '</td>';

                $html .= '<td>';

//                if ($clef === 'SOURCE_CODE') $html .= '<a href="'.$this->getView()->url('these/identite', ['these' => $entry['ID']], [], true).'">';

                $html .= $entry[$valeur] ;

//                if ($clef === 'SOURCE_CODE') $html .= '</a>';

                $html .= '</td>';

            }

            $html .= '</tr>';

        }

module/Indicateur/src/Indicateur/View/Helper/CompletIndicateurStructureHelper.php

+12 −1
Original line number Diff line number Diff line
@@ -42,7 +42,18 @@ class CompletIndicateurStructureHelper extends AbstractHelper 
                            default : $html .= '<td>' . '<i>'.$entry[$valeur].'</i>' . '</td>'; break;

                        }

                    } else {

                        $html .= '<td>' . $entry[$valeur] . '</td>';

                        $html .= '<td>';

                        if ($clef === 'Libelle') {

                            switch($entry['TYPE_STRUCTURE_ID']) {

                                case "1" : $html .= '<a href="'.$this->getView()->url('etablissement/information', ['structure' => $entry['ID']], [], true).'">'; break;

                                case "2" : $html .= '<a href="'.$this->getView()->url('ecole-doctorale/information', ['structure' => $entry['ID']], [], true).'">'; break;

                                case "3" : $html .= '<a href="'.$this->getView()->url('unite-recherche/information', ['structure' => $entry['ID']], [], true).'">'; break;

                                default : $html .=  '<a href="">' ; break;

                            }

                        }

                        $html .= $entry[$valeur] ;

                        if ($clef === 'Libelle') $html .= '</a>';

                        $html .= '</td>';

                    }

                }

                $html .= '</tr>';

module/Indicateur/src/Indicateur/View/Helper/CompletIndicateurTheseHelper.php

+5 −1
Original line number Diff line number Diff line
@@ -35,7 +35,11 @@ class CompletIndicateurTheseHelper extends AbstractHelper 
            foreach($data as $entry) {

                $html .= '<tr>';

                foreach ($rubriques as $clef => $valeur) {

                    $html .= '<td>' . $entry[$valeur] . '</td>';

                    $html .= '<td>';

                    if ($clef === 'Titre') $html .= '<a href="'.$this->getView()->url('these/identite', ['these' => $entry['ID']], [], true).'">';

                    $html .= $entry[$valeur] ;

                    if ($clef === 'Titre') $html .= '</a>';

                    $html .= '</td>';

                }

                $html .= '</tr>';

            }