Mise en place des nouveaux indicateurs de plafonds, générés dynamiquement (d31aac02) · Commits · JACQUOT Frederic / OSE

code/test5.php

+5 −0

Changes for code/test5.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,3 +7,8 @@
		* @var $viewName string
		* @var $viewFile string
		*/

		$oseAdmin = oseAdmin();
		$dataGen = new DataGen($oseAdmin);
		var_dump($dataGen);
		//$dataGen->update('PRIVILEGE');
		No newline at end of file

data/ddl/package/UNICAEN_TBL/body.sql

+24 −24

Changes for data/ddl/package/UNICAEN_TBL/body.sql: 24 added lines, 24 removed lines.
Original line number	Diff line number	Diff line
		@@ -1896,6 +1896,21 @@ 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 2 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		fr.type_volume_horaire_id type_volume_horaire_id,
		i.id intervenant_id,
		fr.total - fr.heures_compl_fc_majorees heures
		FROM
		intervenant i
		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
		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,
		@@ -1911,35 +1926,35 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS

		UNION ALL

		SELECT 1 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT 4 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		fr.type_volume_horaire_id type_volume_horaire_id,
		i.id intervenant_id,
		fr.heures_compl_fc_majorees heures
		/* ROUND( (COALESCE(si.plafond_hc_remu_fc,0) - COALESCE(i.montant_indemnite_fc,0)) / a.taux_hetd, 2 ) plafond*/

		fr.total - fr.heures_compl_fc_majorees heures
		FROM
		intervenant i
		JOIN annee a ON a.id = i.annee_id
		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
		JOIN statut si ON si.id = i.statut_id
		) p

		UNION ALL

		SELECT 2 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT 1 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		fr.type_volume_horaire_id type_volume_horaire_id,
		i.id intervenant_id,
		fr.total - fr.heures_compl_fc_majorees heures
		fr.heures_compl_fc_majorees heures
		/* ROUND( (COALESCE(si.plafond_hc_remu_fc,0) - COALESCE(i.montant_indemnite_fc,0)) / a.taux_hetd, 2 ) plafond*/

		FROM
		intervenant i
		JOIN annee a ON a.id = i.annee_id
		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
		JOIN statut si ON si.id = i.statut_id
		) p

		UNION ALL
		@@ -1966,21 +1981,6 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
		i.id,
		i.statut_id
		) p

		UNION ALL

		SELECT 4 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		fr.type_volume_horaire_id type_volume_horaire_id,
		i.id intervenant_id,
		fr.total - fr.heures_compl_fc_majorees heures
		FROM
		intervenant i
		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
		JOIN statut si ON si.id = i.statut_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/view/V_INDICATEUR_P_ELEMENT.sql

0 → 100644

+19 −0

Changes for data/ddl/view/V_INDICATEUR_P_ELEMENT.sql: 19 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_INDICATEUR_P_ELEMENT AS
		SELECT
		p.numero100 + tp.type_volume_horaire_id 10 numero,
		tp.intervenant_id,
		ep.structure_id structure_id,
		pe.libelle etat,
		ep.libelle element,
		tp.heures,
		tp.plafond,
		tp.derogation
		FROM
		tbl_plafond_element tp
		JOIN plafond p ON p.id = tp.plafond_id
		JOIN plafond_etat pe ON pe.id = tp.plafond_etat_id
		JOIN intervenant i ON i.id = tp.intervenant_id
		JOIN element_pedagogique ep ON ep.id = tp.element_pedagogique_id
		WHERE
		pe.code <> 'desactive'
		AND tp.depassement = 1
		No newline at end of file

data/ddl/view/V_INDICATEUR_P_INTERVENANT.sql

0 → 100644

+17 −0

Changes for data/ddl/view/V_INDICATEUR_P_INTERVENANT.sql: 17 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_INDICATEUR_P_INTERVENANT AS
		SELECT
		p.numero100 + tp.type_volume_horaire_id 10 numero,
		tp.intervenant_id,
		i.structure_id structure_id,
		pe.libelle etat,
		tp.heures,
		tp.plafond,
		tp.derogation
		FROM
		tbl_plafond_intervenant tp
		JOIN plafond p ON p.id = tp.plafond_id
		JOIN plafond_etat pe ON pe.id = tp.plafond_etat_id
		JOIN intervenant i ON i.id = tp.intervenant_id
		WHERE
		pe.code <> 'desactive'
		AND tp.depassement = 1
		No newline at end of file

data/ddl/view/V_INDICATEUR_P_REFERENTIEL.sql

0 → 100644

+20 −0

Changes for data/ddl/view/V_INDICATEUR_P_REFERENTIEL.sql: 20 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_INDICATEUR_P_REFERENTIEL AS
		SELECT
		p.numero100 + tp.type_volume_horaire_id 10 numero,
		tp.intervenant_id,
		COALESCE(srs.structure_id, i.structure_id) structure_id,
		pe.libelle etat,
		fr.libelle_court fonction,
		tp.heures,
		tp.plafond,
		tp.derogation
		FROM
		tbl_plafond_referentiel tp
		JOIN plafond p ON p.id = tp.plafond_id
		JOIN plafond_etat pe ON pe.id = tp.plafond_etat_id
		JOIN intervenant i ON i.id = tp.intervenant_id
		JOIN fonction_referentiel fr ON fr.id = tp.fonction_referentiel_id
		LEFT JOIN (SELECT DISTINCT intervenant_id, fonction_id, structure_id FROM service_referentiel) srs ON srs.intervenant_id = tp.intervenant_id AND srs.fonction_id = tp.fonction_referentiel_id
		WHERE
		pe.code <> 'desactive'
		AND tp.depassement = 1
		No newline at end of file