diff --git a/module/Application/src/Application/Controller/IntervenantController.php b/module/Application/src/Application/Controller/IntervenantController.php index 8f430db8728f3ea13a22f3cbe3a23342fe4436bb..8527777891b217246de40cb2f672136f5e073dbc 100755 --- a/module/Application/src/Application/Controller/IntervenantController.php +++ b/module/Application/src/Application/Controller/IntervenantController.php @@ -160,6 +160,7 @@ class IntervenantController extends AbstractController $this->em()->getFilters()->enable('historique')->init([ \Application\Entity\Db\Service::class, \Application\Entity\Db\VolumeHoraire::class, + \Application\Entity\Db\CheminPedagogique::class, \Application\Entity\Db\ServiceReferentiel::class, \Application\Entity\Db\VolumeHoraireReferentiel::class, \Application\Entity\Db\Validation::class, @@ -191,7 +192,7 @@ class IntervenantController extends AbstractController $campagneSaisie = $this->getServiceCampagneSaisie()->getBy($intervenant->getStatut()->getTypeIntervenant(), $typeVolumeHoraire); if (!$campagneSaisie->estOuverte()) { - + $role = $this->getServiceContext()->getSelectedIdentityRole(); if ($role->getIntervenant()) { diff --git a/module/Application/src/Application/View/Helper/Service/Ligne.php b/module/Application/src/Application/View/Helper/Service/Ligne.php index 8cbc17d14d77cffc5126bdebf452249dcb3dfe0c..9cd53991fc0ff268b6e3268b6c9a7860a2ca4aab 100755 --- a/module/Application/src/Application/View/Helper/Service/Ligne.php +++ b/module/Application/src/Application/View/Helper/Service/Ligne.php @@ -120,7 +120,11 @@ class Ligne extends AbstractViewHelper $out .= '<td>' . $this->renderStructure($element ? $element->getStructure() : null) . "</td>\n"; } if ($liste->getColumnVisibility('formation')) { - $out .= '<td>' . $this->renderEtape($element ? $element->getEtape() : null) . "</td>\n"; + $out .= '<td>'; + if ($element && $element->getCheminPedagogique()->count() > 1) { + $out .= '<small class="badge" style="font-size:8pt" title="Enseignement mutualisé entre plusieures formations. Seule la formation principale est présentée ci-dessous">Enseignement mutualisé</small><br />'; + } + $out .= $this->renderEtape($element ? $element->getEtape() : null) . "</td>\n"; } if ($liste->getColumnVisibility('periode')) { $out .= '<td style="text-align:center">' . $this->renderPeriode($element ? $element->getPeriode() : null) . "</td>\n";