Commit 07988ac5 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

#61947

parent 3dd38b6c

module/Formule/src/Model/AbstractFormuleCalcul.php

+29 −16
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ class AbstractFormuleCalcul 


    /** @var FormuleVolumeHoraire[] */

    protected array $volumesHoraires = [];



    /** @var FormuleVolumeHoraire[] */

    protected array $nonPayables = [];



    protected array $cache = [];



    protected int $mainLine = 20;
@@ -154,7 +158,16 @@ class AbstractFormuleCalcul 
    public function calculer(FormuleIntervenant $intervenant, Formule $formule): void

    {

        $this->intervenant     = $intervenant;

        $this->volumesHoraires = $intervenant->getVolumesHoraires()->toArray();

        $this->volumesHoraires = [];

        $this->nonPayables     = [];

        foreach ($intervenant->getVolumesHoraires() as $volumesHoraire) {

            if ($volumesHoraire->isNonPayable()) {

                $this->nonPayables[] = $volumesHoraire;

            } else {

                $this->volumesHoraires[] = $volumesHoraire;

            }

        }



        $this->formule         = $formule;

        $this->cache           = [

            'vh'     => [],
@@ -162,14 +175,14 @@ class AbstractFormuleCalcul 
        ];



        foreach ($this->volumesHoraires as $l => $volumeHoraire) {

            if ($volumeHoraire->isNonPayable()){

                $this->calculNonPayable($l, $volumeHoraire);

            }else {

            $this->calculPayable($l, $volumeHoraire);

            if ($intervenant->isDepassementServiceDuSansHC()) {

                $this->interdictionHC($l, $volumeHoraire);

            }

        }



        foreach ($this->nonPayables as $l => $volumeHoraire) {

            $this->calculNonPayable($l, $volumeHoraire);

        }



        if ($this->intervenant instanceof FormuleTestIntervenant) {