Infra plafond quasi prête (fe15ba19) · Commits · open-source / OSE

admin/src/DataGen.php

+1 −0

Changes for admin/src/DataGen.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -613,6 +613,7 @@ class DataGen
		$plafond = [
		'NUMERO' => $numero,
		'LIBELLE' => $p['libelle'],
		'MESSAGE' => $p['message'] ?? null,
		'PLAFOND_PERIMETRE_ID' => $perimetreId,
		'REQUETE' => $p['requete'],
		];

data/ddl/package/UNICAEN_TBL/body.sql

+27 −6

Changes for data/ddl/package/UNICAEN_TBL/body.sql: 27 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -2072,7 +2072,7 @@ 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 3 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT 6 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vhr.type_volume_horaire_id type_volume_horaire_id,
		@@ -2082,15 +2082,18 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
		FROM
		service_referentiel sr
		JOIN intervenant i ON i.id = sr.intervenant_id
		JOIN fonction_referentiel fr ON fr.id = sr.fonction_id
		JOIN fonction_referentiel frf ON frf.id = sr.fonction_id
		JOIN fonction_referentiel fr ON fr.id = frf.parent_id
		JOIN volume_horaire_ref vhr ON vhr.service_referentiel_id = sr.id AND vhr.histo_destruction IS NULL
		WHERE
		sr.histo_destruction IS NULL
		GROUP BY
		i.annee_id, vhr.type_volume_horaire_id, i.id, fr.id
		) p

		UNION ALL

		SELECT 3 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vhr.type_volume_horaire_id type_volume_horaire_id,
		@@ -2100,18 +2103,15 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
		FROM
		service_referentiel sr
		JOIN intervenant i ON i.id = sr.intervenant_id
		JOIN fonction_referentiel frf ON frf.id = sr.fonction_id
		JOIN fonction_referentiel fr ON fr.id = frf.parent_id
		JOIN fonction_referentiel fr ON fr.id = sr.fonction_id
		JOIN volume_horaire_ref vhr ON vhr.service_referentiel_id = sr.id AND vhr.histo_destruction IS NULL
		WHERE
		sr.histo_destruction IS NULL
		GROUP BY
		i.annee_id, vhr.type_volume_horaire_id, i.id, fr.id
		) p

		UNION ALL

		SELECT 6 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vhr.type_volume_horaire_id type_volume_horaire_id,
		@@ -2242,6 +2242,27 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
		GROUP BY
		i.annee_id, vhr.type_volume_horaire_id, i.id, s.id
		) p

		UNION ALL

		SELECT 25 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vh.type_volume_horaire_id type_volume_horaire_id,
		i.id intervenant_id,
		str.id structure_id,
		SUM(vh.heures) heures
		FROM
		service s
		JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id
		JOIN intervenant i ON i.id = s.intervenant_id
		JOIN structure str ON str.id = ep.structure_id
		JOIN volume_horaire vh ON vh.service_id = s.id AND vh.histo_destruction IS NULL
		WHERE
		s.histo_destruction IS NULL
		GROUP BY
		i.annee_id, vh.type_volume_horaire_id, i.id, str.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/table/PLAFOND.php

+16 −4

Changes for data/ddl/table/PLAFOND.php: 16 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -33,6 +33,18 @@ return [
		'position' => 2,
		'commentaire' => NULL,
		],
		'MESSAGE' => [
		'name' => 'MESSAGE',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 500,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 4,
		'commentaire' => NULL,
		],
		'NUMERO' => [
		'name' => 'NUMERO',
		'type' => 'int',
		@@ -42,7 +54,7 @@ return [
		'precision' => NULL,
		'nullable' => FALSE,
		'default' => NULL,
		'position' => 5,
		'position' => 6,
		'commentaire' => NULL,
		],
		'PLAFOND_PERIMETRE_ID' => [
		@@ -52,7 +64,7 @@ return [
		'length' => 0,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'nullable' => FALSE,
		'default' => NULL,
		'position' => 3,
		'commentaire' => NULL,
		@@ -64,9 +76,9 @@ return [
		'length' => 4000,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'nullable' => FALSE,
		'default' => NULL,
		'position' => 4,
		'position' => 5,
		'commentaire' => NULL,
		],
		],

data/ddl/view/V_TBL_PLAFOND_REFERENTIEL.sql

+6 −6

Changes for data/ddl/view/V_TBL_PLAFOND_REFERENTIEL.sql: 6 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ SELECT
		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 3 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT 6 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vhr.type_volume_horaire_id type_volume_horaire_id,
		@@ -25,15 +25,18 @@ FROM
		FROM
		service_referentiel sr
		JOIN intervenant i ON i.id = sr.intervenant_id
		JOIN fonction_referentiel fr ON fr.id = sr.fonction_id
		JOIN fonction_referentiel frf ON frf.id = sr.fonction_id
		JOIN fonction_referentiel fr ON fr.id = frf.parent_id
		JOIN volume_horaire_ref vhr ON vhr.service_referentiel_id = sr.id AND vhr.histo_destruction IS NULL
		WHERE
		sr.histo_destruction IS NULL
		GROUP BY
		i.annee_id, vhr.type_volume_horaire_id, i.id, fr.id
		) p

		UNION ALL

		SELECT 3 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vhr.type_volume_horaire_id type_volume_horaire_id,
		@@ -43,18 +46,15 @@ FROM
		FROM
		service_referentiel sr
		JOIN intervenant i ON i.id = sr.intervenant_id
		JOIN fonction_referentiel frf ON frf.id = sr.fonction_id
		JOIN fonction_referentiel fr ON fr.id = frf.parent_id
		JOIN fonction_referentiel fr ON fr.id = sr.fonction_id
		JOIN volume_horaire_ref vhr ON vhr.service_referentiel_id = sr.id AND vhr.histo_destruction IS NULL
		WHERE
		sr.histo_destruction IS NULL
		GROUP BY
		i.annee_id, vhr.type_volume_horaire_id, i.id, fr.id
		) p

		UNION ALL

		SELECT 6 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vhr.type_volume_horaire_id type_volume_horaire_id,

data/ddl/view/V_TBL_PLAFOND_STRUCTURE.sql

+21 −0

Changes for data/ddl/view/V_TBL_PLAFOND_STRUCTURE.sql: 21 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -32,6 +32,27 @@ FROM
		GROUP BY
		i.annee_id, vhr.type_volume_horaire_id, i.id, s.id
		) p

		UNION ALL

		SELECT 25 PLAFOND_ID, NULL PLAFOND, p.* FROM (
		SELECT
		i.annee_id annee_id,
		vh.type_volume_horaire_id type_volume_horaire_id,
		i.id intervenant_id,
		str.id structure_id,
		SUM(vh.heures) heures
		FROM
		service s
		JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id
		JOIN intervenant i ON i.id = s.intervenant_id
		JOIN structure str ON str.id = ep.structure_id
		JOIN volume_horaire vh ON vh.service_id = s.id AND vh.histo_destruction IS NULL
		WHERE
		s.histo_destruction IS NULL
		GROUP BY
		i.annee_id, vh.type_volume_horaire_id, i.id, str.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