Loading module/Enseignement/src/View/Helper/VolumeHoraire/ListeViewHelper.php +17 −8 Changes for module/Enseignement/src/View/Helper/VolumeHoraire/ListeViewHelper.php: 17 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -161,6 +161,7 @@ class ListeViewHelper extends AbstractViewHelper foreach ($periodes as $periode) { $vhl = $this->getVolumeHoraireListe()->createChild()->setPeriode($periode)->setTypeIntervention(false); $vhl = $this->getVolumeHoraireListe()->createChild()->setPeriode($periode)->setTag(false); /* Gestion des mauvaises périodes */ Loading @@ -182,20 +183,24 @@ class ListeViewHelper extends AbstractViewHelper $motifsNonPaiement = [0 => false]; } $tag = []; $tags = []; if ($canViewTag) { $tag = $vhl->getTags(); if (!isset($tag[0]) && !$canEditTag) { $tag = [0 => null] + $tag; $tags = $vhl->getTags(); if (!isset($tags[0]) && !$canEditTag) { $tags = [0 => null] + $tags; } } if (empty($tag)) { $tag = [0 => false]; if (empty($tags)) { $tags = [0 => false]; } /* Affichage par motif de non paiement */ foreach ($motifsNonPaiement as $motifNonPaiement) { $vhl->setMotifNonPaiement($motifNonPaiement); foreach ($tags as $tag) { $vhl->setTag($tag); if ($vhl->getHeures() == 0) continue; // rien à afficher $readOnly = $motifNonPaiement instanceof MotifNonPaiement && !$canEditMNP; Loading @@ -221,11 +226,13 @@ class ListeViewHelper extends AbstractViewHelper if ($canViewMNP) { $out .= "<td>" . $this->renderMotifNonPaiement($motifNonPaiement) . "</td>\n"; } if (!$canViewTag) { if ($canViewTag) { $out .= "<td>" . $this->renderTag($tag) . "</td>"; } $out .= "</tr>\n"; } } } $out .= '</table>' . "\n"; Loading Loading @@ -284,10 +291,12 @@ class ListeViewHelper extends AbstractViewHelper */ if (!empty($tag)) { $out = 'tazg'; $out = $tag->getLibelleLong(); } else { $out = ''; } return $out; } Loading Loading
module/Enseignement/src/View/Helper/VolumeHoraire/ListeViewHelper.php +17 −8 Changes for module/Enseignement/src/View/Helper/VolumeHoraire/ListeViewHelper.php: 17 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -161,6 +161,7 @@ class ListeViewHelper extends AbstractViewHelper foreach ($periodes as $periode) { $vhl = $this->getVolumeHoraireListe()->createChild()->setPeriode($periode)->setTypeIntervention(false); $vhl = $this->getVolumeHoraireListe()->createChild()->setPeriode($periode)->setTag(false); /* Gestion des mauvaises périodes */ Loading @@ -182,20 +183,24 @@ class ListeViewHelper extends AbstractViewHelper $motifsNonPaiement = [0 => false]; } $tag = []; $tags = []; if ($canViewTag) { $tag = $vhl->getTags(); if (!isset($tag[0]) && !$canEditTag) { $tag = [0 => null] + $tag; $tags = $vhl->getTags(); if (!isset($tags[0]) && !$canEditTag) { $tags = [0 => null] + $tags; } } if (empty($tag)) { $tag = [0 => false]; if (empty($tags)) { $tags = [0 => false]; } /* Affichage par motif de non paiement */ foreach ($motifsNonPaiement as $motifNonPaiement) { $vhl->setMotifNonPaiement($motifNonPaiement); foreach ($tags as $tag) { $vhl->setTag($tag); if ($vhl->getHeures() == 0) continue; // rien à afficher $readOnly = $motifNonPaiement instanceof MotifNonPaiement && !$canEditMNP; Loading @@ -221,11 +226,13 @@ class ListeViewHelper extends AbstractViewHelper if ($canViewMNP) { $out .= "<td>" . $this->renderMotifNonPaiement($motifNonPaiement) . "</td>\n"; } if (!$canViewTag) { if ($canViewTag) { $out .= "<td>" . $this->renderTag($tag) . "</td>"; } $out .= "</tr>\n"; } } } $out .= '</table>' . "\n"; Loading Loading @@ -284,10 +291,12 @@ class ListeViewHelper extends AbstractViewHelper */ if (!empty($tag)) { $out = 'tazg'; $out = $tag->getLibelleLong(); } else { $out = ''; } return $out; } Loading