Commit dd60cb67 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Correction sur les arrondis du total d'heure HETD (#66537)

parent 2a733ff0

module/Formule/src/Model/FormuleDetailsExtractor.php

+5 −0
Original line number Diff line number Diff line
@@ -172,6 +172,11 @@ class FormuleDetailsExtractor implements ExtractionInterface 
            $valeur                               = $this->trace->getValeur($typeHetd);

            $this->intervenant['hetd'][$typeHetd] = $this->valeurToJson($valeur);

        }

        //Mécanique d'arrondis du total si écart entre service du et total heure est de 0.01 HETD

        if ($this->intervenant['hetd']['HeuresService']['valeur'] > 0 && $this->intervenant['serviceDu'] > 0 && abs($this->intervenant['hetd']['HeuresService']['valeur'] - $this->intervenant['serviceDu']) <= 0.01) {

            $this->intervenant['hetd']['HeuresService']['valeur'] = $this->intervenant['serviceDu'];



        }

    }

module/Formule/src/Service/AfficheurService.php

+4 −7
Original line number Diff line number Diff line
@@ -33,12 +33,6 @@ class AfficheurService 


    public function resultatToJson(FormuleResultatIntervenant $fr): array

    {

        /*$fr = new FormuleResultatIntervenant();

        //$fr->setHeuresServiceStatutaire(192);

        $fr->setHeuresServiceFi(50);

        $fr->setHeuresComplFc(48);

        $fr->setHeuresPrimes(50);*/



        $hasServiceStatutaire   = ($fr->getHeuresServiceStatutaire() > 0) || $fr->getHeures('service') > 0;

        $hasModificationService = abs($fr->getHeuresServiceStatutaire() - $fr->getHeuresServiceModifie()) > 0.01;

        $hasNonPayable          = $fr->getHeures('non-payable') > 0.0;
@@ -117,7 +111,10 @@ class AfficheurService 
                }

            }

        }



        //Mécanique d'arrondis du total si écart entre service du et total heure est de 0.01 HETD

        if ($data['heures']['total']['total'] > 0 && $data['serviceDu'] > 0 && abs($data['heures']['total']['total'] - $data['serviceDu']) <= 0.01) {

            $data['heures']['total']['total'] = $data['serviceDu'];

        }

        return $data;

    }