Skip to content
Snippets Groups Projects
Commit ca2d54b8 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Correction pb total HETD : remise provisoire en l'état v23 adaptée

parent bee2b14d
No related branches found
No related tags found
No related merge requests found
...@@ -131,7 +131,7 @@ class ContratProcessus extends AbstractProcessus ...@@ -131,7 +131,7 @@ class ContratProcessus extends AbstractProcessus
* *
* @return Contrat * @return Contrat
*/ */
public function creer(Intervenant $intervenant, $volumeHoraire, float $totalHetd): Contrat public function creer(Intervenant $intervenant, $volumeHoraire): Contrat
{ {
$contrat = $this->getServiceContrat()->newEntity(); $contrat = $this->getServiceContrat()->newEntity();
/* @var $contrat Contrat */ /* @var $contrat Contrat */
...@@ -141,9 +141,9 @@ class ContratProcessus extends AbstractProcessus ...@@ -141,9 +141,9 @@ class ContratProcessus extends AbstractProcessus
$structure = $this->getServiceStructure()->get($volumeHoraire['structureId']); $structure = $this->getServiceStructure()->get($volumeHoraire['structureId']);
$contrat->setStructure($structure); $contrat->setStructure($structure);
$contrat->setTotalHetd($totalHetd); $contrat->setTotalHetd($this->getIntervenantTotalHetd($intervenant));
try { try {
$dateDebut = new \DateTime($volumeHoraire['dateDebut']); $dateDebut = $volumeHoraire['dateDebut'] ? new \DateTime($volumeHoraire['dateDebut']) : null;
} catch (\Exception $e) { } catch (\Exception $e) {
$dateDebut = null; $dateDebut = null;
...@@ -151,7 +151,7 @@ class ContratProcessus extends AbstractProcessus ...@@ -151,7 +151,7 @@ class ContratProcessus extends AbstractProcessus
$contrat->setDebutValidite($dateDebut); $contrat->setDebutValidite($dateDebut);
try { try {
$dateFin = new \DateTime($volumeHoraire['dateFin']); $dateFin = $volumeHoraire['dateFin'] ? new \DateTime($volumeHoraire['dateFin']) : null;
} catch (\Exception $e) { } catch (\Exception $e) {
$dateFin = null; $dateFin = null;
} }
...@@ -173,6 +173,29 @@ class ContratProcessus extends AbstractProcessus ...@@ -173,6 +173,29 @@ class ContratProcessus extends AbstractProcessus
/**
* @param Intervenant $intervenant
*
* @return float
*/
public function getIntervenantTotalHetd(Intervenant $intervenant): float
{
$typeVolumeHoraire = $this->getServiceTypeVolumeHoraire()->getPrevu();
$etatVolumeHoraire = $this->getServiceEtatVolumeHoraire()->getValide();
$sql = "SELECT total FROM formule_resultat_intervenant WHERE intervenant_id = :intervenant AND type_volume_horaire_id = :tvh AND etat_volume_horaire_id = :evh";
$params = [
'intervenant' => $intervenant->getId(),
'tvh' => $typeVolumeHoraire->getId(),
'evh' => $etatVolumeHoraire->getId(),
];
$hetd = (float)$this->getEntityManager()->getConnection()->fetchOne($sql, $params);
return $hetd;
}
/** /**
* Enregistrement du contrat ET liaison aux volumes horaires correspondants * Enregistrement du contrat ET liaison aux volumes horaires correspondants
* *
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment