update bdd (f66ccc14) · Commits · open-source / OSE

data/ddl/package/FORMULE_GUYANE/body.sql

+10 −16

Changes for data/ddl/package/FORMULE_GUYANE/body.sql: 10 added lines, 16 removed lines.
Original line number	Diff line number	Diff line
		@@ -129,13 +129,6 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS



		FUNCTION autreEtablissement( v VARCHAR2 DEFAULT NULL ) RETURN BOOLEAN IS
		BEGIN
		RETURN COALESCE(LOWER(v),'non') = 'oui';
		END;



		FUNCTION calcCell( c VARCHAR2, l NUMERIC ) RETURN FLOAT IS
		vh ose_formule.t_volume_horaire;
		i ose_formule.t_intervenant;
		@@ -441,7 +434,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS

		-- AH=SI(ET($D20="Oui";$N20<>"Oui";$H20<>"Référentiel";$A20=i_structure_code);$M20($E20+$F20)$AE20;0)
		WHEN c = 'AH' AND v >= 1 THEN
		IF vh.service_statutaire AND NOT autreEtablissement(vh.param_1) AND vh.volume_horaire_ref_id IS NULL AND vh.structure_is_affectation THEN
		IF vh.service_statutaire AND vh.structure_code IS NOT NULL AND vh.volume_horaire_ref_id IS NULL AND vh.structure_is_affectation THEN
		RETURN vh.heures * (vh.taux_fi + vh.taux_fa) * cell('AE', l);
		ELSE
		RETURN 0;
		@@ -487,7 +480,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS

		-- AN=SI(ET($D20="Oui";$N20<>"Oui";$H20<>"Référentiel";$A20<>i_structure_code);$M20($E20+$F20)$AE20;0)
		WHEN c = 'AN' AND v >= 1 THEN
		IF vh.service_statutaire AND NOT autreEtablissement(vh.param_1) AND vh.volume_horaire_ref_id IS NULL AND NOT vh.structure_is_affectation THEN
		IF vh.service_statutaire AND vh.structure_code IS NOT NULL AND vh.volume_horaire_ref_id IS NULL AND NOT vh.structure_is_affectation THEN
		RETURN vh.heures * (vh.taux_fi + vh.taux_fa) * cell('AE', l);
		ELSE
		RETURN 0;
		@@ -533,7 +526,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS

		-- AT=SI(ET($D20="Oui";$N20<>"Oui";$H20<>"Référentiel";$A20=i_structure_code);$M20$G20$AE20;0)
		WHEN c = 'AT' AND v >= 1 THEN
		IF vh.service_statutaire AND NOT autreEtablissement(vh.param_1) AND vh.volume_horaire_ref_id IS NULL AND vh.structure_is_affectation THEN
		IF vh.service_statutaire AND vh.structure_code IS NOT NULL AND vh.volume_horaire_ref_id IS NULL AND vh.structure_is_affectation THEN
		RETURN vh.heures * vh.taux_fc * cell('AE',l);
		ELSE
		RETURN 0;
		@@ -579,7 +572,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS

		-- AZ=SI(ET($D20="Oui";$N20<>"Oui";$H20<>"Référentiel";$A20<>i_structure_code);$M20$G20$AE20;0)
		WHEN c = 'AZ' AND v >= 1 THEN
		IF vh.service_statutaire AND NOT autreEtablissement(vh.param_1) AND vh.volume_horaire_ref_id IS NULL AND NOT vh.structure_is_affectation THEN
		IF vh.service_statutaire AND vh.structure_code IS NOT NULL AND vh.volume_horaire_ref_id IS NULL AND NOT vh.structure_is_affectation THEN
		RETURN vh.heures * vh.taux_fc * cell('AE',l);
		ELSE
		RETURN 0;
		@@ -624,8 +617,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS


		-- BF=SI(ET($D20="Oui";$N20<>"Oui";$H20="Référentiel";$A20=i_structure_code);$M20*$AE20;0)
		-- pas de prise en compte de si on est extérieur ou non
		WHEN c = 'BF' AND v >= 1 THEN
		IF vh.service_statutaire AND NOT autreEtablissement(vh.param_1) AND vh.volume_horaire_ref_id IS NOT NULL AND vh.structure_is_affectation THEN
		IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NOT NULL AND vh.structure_is_affectation THEN
		RETURN vh.heures * cell('AE',l);
		ELSE
		RETURN 0;
		@@ -671,7 +665,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS

		-- BL=SI(ET($D20="Oui";$N20<>"Oui";$H20="Référentiel";$A20<>i_structure_code;$A20<>$K$10);$M20*$AE20;0)
		WHEN c = 'BL' AND v >= 1 THEN
		IF vh.service_statutaire AND NOT autreEtablissement(vh.param_1) AND vh.volume_horaire_ref_id IS NOT NULL AND NOT vh.structure_is_affectation AND NOT vh.structure_is_univ THEN
		IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NOT NULL AND NOT vh.structure_is_affectation AND NOT vh.structure_is_univ THEN
		RETURN vh.heures * cell('AE',l);
		ELSE
		RETURN 0;
		@@ -717,7 +711,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS

		-- BR=SI(ET($D20="Oui";$N20<>"Oui";$H20="Référentiel";$A20=$K$10);$M20*$AE20;0)
		WHEN c = 'BR' AND v >= 1 THEN
		IF vh.service_statutaire AND NOT autreEtablissement(vh.param_1) AND vh.volume_horaire_ref_id IS NOT NULL AND vh.structure_is_univ THEN
		IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NOT NULL AND vh.structure_is_univ THEN
		RETURN vh.heures * cell('AE',l);
		ELSE
		RETURN 0;
		@@ -763,7 +757,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS

		-- BX=SI(ET($D20="Oui";$N20="Oui");$M20*$AE20;0)
		WHEN c = 'BX' AND v >= 1 THEN
		IF vh.service_statutaire AND autreEtablissement(vh.param_1) THEN
		IF vh.service_statutaire AND vh.structure_code IS NULL THEN
		RETURN vh.heures * cell('AE',l);
		ELSE
		RETURN 0;
		@@ -857,7 +851,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_GUYANE AS
		RETURN '
		SELECT
		fvh.*,
		CASE WHEN s.element_pedagogique_id IS NULL THEN ''oui'' ELSE ''non'' END param_1,
		NULL param_1,
		NULL param_2,
		NULL param_3,
		NULL param_4,

data/ddl/package/UNICAEN_TBL/body.sql

+15 −15

Changes for data/ddl/package/UNICAEN_TBL/body.sql: 15 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		@@ -1896,21 +1896,6 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
		CASE WHEN p.heures > COALESCE(p.PLAFOND,ps.heures,pa.heures,0) + COALESCE(pd.heures, 0) + 0.05 THEN 1 ELSE 0 END depassement
		FROM
		(
		SELECT 5 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		fr.type_volume_horaire_id type_volume_horaire_id,
		fr.intervenant_id intervenant_id,
		fr.heures_compl_fi + fr.heures_compl_fc + fr.heures_compl_fa + fr.heures_compl_referentiel heures
		FROM
		intervenant i
		JOIN statut si ON si.id = i.statut_id
		JOIN etat_volume_horaire evh ON evh.code = ''saisi''
		JOIN formule_resultat fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id
		) p

		UNION ALL

		SELECT 1 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		@@ -1981,6 +1966,21 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
		JOIN formule_resultat fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id
		JOIN statut si ON si.id = i.statut_id
		) p

		UNION ALL

		SELECT 5 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		fr.type_volume_horaire_id type_volume_horaire_id,
		fr.intervenant_id intervenant_id,
		fr.heures_compl_fi + fr.heures_compl_fc + fr.heures_compl_fa + fr.heures_compl_referentiel heures
		FROM
		intervenant i
		JOIN statut si ON si.id = i.statut_id
		JOIN etat_volume_horaire evh ON evh.code = ''saisi''
		JOIN formule_resultat fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id
		) p
		) p
		JOIN intervenant i ON i.id = p.intervenant_id
		LEFT JOIN plafond_application pa ON pa.plafond_id = p.plafond_id AND p.annee_id = pa.annee_id

data/ddl/sequence.php

+71 −71

Changes for data/ddl/sequence.php: 71 added lines, 71 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,93 +5,36 @@
		return [
		'ADRESSE_INTERVENANT_ID_SEQ',
		'ADRESSE_STRUCTURE_ID_SEQ',
		'AFFECTATION_ID_SEQ',
		'AFFECTATION_RECHERCHE_ID_SEQ',
		'AGREMENT_ID_SEQ',
		'CAMPAGNE_SAISIE_ID_SEQ',
		'CATEGORIE_PRIVILEGE_ID_SEQ',
		'CC_ACTIVITE_ID_SEQ',
		'CENTRE_COUT_EP_ID_SEQ',
		'CENTRE_COUT_ID_SEQ',
		'CENTRE_COUT_STRUCTURE_ID_SEQ',
		'CHEMIN_PEDAGOGIQUE_ID_SEQ',
		'CIVILITE_ID_SEQ',
		'CONTRAT_FICHIER_ID_SEQ',
		'CONTRAT_ID_SEQ',
		'CORPS_ID_SEQ',
		'DEPARTEMENT_ID_SEQ',
		'DISCIPLINE_ID_SEQ',
		'DISCIPLINE_MAPPING_ID_SEQ',
		'DOMAINE_FONCTIONNEL_ID_SEQ',
		'DOSSIER_ID_SEQ',
		'DOTATION_ID_SEQ',
		'EFFECTIFS_ETAPE_ID_SEQ',
		'EFFECTIFS_ID_SEQ',
		'ELEMENT_MODULATEUR_ID_SEQ',
		'ELEMENT_PEDAGOGIQUE_ID_SEQ',
		'ELEMENT_TAUX_REGIMES_ID_SEQ',
		'EMPLOYEUR_ID_SEQ',
		'ETABLISSEMENT_ID_SEQ',
		'ETAPE_ID_SEQ',
		'ETAT_SORTIE_ID_SEQ',
		'FICHIER_ID_SEQ',
		'FONCTION_REFERENTIEL_ID_SEQ',
		'FORMULE_RESULTAT_ID_SEQ',
		'FORMULE_RESULTAT_SERREF_ID_SEQ',
		'FORMULE_RESULTAT_SERVIC_ID_SEQ',
		'FORMULE_RESULTAT_VH_ID_SEQ',
		'FORMULE_RESULTAT_VH_REF_ID_SEQ',
		'FTEST_INTERVENANT_ID_SEQ',
		'FTEST_STRUCTURE_ID_SEQ',
		'FTEST_VOLUME_HORAIRE_ID_SEQ',
		'GRADE_ID_SEQ',
		'GROUPE_ID_SEQ',
		'GROUPE_TYPE_FORMATION_ID_SEQ',
		'HISTO_INTERVENANT_SERVI_ID_SEQ',
		'INDICATEUR_ID_SEQ',
		'INDIC_MODIF_DOSSIER_ID_SEQ',
		'INTERVENANT_DOSSIER_ID_SEQ',
		'INTERVENANT_ID_SEQ',
		'INTERVENANT_PAR_DEFAUT_ID_SEQ',
		'INTERVENANT_SAISIE_ID_SEQ',
		'LIEN_ID_SEQ',
		'MISE_EN_PAIEMENT_ID_SEQ',
		'MODELE_CONTRAT_ID_SEQ',
		'MODIFICATION_SERVICE_DU_ID_SEQ',
		'MODULATEUR_ID_SEQ',
		'MOTIF_MODIFICATION_SERV_ID_SEQ',
		'MOTIF_NON_PAIEMENT_ID_SEQ',
		'NOEUD_ID_SEQ',
		'NOTE_ID_SEQ',
		'NOTIFICATION_INDICATEUR_ID_SEQ',
		'PARAMETRE_ID_SEQ',
		'PIECE_JOINTE_FICHIER_ID_SEQ',
		'PAYS_ID_SEQ',
		'PERIMETRE_ID_SEQ',
		'PERIODE_ID_SEQ',
		'PIECE_JOINTE_FICHIER_ID_SEQ',
		'PIECE_JOINTE_ID_SEQ',
		'PLAFOND_ID_SEQ',
		'PLAFOND_APPLICATION_ID_SEQ',
		'PLAFOND_DEROGATION_ID_SEQ',
		'PLAFOND_ETAT_ID_SEQ',
		'PLAFOND_ID_SEQ',
		'PLAFOND_REFERENTIEL_ID_SEQ',
		'PLAFOND_STATUT_ID_SEQ',
		'PLAFOND_STRUCTURE_ID_SEQ',
		'PRIVILEGE_ID_SEQ',
		'REGLE_STRUCTURE_VALIDAT_ID_SEQ',
		'ROLE_ID_SEQ',
		'ROLE_PRIVILEGE_ID_SEQ',
		'SCENARIO_ID_SEQ',
		'SCENARIO_LIEN_ID_SEQ',
		'SCENARIO_NOEUD_EFFECTIF_ID_SEQ',
		'SCENARIO_NOEUD_ID_SEQ',
		'SCENARIO_NOEUD_EFFECTIF_ID_SEQ',
		'SCENARIO_NOEUD_SEUIL_ID_SEQ',
		'SERVICE_ID_SEQ',
		'SERVICE_REFERENTIEL_ID_SEQ',
		'SEUIL_CHARGE_ID_SEQ',
		'SOURCE_ID_SEQ',
		'STATUT_ID_SEQ',
		'STATUT_INTERVENANT_MAPP_ID_SEQ',
		'STRUCTURE_ID_SEQ',
		'SYNC_LOG_ID_SEQ',
		'TAUX_HORAIRE_HETD_ID_SEQ',
		@@ -100,15 +43,13 @@ return [
		'TBL_CHARGENS_SEUILS_DEF_ID_SEQ',
		'TBL_CLOTURE_REALISE_ID_SEQ',
		'TBL_CONTRAT_ID_SEQ',
		'TBL_DEMS_ID_SEQ',
		'TBL_DMEP_LIQUIDATION_ID_SEQ',
		'TBL_DOSSIER_ID_SEQ',
		'TBL_LIEN_ID_SEQ',
		'TBL_NOEUD_ID_SEQ',
		'TBL_PAIEMENT_ID_SEQ',
		'TBL_PIECE_JOINTE_ID_SEQ',
		'TBL_PIECE_JOINTE_DEMAND_ID_SEQ',
		'TBL_PIECE_JOINTE_FOURNI_ID_SEQ',
		'TBL_PIECE_JOINTE_ID_SEQ',
		'TBL_PLAFOND_ELEMENT_ID_SEQ',
		'TBL_PLAFOND_INTERVENANT_ID_SEQ',
		'TBL_PLAFOND_REFERENTIEL_ID_SEQ',
		@@ -120,19 +61,17 @@ return [
		'TBL_VALIDATION_REFERENT_ID_SEQ',
		'TBL_WORKFLOW_ID_SEQ',
		'TEST_BUFFER_ID_SEQ',
		'TPJS_NUM_REGLE_SEQ',
		'TYPE_AGREMENT_ID_SEQ',
		'TYPE_CONTRAT_ID_SEQ',
		'TYPE_DOTATION_ID_SEQ',
		'TYPE_FORMATION_ID_SEQ',
		'TYPE_HEURES_ID_SEQ',
		'TYPE_INTERVENANT_ID_SEQ',
		'TYPE_INTERVENTION_EP_ID_SEQ',
		'TYPE_INTERVENTION_ID_SEQ',
		'TYPE_INTERVENTION_EP_ID_SEQ',
		'TYPE_INTERVENTION_STATU_ID_SEQ',
		'TYPE_INTERVENTION_STRUC_ID_SEQ',
		'TYPE_MODULATEUR_EP_ID_SEQ',
		'TYPE_MODULATEUR_ID_SEQ',
		'TYPE_MODULATEUR_EP_ID_SEQ',
		'TYPE_MODULATEUR_STRUCTU_ID_SEQ',
		'TYPE_NOTE_ID_SEQ',
		'TYPE_PIECE_JOINTE_ID_SEQ',
		@@ -141,16 +80,77 @@ return [
		'TYPE_VALIDATION_ID_SEQ',
		'UTILISATEUR_ID_SEQ',
		'VALIDATION_ID_SEQ',
		'VALIDATION_VOL_HORAIRE_ID_SEQ',
		'VALIDATION_VOL_HORAIRE__ID_SEQ',
		'VOIRIE_ID_SEQ',
		'VOLUME_HORAIRE_ID_SEQ',
		'VOLUME_HORAIRE_CHARGE_ID_SEQ',
		'VOLUME_HORAIRE_ENS_ID_SEQ',
		'VOLUME_HORAIRE_ID_SEQ',
		'VOLUME_HORAIRE_REF_ID_SEQ',
		'WF_DEP_BLOQUANTE_ID_SEQ',
		'WF_ETAPE_DEP_ID_SEQ',
		'WF_ETAPE_ID_SEQ',
		'WF_ETAPE_DEP_ID_SEQ',
		'AFFECTATION_ID_SEQ',
		'AFFECTATION_RECHERCHE_ID_SEQ',
		'AGREMENT_ID_SEQ',
		'CAMPAGNE_SAISIE_ID_SEQ',
		'CATEGORIE_PRIVILEGE_ID_SEQ',
		'CC_ACTIVITE_ID_SEQ',
		'CENTRE_COUT_ID_SEQ',
		'CENTRE_COUT_EP_ID_SEQ',
		'CENTRE_COUT_STRUCTURE_ID_SEQ',
		'CHEMIN_PEDAGOGIQUE_ID_SEQ',
		'CIVILITE_ID_SEQ',
		'CONTRAT_ID_SEQ',
		'CORPS_ID_SEQ',
		'DEPARTEMENT_ID_SEQ',
		'DISCIPLINE_ID_SEQ',
		'DOMAINE_FONCTIONNEL_ID_SEQ',
		'DOTATION_ID_SEQ',
		'EFFECTIFS_ID_SEQ',
		'EFFECTIFS_ETAPE_ID_SEQ',
		'ELEMENT_MODULATEUR_ID_SEQ',
		'ELEMENT_PEDAGOGIQUE_ID_SEQ',
		'ELEMENT_TAUX_REGIMES_ID_SEQ',
		'EMPLOYEUR_ID_SEQ',
		'ETABLISSEMENT_ID_SEQ',
		'ETAPE_ID_SEQ',
		'ETAT_SORTIE_ID_SEQ',
		'FICHIER_ID_SEQ',
		'FONCTION_REFERENTIEL_ID_SEQ',
		'FORMULE_RESULTAT_ID_SEQ',
		'FORMULE_RESULTAT_SERVIC_ID_SEQ',
		'FORMULE_RESULTAT_SERREF_ID_SEQ',
		'FORMULE_RESULTAT_VH_ID_SEQ',
		'FORMULE_RESULTAT_VH_REF_ID_SEQ',
		'FTEST_INTERVENANT_ID_SEQ',
		'FTEST_VOLUME_HORAIRE_ID_SEQ',
		'GRADE_ID_SEQ',
		'GROUPE_ID_SEQ',
		'GROUPE_TYPE_FORMATION_ID_SEQ',
		'HISTO_INTERVENANT_SERVI_ID_SEQ',
		'INDICATEUR_ID_SEQ',
		'INDIC_MODIF_DOSSIER_ID_SEQ',
		'INTERVENANT_ID_SEQ',
		'INTERVENANT_DOSSIER_ID_SEQ',
		'INTERVENANT_PAR_DEFAUT_ID_SEQ',
		'LIEN_ID_SEQ',
		'MISE_EN_PAIEMENT_ID_SEQ',
		'MODELE_CONTRAT_ID_SEQ',
		'MODIFICATION_SERVICE_DU_ID_SEQ',
		'MODULATEUR_ID_SEQ',
		'MOTIF_MODIFICATION_SERV_ID_SEQ',
		'MOTIF_NON_PAIEMENT_ID_SEQ',
		'TPJS_NUM_REGLE_SEQ',
		'NOEUD_ID_SEQ',
		'NOTE_ID_SEQ',
		'NOTIFICATION_INDICATEUR_ID_SEQ',
		'PARAMETRE_ID_SEQ',
		'ROLE_PRIVILEGE_ID_SEQ',
		'STATUT_INTERVENANT_MAPP_ID_SEQ',
		'TBL_DEMS_ID_SEQ',
		'TBL_NOEUD_ID_SEQ',
		'TYPE_DOTATION_ID_SEQ',
		'VALIDATION_VOL_HORAIRE_ID_SEQ',
		'VALIDATION_VOL_HORAIRE__ID_SEQ',
		];

		//@formatter:on

data/ddl/view/V_AGREMENT_EXPORT_CSV.sql

+2 −3

Changes for data/ddl/view/V_AGREMENT_EXPORT_CSV.sql: 2 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		CREATE
		OR REPLACE FORCE VIEW V_AGREMENT_EXPORT_CSV AS
		CREATE OR REPLACE FORCE VIEW V_AGREMENT_EXPORT_CSV AS
		WITH heures_s AS (
		SELECT
		i.id intervenant_id,
		@@ -82,4 +81,4 @@ FROM tbl_agrement ta
		AND fr.etat_volume_horaire_id = evh.id

		LEFT JOIN heures_s ON heures_s.intervenant_id = i.id
		AND heures_s.structure_id = s.id;
		No newline at end of file
		AND heures_s.structure_id = s.id
		No newline at end of file

data/ddl/view/V_IMPUTATION_BUDGETAIRE_SIHAM.sql

+1 −2

Changes for data/ddl/view/V_IMPUTATION_BUDGETAIRE_SIHAM.sql: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		CREATE
		OR REPLACE FORCE VIEW V_IMPUTATION_BUDGETAIRE_SIHAM AS
		CREATE OR REPLACE FORCE VIEW V_IMPUTATION_BUDGETAIRE_SIHAM AS
		SELECT 'P' type,
		NULL uo,
		intervenant_matricule matricule,