Commit ae0285d8 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Bugs suite merge (WIP)

parent 0229954f

module/Application/src/Controller/ContratController.php

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ use Application\Processus\Traits\ContratProcessusAwareTrait; 
use Application\Provider\Privilege\Privileges;

use Application\Service\Traits\ContratServiceAwareTrait;

use Application\Service\Traits\DossierServiceAwareTrait;

use Service\Service\Traits\EtatVolumeHoraireServiceAwareTrait;

use Service\Service\EtatVolumeHoraireServiceAwareTrait;

use Application\Service\Traits\ParametresServiceAwareTrait;

use Enseignement\Service\ServiceServiceAwareTrait;

use Application\Service\Traits\TauxHoraireHETDServiceAwareTrait;

module/Application/src/Processus/ContratProcessus.php

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ use Application\Service\Traits\TypeValidationServiceAwareTrait; 
use Service\Service\TypeVolumeHoraireServiceAwareTrait;

use Application\Service\Traits\ValidationServiceAwareTrait;

use Enseignement\Service\VolumeHoraireServiceAwareTrait;

use Enseignement\Service\Traits\VolumeHoraireServiceAwareTrait;

use Doctrine\ORM\Exception\ORMException;

use Doctrine\ORM\OptimisticLockException;

use Doctrine\Persistence\Mapping\MappingException;
@@ -105,6 +104,7 @@ class ContratProcessus extends AbstractProcessus 
            if ($detach) {

                $this->getEntityManager()->detach($service); // INDISPENSABLE si on requête N fois la même entité avec des critères différents

            }

            $service->setTypeVolumeHoraire($this->getServiceTypeVolumeHoraire()->getPrevu());

            $services[$service->getId()] = $service;

        }

module/Application/view/application/contrat/partial/contrat.phtml

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ $panel = ($retourSigne !== null) ? 'success' : ($validation ? 'info' : 'default' 
                <small>(cliquez pour afficher/cacher)</small>

            </a>

            <div class="collapse" id="details-enseignements-contrat-<?= $contrat->getId() ?>">

                <?= $this->enseignements($services)->setReadonly(true)->setColumnVisibility('structure-ens', false)->render(); ?>

                <?= $this->enseignements(current($services)->getTypeVolumeHoraire(), current($services)->getIntervenant(), $services)->setReadOnly(true)->setColumnVisibility('structure-ens', false)->render(); ?>

            </div>

        </div>

    </div>