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

modif V_CONTRAIT_MAIN 

refactor name fonction
parent 623d2d45

data/ddl/view/V_CONTRAT_MAIN.sql

+2 −1
Changes for data/ddl/view/V_CONTRAT_MAIN.sql: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -118,9 +118,10 @@ FROM (SELECT c.*, 
         JOIN type_volume_horaire tvh ON tvh.code = 'PREVU'

         JOIN etat_volume_horaire evh ON evh.code = 'valide'

    LEFT JOIN formule_resultat     fr ON fr.intervenant_id = i.id AND fr.type_volume_horaire_id = tvh.id AND fr.etat_volume_horaire_id = evh.id

    LEFT JOIN taux_horaire_hetd    th ON th.valeur = OSE_FORMULE.GET_TAUX_HORAIRE_HETD(a.date_debut)

    LEFT JOIN taux_horaire_hetd    th ON th.valeur = OSE_PAIEMENT.get_taux_horaire(tr.code, a.date_debut)

    LEFT JOIN                      hs ON hs.contrat_id = c.id

    LEFT JOIN contrat              cp ON cp.id = c.contrat_id

    LEFT JOIN taux_remu            tr ON tr.code = OSE_PAIEMENT.get_code_taux_remu_legal()

  WHERE

    c.histo_destruction IS NULL

) ct
 
 No newline at end of file

module/Paiement/src/Controller/TauxRemuController.php

+2 −2
Changes for module/Paiement/src/Controller/TauxRemuController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class TauxRemuController extends AbstractController 
            $title          = "Création d'une nouvelle valeur";

            $tauxRemuValeur = $this->getServiceTauxRemu()->newEntityValeur();

        } else {

            $tauxRemuValeur = $this->getServiceTauxRemu()->getTauxRemusValeur($tauxRemuValeurId);

            $tauxRemuValeur = $this->getServiceTauxRemu()->getTauxRemuValeur($tauxRemuValeurId);

            $title          = "Édition d'une valeur";

        }
@@ -145,7 +145,7 @@ class TauxRemuController extends AbstractController 
    public function supprimerValeurAction(): MessengerViewModel

    {

        $tauxRemuValeurId = $this->params()->fromRoute('tauxRemuValeur');

        $tauxRemuValeur   = $this->getServiceTauxRemu()->getTauxRemusValeur($tauxRemuValeurId);

        $tauxRemuValeur   = $this->getServiceTauxRemu()->getTauxRemuValeur($tauxRemuValeurId);

        $this->em()->remove($tauxRemuValeur);

        $this->em()->flush();

module/Paiement/src/Service/TauxRemuService.php

+1 −1
Changes for module/Paiement/src/Service/TauxRemuService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class TauxRemuService extends AbstractEntityService 






    public function getTauxRemusValeur(mixed $tauxRemuValeurId)

    public function getTauxRemuValeur(mixed $tauxRemuValeurId)

    {

        $dql    = "SELECT mtr

                 FROM " . TauxRemuValeur::class . " mtr