Commit f25e2fb8 authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction des erreurs rencontrés sur le contrat

parent 1088db9e
Loading
Loading
Loading
Loading
Loading
+14 −11
Changes for module/Contrat/src/Processus/ContratProcessus.php: 14 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ class ContratProcessus extends AbstractProcessus
    {
        $tblContrats = [];
        $query       = $this->getEntityManager()->createQuery(
            'SELECT tblc, vh
            'SELECT tblc, vhr
                 FROM ' . TblContrat::class . ' tblc
                 JOIN tblc.volumeHoraireRef vh
                 JOIN tblc.volumeHoraireRef vhr
                 WHERE tblc.uuid = :uuid'
        );
        $query->setParameter('uuid', $uuid);
@@ -106,9 +106,9 @@ class ContratProcessus extends AbstractProcessus
    {
        $tblContrats = [];
        $query       = $this->getEntityManager()->createQuery(
            'SELECT tblc, vh
            'SELECT tblc, vhm
                 FROM ' . TblContrat::class . ' tblc
                 JOIN tblc.volumeHoraireMission vh
                 JOIN tblc.volumeHoraireMission vhm
                 WHERE tblc.uuid = :uuid'
        );
        $query->setParameter('uuid', $uuid);
@@ -184,26 +184,32 @@ class ContratProcessus extends AbstractProcessus
        $this->getORMEventListenersHistoriqueListener()->setEnabled(false);
        foreach ($tblContrats as $tblContrat) {
            $vh = $tblContrat->getVolumeHoraire();
            if ($vh != null) {
                $vh->setContrat($contrat);
                $this->getEntityManager()->persist($vh);
            }
        }

        // on récupère les services referentiel non contractualisés et on la place les VHR correspondants dans le contrat
        $tblContrats = $this->getVolumeHoraireRefTblContrat($uuid);
        $this->getORMEventListenersHistoriqueListener()->setEnabled(false);
        foreach ($tblContrats as $tblContrat) {
            $vhr = $tblContrat->getVolumeHoraireRef();
            if ($vhr != null) {
                $vhr->setContrat($contrat);
                $this->getEntityManager()->persist($vhr);
            }
        }

//        // on récupère les heures de mission et on les places dans le contrat
        $tblContrats = $this->getVolumeHoraireMissionTblContrat($uuid);
        $this->getORMEventListenersHistoriqueListener()->setEnabled(false);
        foreach ($tblContrats as $tblContrat) {
            $vhr = $tblContrat->getVolumeHoraireRef();
            $vhr->setContrat($contrat);
            $this->getEntityManager()->persist($vhr);
            $vhm = $tblContrat->getVolumeHoraireMission();
            if ($vhm != null) {
                $vhm->setContrat($contrat);
                $this->getEntityManager()->persist($vhm);
            }
        }


@@ -436,8 +442,7 @@ class ContratProcessus extends AbstractProcessus
            ->to($to)
            ->html($htmlContent);

        foreach($bcc as $address)
        {
        foreach ($bcc as $address) {
            $mail->addBcc($address);
        }

@@ -457,6 +462,4 @@ class ContratProcessus extends AbstractProcessus
    }




}
 No newline at end of file
+1 −1
Changes for module/Contrat/src/Tbl/Process/ContratProcess.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class ContratProcess implements ProcessInterface

                if (($service['TYPE_SERVICE_CODE'] != 'MIS' && $this->regleEns == Parametre::CONTRAT_ENS_GLOBALE)
                    ||
                    ($service['TYPE_SERVICE_CODE'] == 'MIS' && $this->regleEns == Parametre::CONTRAT_MIS_GLOBALE)) {
                    ($service['TYPE_SERVICE_CODE'] == 'MIS' && $this->regleMis == Parametre::CONTRAT_MIS_GLOBALE)) {
                    $service['STRUCTURE_ID'] = NULL;
                }
            }
+3 −4
Changes for module/Mission/src/Controller/SaisieController.php: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -162,12 +162,11 @@ class SaisieController extends AbstractController
            try {
                $this->getServiceMission()->save($mission);
                $hFin = $mission->getHeures();
                $this->updateTableauxBord($mission);
                if (!$this->getProcessusPlafond()->endTransaction($mission, $typeVolumeHoraire, $hFin < $hDeb)) {
                    $this->updateTableauxBord($mission);
                }else{
                if ($this->getProcessusPlafond()->endTransaction($mission, $typeVolumeHoraire, $hFin <= $hDeb)) {
                    $this->flashMessenger()->addSuccessMessage('Mission bien enregistrée');
                }
                $this->updateTableauxBord($mission);

            } catch (\Exception $e) {
                $this->flashMessenger()->addErrorMessage($this->translate($e));
                $this->em()->rollback();