Skip to content
Snippets Groups Projects
Commit 0fe9f5a9 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Finalisation du bon ordonnancement des colonnes

parent aafb86ac
No related branches found
No related tags found
1 merge request!55Ll bug report services
Show whitespace changes
Inline Side-by-side
admin/migration/OrdonnancementColonnesTbl.php
+ 16
− 2
View file @ 0fe9f5a9
......@@ -58,6 +58,8 @@ class OrdonnancementColonnesTbl extends AbstractMigration
{
if ($contexte == self::CONTEXTE_PRE) {
$this->before();
} else {
$this->after();
}
}
......@@ -66,11 +68,23 @@ class OrdonnancementColonnesTbl extends AbstractMigration
protected function before()
{
$bdd = $this->manager->getBdd();
$console = $this->manager->getOseAdmin()->getConsole();
foreach ($this->tbls as $table => $null) {
$console->println("Suppression de la table $table");
$bdd->table()->drop($table);
}
}
protected function after()
{
$console = $this->manager->getOseAdmin()->getConsole();
$console->begin("Recalcul de tous les tableaux de bord");
$this->manager->getOseAdmin()->exec('calcul-tableaux-bord');
$console->end("Tableaux de bord recalculés");
}
}
data/ddl/package/UNICAEN_TBL/body.sql
+ 73
− 74
View file @ 0fe9f5a9
......@@ -290,31 +290,31 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
SELECT
CASE WHEN
t.ANNEE_ID = v.ANNEE_ID
AND COALESCE(t.ANNEE_AGREMENT,0) = COALESCE(v.ANNEE_AGREMENT,0)
AND t.TYPE_AGREMENT_ID = v.TYPE_AGREMENT_ID
AND t.INTERVENANT_ID = v.INTERVENANT_ID
AND t.CODE_INTERVENANT = v.CODE_INTERVENANT
AND COALESCE(t.STRUCTURE_ID,0) = COALESCE(v.STRUCTURE_ID,0)
AND t.OBLIGATOIRE = v.OBLIGATOIRE
AND COALESCE(t.AGREMENT_ID,0) = COALESCE(v.AGREMENT_ID,0)
AND COALESCE(t.ANNEE_AGREMENT,0) = COALESCE(v.ANNEE_AGREMENT,0)
AND t.CODE_INTERVENANT = v.CODE_INTERVENANT
AND t.DUREE_VIE = v.DUREE_VIE
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.ANNEE_AGREMENT,
v.TYPE_AGREMENT_ID,
v.INTERVENANT_ID,
v.CODE_INTERVENANT,
v.STRUCTURE_ID,
v.OBLIGATOIRE,
v.AGREMENT_ID,
v.ANNEE_AGREMENT,
v.CODE_INTERVENANT,
v.DUREE_VIE
FROM
(' || QUERY_APPLY_PARAM(viewQuery,param,value) || ') v
FULL JOIN TBL_AGREMENT t ON
t.TYPE_AGREMENT_ID = v.TYPE_AGREMENT_ID
COALESCE(t.ANNEE_AGREMENT,0) = COALESCE(v.ANNEE_AGREMENT,0)
AND t.TYPE_AGREMENT_ID = v.TYPE_AGREMENT_ID
AND t.INTERVENANT_ID = v.INTERVENANT_ID
AND COALESCE(t.STRUCTURE_ID,0) = COALESCE(v.STRUCTURE_ID,0)
AND COALESCE(t.ANNEE_AGREMENT,0) = COALESCE(v.ANNEE_AGREMENT,0)
WHERE ' || filter;
LOOP
FETCH c INTO d; EXIT WHEN c%NOTFOUND;
......@@ -323,10 +323,10 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
d.id := TBL_AGREMENT_ID_SEQ.NEXTVAL;
INSERT INTO TBL_AGREMENT values d;
ELSIF
d.TYPE_AGREMENT_ID IS NULL
d.ANNEE_AGREMENT IS NULL
AND d.TYPE_AGREMENT_ID IS NULL
AND d.INTERVENANT_ID IS NULL
AND d.STRUCTURE_ID IS NULL
AND d.ANNEE_AGREMENT IS NULL
THEN
DELETE FROM TBL_AGREMENT WHERE id = d.id;
ELSIF d.id <> -1 THEN
......@@ -1128,6 +1128,7 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND t.PEUT_SAISIR_DOSSIER = v.PEUT_SAISIR_DOSSIER
AND COALESCE(t.DOSSIER_ID,0) = COALESCE(v.DOSSIER_ID,0)
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
AND COALESCE(t.COMPLETUDE_STATUT,0) = COALESCE(v.COMPLETUDE_STATUT,0)
AND COALESCE(t.COMPLETUDE_IDENTITE,0) = COALESCE(v.COMPLETUDE_IDENTITE,0)
AND COALESCE(t.COMPLETUDE_IDENTITE_COMP,0) = COALESCE(v.COMPLETUDE_IDENTITE_COMP,0)
AND COALESCE(t.COMPLETUDE_CONTACT,0) = COALESCE(v.COMPLETUDE_CONTACT,0)
......@@ -1136,13 +1137,13 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND COALESCE(t.COMPLETUDE_IBAN,0) = COALESCE(v.COMPLETUDE_IBAN,0)
AND COALESCE(t.COMPLETUDE_EMPLOYEUR,0) = COALESCE(v.COMPLETUDE_EMPLOYEUR,0)
AND COALESCE(t.COMPLETUDE_AUTRES,0) = COALESCE(v.COMPLETUDE_AUTRES,0)
AND COALESCE(t.COMPLETUDE_STATUT,0) = COALESCE(v.COMPLETUDE_STATUT,0)
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.INTERVENANT_ID,
v.PEUT_SAISIR_DOSSIER,
v.DOSSIER_ID,
v.VALIDATION_ID,
v.COMPLETUDE_STATUT,
v.COMPLETUDE_IDENTITE,
v.COMPLETUDE_IDENTITE_COMP,
v.COMPLETUDE_CONTACT,
......@@ -1150,8 +1151,7 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
v.COMPLETUDE_INSEE,
v.COMPLETUDE_IBAN,
v.COMPLETUDE_EMPLOYEUR,
v.COMPLETUDE_AUTRES,
v.COMPLETUDE_STATUT
v.COMPLETUDE_AUTRES
FROM
(' || QUERY_APPLY_PARAM(viewQuery,param,value) || ') v
FULL JOIN TBL_DOSSIER t ON
......@@ -1253,6 +1253,10 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
SELECT
CASE WHEN
t.ANNEE_ID = v.ANNEE_ID
AND COALESCE(t.SERVICE_ID,0) = COALESCE(v.SERVICE_ID,0)
AND COALESCE(t.SERVICE_REFERENTIEL_ID,0) = COALESCE(v.SERVICE_REFERENTIEL_ID,0)
AND COALESCE(t.FORMULE_RES_SERVICE_ID,0) = COALESCE(v.FORMULE_RES_SERVICE_ID,0)
AND COALESCE(t.FORMULE_RES_SERVICE_REF_ID,0) = COALESCE(v.FORMULE_RES_SERVICE_REF_ID,0)
AND t.INTERVENANT_ID = v.INTERVENANT_ID
AND t.STRUCTURE_ID = v.STRUCTURE_ID
AND COALESCE(t.MISE_EN_PAIEMENT_ID,0) = COALESCE(v.MISE_EN_PAIEMENT_ID,0)
......@@ -1261,12 +1265,12 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND t.HEURES_A_PAYER_POND = v.HEURES_A_PAYER_POND
AND t.HEURES_DEMANDEES = v.HEURES_DEMANDEES
AND t.HEURES_PAYEES = v.HEURES_PAYEES
AND COALESCE(t.FORMULE_RES_SERVICE_ID,0) = COALESCE(v.FORMULE_RES_SERVICE_ID,0)
AND COALESCE(t.FORMULE_RES_SERVICE_REF_ID,0) = COALESCE(v.FORMULE_RES_SERVICE_REF_ID,0)
AND COALESCE(t.SERVICE_ID,0) = COALESCE(v.SERVICE_ID,0)
AND COALESCE(t.SERVICE_REFERENTIEL_ID,0) = COALESCE(v.SERVICE_REFERENTIEL_ID,0)
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.SERVICE_ID,
v.SERVICE_REFERENTIEL_ID,
v.FORMULE_RES_SERVICE_ID,
v.FORMULE_RES_SERVICE_REF_ID,
v.INTERVENANT_ID,
v.STRUCTURE_ID,
v.MISE_EN_PAIEMENT_ID,
......@@ -1274,18 +1278,14 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
v.HEURES_A_PAYER,
v.HEURES_A_PAYER_POND,
v.HEURES_DEMANDEES,
v.HEURES_PAYEES,
v.FORMULE_RES_SERVICE_ID,
v.FORMULE_RES_SERVICE_REF_ID,
v.SERVICE_ID,
v.SERVICE_REFERENTIEL_ID
v.HEURES_PAYEES
FROM
(' || QUERY_APPLY_PARAM(viewQuery,param,value) || ') v
FULL JOIN TBL_PAIEMENT t ON
t.INTERVENANT_ID = v.INTERVENANT_ID
AND COALESCE(t.MISE_EN_PAIEMENT_ID,0) = COALESCE(v.MISE_EN_PAIEMENT_ID,0)
AND COALESCE(t.FORMULE_RES_SERVICE_ID,0) = COALESCE(v.FORMULE_RES_SERVICE_ID,0)
COALESCE(t.FORMULE_RES_SERVICE_ID,0) = COALESCE(v.FORMULE_RES_SERVICE_ID,0)
AND COALESCE(t.FORMULE_RES_SERVICE_REF_ID,0) = COALESCE(v.FORMULE_RES_SERVICE_REF_ID,0)
AND t.INTERVENANT_ID = v.INTERVENANT_ID
AND COALESCE(t.MISE_EN_PAIEMENT_ID,0) = COALESCE(v.MISE_EN_PAIEMENT_ID,0)
WHERE ' || filter;
LOOP
FETCH c INTO d; EXIT WHEN c%NOTFOUND;
......@@ -1294,10 +1294,10 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
d.id := TBL_PAIEMENT_ID_SEQ.NEXTVAL;
INSERT INTO TBL_PAIEMENT values d;
ELSIF
d.INTERVENANT_ID IS NULL
AND d.MISE_EN_PAIEMENT_ID IS NULL
AND d.FORMULE_RES_SERVICE_ID IS NULL
d.FORMULE_RES_SERVICE_ID IS NULL
AND d.FORMULE_RES_SERVICE_REF_ID IS NULL
AND d.INTERVENANT_ID IS NULL
AND d.MISE_EN_PAIEMENT_ID IS NULL
THEN
DELETE FROM TBL_PAIEMENT WHERE id = d.id;
ELSIF d.id <> -1 THEN
......@@ -1325,8 +1325,7 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
fournie,
validee,
heures_pour_seuil,
obligatoire,
date_archive
obligatoire
FROM (
SELECT
COALESCE( pjd.annee_id, pjf.annee_id ) annee_id,
......@@ -1513,23 +1512,23 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
SELECT
CASE WHEN
t.ANNEE_ID = v.ANNEE_ID
AND t.TYPE_PIECE_JOINTE_ID = v.TYPE_PIECE_JOINTE_ID
AND t.CODE_INTERVENANT = v.CODE_INTERVENANT
AND t.INTERVENANT_ID = v.INTERVENANT_ID
AND t.TYPE_PIECE_JOINTE_ID = v.TYPE_PIECE_JOINTE_ID
AND t.HEURES_POUR_SEUIL = v.HEURES_POUR_SEUIL
AND COALESCE(t.OBLIGATOIRE,0) = COALESCE(v.OBLIGATOIRE,0)
AND t.CODE_INTERVENANT = v.CODE_INTERVENANT
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.TYPE_PIECE_JOINTE_ID,
v.CODE_INTERVENANT,
v.INTERVENANT_ID,
v.TYPE_PIECE_JOINTE_ID,
v.HEURES_POUR_SEUIL,
v.OBLIGATOIRE,
v.CODE_INTERVENANT
v.OBLIGATOIRE
FROM
(' || QUERY_APPLY_PARAM(viewQuery,param,value) || ') v
FULL JOIN TBL_PIECE_JOINTE_DEMANDE t ON
t.TYPE_PIECE_JOINTE_ID = v.TYPE_PIECE_JOINTE_ID
AND t.INTERVENANT_ID = v.INTERVENANT_ID
t.INTERVENANT_ID = v.INTERVENANT_ID
AND t.TYPE_PIECE_JOINTE_ID = v.TYPE_PIECE_JOINTE_ID
WHERE ' || filter;
LOOP
FETCH c INTO d; EXIT WHEN c%NOTFOUND;
......@@ -1538,8 +1537,8 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
d.id := TBL_PIECE_JOINTE_DEMAND_ID_SEQ.NEXTVAL;
INSERT INTO TBL_PIECE_JOINTE_DEMANDE values d;
ELSIF
d.TYPE_PIECE_JOINTE_ID IS NULL
AND d.INTERVENANT_ID IS NULL
d.INTERVENANT_ID IS NULL
AND d.TYPE_PIECE_JOINTE_ID IS NULL
THEN
DELETE FROM TBL_PIECE_JOINTE_DEMANDE WHERE id = d.id;
ELSIF d.id <> -1 THEN
......@@ -1607,24 +1606,24 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
SELECT
CASE WHEN
t.ANNEE_ID = v.ANNEE_ID
AND t.CODE_INTERVENANT = v.CODE_INTERVENANT
AND t.TYPE_PIECE_JOINTE_ID = v.TYPE_PIECE_JOINTE_ID
AND t.INTERVENANT_ID = v.INTERVENANT_ID
AND t.PIECE_JOINTE_ID = v.PIECE_JOINTE_ID
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
AND COALESCE(t.FICHIER_ID,0) = COALESCE(v.FICHIER_ID,0)
AND t.PIECE_JOINTE_ID = v.PIECE_JOINTE_ID
AND t.DUREE_VIE = v.DUREE_VIE
AND t.CODE_INTERVENANT = v.CODE_INTERVENANT
AND COALESCE(t.DATE_VALIDITE,0) = COALESCE(v.DATE_VALIDITE,0)
AND COALESCE(t.DATE_ARCHIVE,0) = COALESCE(v.DATE_ARCHIVE,0)
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.CODE_INTERVENANT,
v.TYPE_PIECE_JOINTE_ID,
v.INTERVENANT_ID,
v.PIECE_JOINTE_ID,
v.VALIDATION_ID,
v.FICHIER_ID,
v.PIECE_JOINTE_ID,
v.DUREE_VIE,
v.CODE_INTERVENANT,
v.DATE_VALIDITE,
v.DATE_ARCHIVE
FROM
......@@ -1770,48 +1769,48 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
CASE WHEN
t.ANNEE_ID = v.ANNEE_ID
AND t.INTERVENANT_ID = v.INTERVENANT_ID
AND t.PEUT_SAISIR_SERVICE = v.PEUT_SAISIR_SERVICE
AND COALESCE(t.TYPE_VOLUME_HORAIRE_ID,0) = COALESCE(v.TYPE_VOLUME_HORAIRE_ID,0)
AND COALESCE(t.INTERVENANT_STRUCTURE_ID,0) = COALESCE(v.INTERVENANT_STRUCTURE_ID,0)
AND COALESCE(t.STRUCTURE_ID,0) = COALESCE(v.STRUCTURE_ID,0)
AND t.NBVH = v.NBVH
AND t.VALIDE = v.VALIDE
AND t.TYPE_INTERVENANT_ID = v.TYPE_INTERVENANT_ID
AND t.TYPE_INTERVENANT_CODE = v.TYPE_INTERVENANT_CODE
AND t.PEUT_SAISIR_SERVICE = v.PEUT_SAISIR_SERVICE
AND COALESCE(t.ELEMENT_PEDAGOGIQUE_ID,0) = COALESCE(v.ELEMENT_PEDAGOGIQUE_ID,0)
AND t.SERVICE_ID = v.SERVICE_ID
AND COALESCE(t.ELEMENT_PEDAGOGIQUE_PERIODE_ID,0) = COALESCE(v.ELEMENT_PEDAGOGIQUE_PERIODE_ID,0)
AND COALESCE(t.ETAPE_ID,0) = COALESCE(v.ETAPE_ID,0)
AND COALESCE(t.TYPE_VOLUME_HORAIRE_ID,0) = COALESCE(v.TYPE_VOLUME_HORAIRE_ID,0)
AND t.TYPE_VOLUME_HORAIRE_CODE = v.TYPE_VOLUME_HORAIRE_CODE
AND t.ELEMENT_PEDAGOGIQUE_HISTO = v.ELEMENT_PEDAGOGIQUE_HISTO
AND t.ETAPE_HISTO = v.ETAPE_HISTO
AND t.HAS_HEURES_MAUVAISE_PERIODE = v.HAS_HEURES_MAUVAISE_PERIODE
AND t.SERVICE_ID = v.SERVICE_ID
AND COALESCE(t.INTERVENANT_STRUCTURE_ID,0) = COALESCE(v.INTERVENANT_STRUCTURE_ID,0)
AND t.TYPE_INTERVENANT_ID = v.TYPE_INTERVENANT_ID
AND t.TYPE_INTERVENANT_CODE = v.TYPE_INTERVENANT_CODE
AND t.TYPE_VOLUME_HORAIRE_CODE = v.TYPE_VOLUME_HORAIRE_CODE
AND t.NBVH = v.NBVH
AND t.HEURES = v.HEURES
AND t.VALIDE = v.VALIDE
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.INTERVENANT_ID,
v.PEUT_SAISIR_SERVICE,
v.TYPE_VOLUME_HORAIRE_ID,
v.INTERVENANT_STRUCTURE_ID,
v.STRUCTURE_ID,
v.NBVH,
v.VALIDE,
v.TYPE_INTERVENANT_ID,
v.TYPE_INTERVENANT_CODE,
v.PEUT_SAISIR_SERVICE,
v.ELEMENT_PEDAGOGIQUE_ID,
v.SERVICE_ID,
v.ELEMENT_PEDAGOGIQUE_PERIODE_ID,
v.ETAPE_ID,
v.TYPE_VOLUME_HORAIRE_ID,
v.TYPE_VOLUME_HORAIRE_CODE,
v.ELEMENT_PEDAGOGIQUE_HISTO,
v.ETAPE_HISTO,
v.HAS_HEURES_MAUVAISE_PERIODE,
v.SERVICE_ID,
v.INTERVENANT_STRUCTURE_ID,
v.TYPE_INTERVENANT_ID,
v.TYPE_INTERVENANT_CODE,
v.TYPE_VOLUME_HORAIRE_CODE,
v.HEURES
v.NBVH,
v.HEURES,
v.VALIDE
FROM
(' || QUERY_APPLY_PARAM(viewQuery,param,value) || ') v
FULL JOIN TBL_SERVICE t ON
COALESCE(t.TYPE_VOLUME_HORAIRE_ID,0) = COALESCE(v.TYPE_VOLUME_HORAIRE_ID,0)
AND t.SERVICE_ID = v.SERVICE_ID
t.SERVICE_ID = v.SERVICE_ID
AND COALESCE(t.TYPE_VOLUME_HORAIRE_ID,0) = COALESCE(v.TYPE_VOLUME_HORAIRE_ID,0)
WHERE ' || filter;
LOOP
FETCH c INTO d; EXIT WHEN c%NOTFOUND;
......@@ -1820,8 +1819,8 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
d.id := TBL_SERVICE_ID_SEQ.NEXTVAL;
INSERT INTO TBL_SERVICE values d;
ELSIF
d.TYPE_VOLUME_HORAIRE_ID IS NULL
AND d.SERVICE_ID IS NULL
d.SERVICE_ID IS NULL
AND d.TYPE_VOLUME_HORAIRE_ID IS NULL
THEN
DELETE FROM TBL_SERVICE WHERE id = d.id;
ELSIF d.id <> -1 THEN
......@@ -2084,18 +2083,18 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND t.STRUCTURE_ID = v.STRUCTURE_ID
AND t.TYPE_VOLUME_HORAIRE_ID = v.TYPE_VOLUME_HORAIRE_ID
AND t.SERVICE_ID = v.SERVICE_ID
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
AND t.VOLUME_HORAIRE_ID = v.VOLUME_HORAIRE_ID
AND t.AUTO_VALIDATION = v.AUTO_VALIDATION
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.INTERVENANT_ID,
v.STRUCTURE_ID,
v.TYPE_VOLUME_HORAIRE_ID,
v.SERVICE_ID,
v.VALIDATION_ID,
v.VOLUME_HORAIRE_ID,
v.AUTO_VALIDATION
v.AUTO_VALIDATION,
v.VALIDATION_ID
FROM
(' || QUERY_APPLY_PARAM(viewQuery,param,value) || ') v
FULL JOIN TBL_VALIDATION_ENSEIGNEMENT t ON
......@@ -2103,8 +2102,8 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND t.STRUCTURE_ID = v.STRUCTURE_ID
AND t.TYPE_VOLUME_HORAIRE_ID = v.TYPE_VOLUME_HORAIRE_ID
AND t.SERVICE_ID = v.SERVICE_ID
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
AND t.VOLUME_HORAIRE_ID = v.VOLUME_HORAIRE_ID
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
WHERE ' || filter;
LOOP
FETCH c INTO d; EXIT WHEN c%NOTFOUND;
......@@ -2117,8 +2116,8 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND d.STRUCTURE_ID IS NULL
AND d.TYPE_VOLUME_HORAIRE_ID IS NULL
AND d.SERVICE_ID IS NULL
AND d.VALIDATION_ID IS NULL
AND d.VOLUME_HORAIRE_ID IS NULL
AND d.VALIDATION_ID IS NULL
THEN
DELETE FROM TBL_VALIDATION_ENSEIGNEMENT WHERE id = d.id;
ELSIF d.id <> -1 THEN
......@@ -2180,18 +2179,18 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND t.STRUCTURE_ID = v.STRUCTURE_ID
AND t.TYPE_VOLUME_HORAIRE_ID = v.TYPE_VOLUME_HORAIRE_ID
AND t.SERVICE_REFERENTIEL_ID = v.SERVICE_REFERENTIEL_ID
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
AND t.VOLUME_HORAIRE_REF_ID = v.VOLUME_HORAIRE_REF_ID
AND t.AUTO_VALIDATION = v.AUTO_VALIDATION
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
THEN -1 ELSE t.ID END ID,
v.ANNEE_ID,
v.INTERVENANT_ID,
v.STRUCTURE_ID,
v.TYPE_VOLUME_HORAIRE_ID,
v.SERVICE_REFERENTIEL_ID,
v.VALIDATION_ID,
v.VOLUME_HORAIRE_REF_ID,
v.AUTO_VALIDATION
v.AUTO_VALIDATION,
v.VALIDATION_ID
FROM
(' || QUERY_APPLY_PARAM(viewQuery,param,value) || ') v
FULL JOIN TBL_VALIDATION_REFERENTIEL t ON
......@@ -2199,8 +2198,8 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND t.STRUCTURE_ID = v.STRUCTURE_ID
AND t.TYPE_VOLUME_HORAIRE_ID = v.TYPE_VOLUME_HORAIRE_ID
AND t.SERVICE_REFERENTIEL_ID = v.SERVICE_REFERENTIEL_ID
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
AND t.VOLUME_HORAIRE_REF_ID = v.VOLUME_HORAIRE_REF_ID
AND COALESCE(t.VALIDATION_ID,0) = COALESCE(v.VALIDATION_ID,0)
WHERE ' || filter;
LOOP
FETCH c INTO d; EXIT WHEN c%NOTFOUND;
......@@ -2213,8 +2212,8 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
AND d.STRUCTURE_ID IS NULL
AND d.TYPE_VOLUME_HORAIRE_ID IS NULL
AND d.SERVICE_REFERENTIEL_ID IS NULL
AND d.VALIDATION_ID IS NULL
AND d.VOLUME_HORAIRE_REF_ID IS NULL
AND d.VALIDATION_ID IS NULL
THEN
DELETE FROM TBL_VALIDATION_REFERENTIEL WHERE id = d.id;
ELSIF d.id <> -1 THEN
......
data/ddl_columns_pos.php
+ 3
− 3
View file @ 0fe9f5a9
......@@ -1511,14 +1511,14 @@ return [
],
'TBL_VALIDATION_REFERENTIEL' => [
'ID',
'VOLUME_HORAIRE_REF_ID',
'AUTO_VALIDATION',
'VALIDATION_ID',
'ANNEE_ID',
'INTERVENANT_ID',
'STRUCTURE_ID',
'TYPE_VOLUME_HORAIRE_ID',
'SERVICE_REFERENTIEL_ID',
'VOLUME_HORAIRE_REF_ID',
'AUTO_VALIDATION',
'VALIDATION_ID',
],
'TBL_WORKFLOW' => [
'ID',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment