Commit baa6c6a1 authored by joriot221's avatar joriot221
Browse files

correction indicateur 800

parent 6a6473db

module/Indicateur/src/Controller/IndicateurController.php

+2 −2
Changes for module/Indicateur/src/Controller/IndicateurController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
namespace Indicateur\Controller;



use Application\Controller\AbstractController;

use Application\Entity\Db\TypeVolumeHoraire;

use Indicateur\Entity\Db\IndicateurDepassementCharges;

use Application\Entity\Db\Intervenant;

use Indicateur\Entity\Db\TypeIndicateur;
@@ -388,7 +389,6 @@ class IndicateurController extends AbstractController 
    {

        /** @var Intervenant $intervenant */

        $intervenant = $this->getEvent()->getParam('intervenant');



        $typeVolumeHoraireCode = $this->params()->fromRoute('type-volume-horaire-code');

        $typeVolumeHoraire = $this->getServiceTypeVolumeHoraire()->getByCode($typeVolumeHoraireCode);
@@ -428,7 +428,7 @@ class IndicateurController extends AbstractController 
        $idcs = $this->em()->createQuery($dql)->setParameters($params)->getResult();

        $title = 'Dépassement d\'heures (' . $typeVolumeHoraire . ') par rapport aux charges <small>' . $intervenant . '</small>';



        return compact('title', 'intervenant', 'idcs');

        return compact('title', 'intervenant', 'idcs', 'typeVolumeHoraireCode');

    }

}

module/Indicateur/view/indicateur/indicateur/depassement-charges.phtml

+9 −4
Changes for module/Indicateur/view/indicateur/indicateur/depassement-charges.phtml: 9 added lines, 4 removed lines.
Original line number Diff line number Diff line 
<?php



use Application\Entity\Db\TypeVolumeHoraire;

use Indicateur\Entity\Db\IndicateurDepassementCharges;

use Application\Entity\Db\Intervenant;
@@ -8,9 +9,13 @@ use Application\Entity\Db\Intervenant; 
 * @var $title                        string

 * @var $intervenant                  Intervenant

 * @var $idcs                         IndicateurDepassementCharges[]

 * @var $typeVolumeHoraireCode        string

 */



$servicesUrl = $this->url('intervenant/services', ['intervenant' => $intervenant->getId()]);

if ($typeVolumeHoraireCode == TypeVolumeHoraire::CODE_PREVU) {

    $servicesUrl = $this->url('intervenant/services-prevus', ['intervenant' => $intervenant->getId()]);

} else {

    $servicesUrl = $this->url('intervenant/services-realises', ['intervenant' => $intervenant->getId()]);

}



?>

<h1 class="page-header"><?= $title ?></h1>
@@ -32,9 +37,9 @@ $servicesUrl = $this->url('intervenant/services', ['intervenant' => $intervenant 
        </tr>

    <?php endforeach; ?>

</table>

<button class="btn btn-default" type="button" onclick="window.history.back()"><i class="fas fa-rotate-left" aria-hidden="true"></i

<button class="btn btn-default" type="button" onclick="window.history.back()"><i class="fas fa-rotate-left" aria-hidden="true"></i>

    Retour à l'indicateur

</button>

<a class="btn btn-primary" href="<?= $servicesUrl ?>"><i class="fas fa-list" aria-hidden="true"></i

<a class="btn btn-primary" href="<?= $servicesUrl ?>"><i class="fas fa-list" aria-hidden="true"></i>

    Voir la fiche de services de l'intervenant

</a>
 
 No newline at end of file