Commit f771619f authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

MAJ DDL

parent 8738fb4c

bdd/ddl.php

+57 −51
Original line number Diff line number Diff line
@@ -20078,7 +20078,6 @@ END FORMULE_MONTPELLIER;', 
      END IF;

























    -- x =SI(ESTVIDE(composante_affectation);0;SI(OU(ESTVIDE($C21);NON(C21="Référentiel");ET(HC=0;H21="Non"));0;SI(H21="Non";O21;SI($M21>0;(($M21*$N21)+($I21-$M21)*J21);$K21))))









    WHEN c = \'x\' AND v >= 1 THEN









      IF i.type_intervenant_code = \'E\' THEN










@@ -29015,7 +29014,12 @@ WITH hs AS (







  SELECT contrat_id, sum(heures) "serviceTotal" FROM V_CONTRAT_SERVICES GROUP BY contrat_id









)









SELECT









  ct.annee_id,









  ct.structure_id,









  ct.intervenant_id,









  ct.formule_resultat_id,









  ct.id contrat_id,

















  ct."annee",









  ct."nom",









  ct."prenom",










@@ -29061,6 +29065,8 @@ FROM







(









  SELECT









    c.*,









    i.annee_id                                                                                    annee_id,









    fr.id                                                                                         formule_resultat_id,









    a.libelle                                                                                     "annee",









    COALESCE(d.nom_usuel,i.nom_usuel)                                                             "nom",









    COALESCE(d.prenom,i.prenom)                                                                   "prenom",