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

Correction sur le tri du modèle du contrat à appliquer (suite passage PHP8) (#45520)

parent 1fb0f017

module/Application/src/Service/ModeleContratService.php

+9 −13
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ class ModeleContratService extends AbstractEntityService 
    private $config;







    /**

     * retourne la classe des entités

     *
@@ -48,7 +47,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    /**

     * @param Contrat $contrat

     *
@@ -59,7 +57,13 @@ class ModeleContratService extends AbstractEntityService 
        $modeles = $this->getList();



        usort($modeles, function (ModeleContrat $m1, ModeleContrat $m2) use ($contrat) {

            return $this->getRank($m1, $contrat) < $this->getRank($m2, $contrat) ? 1 : 0;

            $rank1 = $this->getRank($m1, $contrat);

            $rank2 = $this->getRank($m2, $contrat);



            if ($rank1 == $rank2) {

                return 0;

            }

            return $rank1 < $rank2 ? 1 : -1;

        });



        $modele = reset($modeles);
@@ -68,7 +72,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    public function generer(Contrat $contrat, $download = true)

    {

        $fileName = sprintf(($contrat->estUnAvenant() ? 'avenant' : 'contrat') . "_%s_%s_%s.pdf",
@@ -111,7 +114,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    public function prepareMail(Contrat $contrat, string $htmlContent, string $from, string $to, string $cci = null, string $subject = null)

    {

        $fileName = sprintf(($contrat->estUnAvenant() ? 'avenant' : 'contrat') . "_%s_%s_%s.pdf",
@@ -169,7 +171,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    /**

     * @return string

     */
@@ -179,14 +180,13 @@ class ModeleContratService extends AbstractEntityService 
    }







    private function generateData(ModeleContrat $modele, Contrat $contrat)

    {

        $connection = $this->getEntityManager()->getConnection();



        $params = ['contrat' => $contrat->getId()];



        $mainData = $connection->fetchAssociative('SELECT * FROM V_CONTRAT_MAIN WHERE CONTRAT_ID = :contrat', $params);

        $mainData = $connection->fetchAssociative('SELECT * FROM v_contrat_main WHERE contrat_id = :contrat', $params);

        if ($modele->getRequete()) {

            $mainDataPerso = $connection->fetchAssociative($modele->getRequete(), $params);

            foreach ($mainDataPerso as $key => $value) {
@@ -212,7 +212,7 @@ class ModeleContratService extends AbstractEntityService 
            && !isset($data[0]['serviceHeures@table:table-row'])

        ) {

            $data[0]['serviceCode@table:table-row'] =

                $connection->fetchAllAssociative('SELECT * FROM V_CONTRAT_SERVICES WHERE CONTRAT_ID = :contrat', $params);

                $connection->fetchAllAssociative('SELECT * FROM v_contrat_services WHERE contrat_id = :contrat', $params);

        }



        if (isset($mainData['exemplaire1']) && $mainData['exemplaire1'] && ('0' !== $mainData['exemplaire1'])) {
@@ -234,7 +234,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    private function getRank(ModeleContrat $modele, Contrat $contrat)

    {

        $rank = 100;
@@ -259,7 +258,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    /**

     * Retourne l'alias d'entité courante

     *
@@ -271,7 +269,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    /**

     * @return array

     */
@@ -281,7 +278,6 @@ class ModeleContratService extends AbstractEntityService 
    }







    /**

     * @param array $config

     *