Commit 690986dd authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE into missions

parents c14bf1c2 5273bed9
Loading
Loading
Loading
Loading
+1 −1
Changes for data/ddl/index/SERV_REF_MOTIF_NON_PAIEMENT_FK.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
//@formatter:off

return [
    'name'    => 'SERVICE_REFERENTIEL_MOTIF_NON_PAIEMENT_FK',
    'name'    => 'SERV_REF_MOTIF_NON_PAIEMENT_FK',
    'unique'  => FALSE,
    'table'   => 'SERVICE_REFERENTIEL',
    'columns' => [
+12 −10
Changes for data/ddl/package/OSE_WORKFLOW/body.sql: 12 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -519,16 +519,17 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
          LEFT JOIN (
            SELECT DISTINCT t.intervenant_id
            FROM tbl_service t
            WHERE t.heures > 0 AND t.type_volume_horaire_code = ''PREVU''
            WHERE ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 't') || ' AND (t.heures <> 0 OR t.valide > 0) AND t.type_volume_horaire_code = ''PREVU''

            UNION

            SELECT DISTINCT t.intervenant_id
            FROM tbl_referentiel t
            WHERE t.heures > 0 AND t.type_volume_horaire_code = ''PREVU''
            WHERE ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 't') || ' AND (t.heures <> 0 OR t.valide > 0) AND t.type_volume_horaire_code = ''PREVU''
          ) t ON t.intervenant_id = i.id
        WHERE
          i.histo_destruction IS NULL
          ' || unicaen_tbl.MAKE_WHERE(CASE param WHEN 'INTERVENANT_ID' THEN 'ID' ELSE param END, VALUE, 'i') || '
          AND i.histo_destruction IS NULL
          AND (si.service_prevu = 1 OR si.referentiel_prevu = 1)
    ';

@@ -547,16 +548,17 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
          LEFT JOIN (
            SELECT DISTINCT t.intervenant_id
            FROM tbl_service t
            WHERE t.heures > 0 AND t.type_volume_horaire_code = ''REALISE''
            WHERE ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 't') || ' AND (t.heures <> 0 OR t.valide > 0) AND t.type_volume_horaire_code = ''REALISE''

            UNION

            SELECT DISTINCT t.intervenant_id
            FROM tbl_referentiel t
            WHERE t.heures > 0 AND t.type_volume_horaire_code = ''REALISE''
            WHERE ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 't') || ' AND (t.heures <> 0 OR t.valide > 0) AND t.type_volume_horaire_code = ''REALISE''
          ) t ON t.intervenant_id = i.id
        WHERE
          i.histo_destruction IS NULL
          ' || unicaen_tbl.MAKE_WHERE(CASE param WHEN 'INTERVENANT_ID' THEN 'ID' ELSE param END, VALUE, 'i') || '
          AND i.histo_destruction IS NULL
          AND (si.service_realise = 1 OR si.referentiel_realise = 1)
    ';

@@ -576,7 +578,7 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
          tbl_validation_enseignement tve
          JOIN type_volume_horaire tvh ON tvh.id = tve.type_volume_horaire_id
        WHERE
          ' || unicaen_tbl.MAKE_WHERE(param, VALUE) || '
          ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 'tve') || '
          AND tve.auto_validation = 0
        GROUP BY
          tve.intervenant_id,
@@ -600,7 +602,7 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
          tbl_validation_referentiel tvr
          JOIN type_volume_horaire tvh ON tvh.id = tvr.type_volume_horaire_id
        WHERE
          ' || unicaen_tbl.MAKE_WHERE(param, VALUE) || '
          ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 'tvr') || '
          AND tvr.auto_validation = 0
        GROUP BY
          tvr.intervenant_id,
@@ -662,7 +664,7 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
          tbl_agrement a
          JOIN type_agrement ta ON ta.id = a.type_agrement_id
        WHERE
          ' || unicaen_tbl.MAKE_WHERE(param, VALUE) || '
          ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 'a') || '
    ';


@@ -755,7 +757,7 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
            JOIN parametre p on p.nom = ''contrat_regle_franchissement''
            JOIN parametre p2 on p2.nom = ''avenant''
          WHERE
            ' || unicaen_tbl.MAKE_WHERE(param, VALUE) || '
            ' || unicaen_tbl.MAKE_WHERE(param, VALUE, 'c') || '
            AND actif = 1
            AND nbvh > 0
        ) c
+1 −1
Changes for data/ddl/ref-constraint/SERV_REF_MOTIF_NON_PAIEMENT_FK.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
//@formatter:off

return [
    'name'        => 'SERVICE_REFERENTIEL_MOTIF_NON_PAIEMENT_FK',
    'name'        => 'SERV_REF_MOTIF_NON_PAIEMENT_FK',
    'table'       => 'SERVICE_REFERENTIEL',
    'rtable'      => 'MOTIF_NON_PAIEMENT',
    'delete_rule' => NULL,
+0 −5
Changes for data/donnees_par_defaut.php: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -27796,11 +27796,6 @@ return [
            "LOCALISATION" => "Inst . BD",
            "SOURCE_CODE" => "0912155Y",
        ],
        [
            "DEPARTEMENT" => "061",
            "LIBELLE" => "Institut de Formation et de Recherche En Santé de Normandie (IFRES)",
            "LOCALISATION" => "Damigny",
        ],
        [
            "DEPARTEMENT" => "014",
            "LIBELLE" => "Institut de Formations Supérieures du Grand Ouest - IFSGO",
+0 −1
Changes for module/Enseignement/src/Controller/EnseignementController.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -470,7 +470,6 @@ class EnseignementController extends AbstractController
        $vm = new ViewModel();
        $vm->setVariables(compact('title', 'typeVolumeHoraire', 'intervenant', 'validations', 'services'));
        $vm->setTemplate('enseignement/validation');
        $this->updateTableauxBord($intervenant);

        return $vm;
    }
Loading