From 6c929bc11335d34971326c7d1d2865cd7a590d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20L=C3=A9cluse?= <laurent.lecluse@unicaen.fr>
Date: Wed, 10 Nov 2021 16:50:57 +0100
Subject: [PATCH] Affichage distinct des enseignements dans la fiche de service
---
.../src/Application/Controller/IntervenantController.php | 3 ++-
.../src/Application/View/Helper/Service/Ligne.php | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/module/Application/src/Application/Controller/IntervenantController.php b/module/Application/src/Application/Controller/IntervenantController.php
index 8f430db872..8527777891 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 8cbc17d14d..9cd53991fc 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";
--
GitLab