Merge branch 'master' of https://git.unicaen.fr/open-source/OSE (a117e102) · Commits · open-source / OSE

CHANGELOG.md

+15 −2

Changes for CHANGELOG.md: 15 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		# Version stable

		[OSE 19.0](#ose-19-12072022)
		[OSE 19.0](#ose-190-12072022)


		# OSE 20 (à venir)
		@@ -11,9 +11,22 @@



		# OSE 19.1 (à venir)

		## nouveautés

		# OSE 19 (12/07/2022)
		* Formule de calcul de Picardie
		* Nouvel état de sortie pour les écarts des heures complémentaires, maintenant personnalisable (#45807)
		* Possibilité de faire une PEC ou REN (SIHAM) l'année universitaire N-1
		* Nouvel état de sortie pour télécharger une synthèse des privliges par rôle (#45629)

		## Corrections de bugs

		* La synchronisation via la ligne de commande ne fonctionnait plus. C'est rétabli



		# OSE 19.0 (12/07/2022)

		## Nouveautés

data/ddl/table/STATUT.php

+18 −6

Changes for data/ddl/table/STATUT.php: 18 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -938,12 +938,24 @@ return [
		'type' => 'float',
		'bdd-type' => 'FLOAT',
		'length' => 0,
		'scale' => NULL,
		'scale' => null,
		'precision' => 126,
		'nullable' => FALSE,
		'nullable' => false,
		'default' => '1',
		'position' => 10,
		'commentaire' => NULL,
		'commentaire' => null,
		],
		'TAUX_CHARGES_TTC' => [
		'name' => 'TAUX_CHARGES_TTC',
		'type' => 'float',
		'bdd-type' => 'FLOAT',
		'length' => 0,
		'scale' => null,
		'precision' => 126,
		'nullable' => false,
		'default' => '1',
		'position' => 80,
		'commentaire' => null,
		],
		'TYPE_INTERVENANT_ID' => [
		'name' => 'TYPE_INTERVENANT_ID',
		@@ -951,9 +963,9 @@ return [
		'bdd-type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => NULL,
		'nullable' => FALSE,
		'default' => NULL,
		'precision' => null,
		'nullable' => false,
		'default' => null,
		'position' => 4,
		'commentaire' => NULL,
		],

data/ddl/view/V_EXPORT_PILOTAGE_ECARTS_ETATS.sql

+39 −72

Changes for data/ddl/view/V_EXPORT_PILOTAGE_ECARTS_ETATS.sql: 39 added lines, 72 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_EXPORT_PILOTAGE_ECARTS_ETATS AS
		SELECT
		t3.annee_id annee_id,
		CREATE
		OR REPLACE FORCE VIEW V_EXPORT_PILOTAGE_ECARTS_ETATS AS
		SELECT t3.annee_id annee_id,
		t3.annee_id \|\| '-' \|\| (t3.annee_id + 1) annee,
		t3.etat,
		t3.type_heures_id,
		@@ -10,22 +10,17 @@ SELECT
		i.id intervenant_id,
		ti.libelle intervenant_type,
		i.source_code intervenant_code,
		i.prenom \|\| ' ' \|\| i.nom_usuel intervenant,
		i.prenom prenom,
		i.nom_usuel nom_usuel,
		t3.hetd_payables
		FROM

		(
		SELECT
		annee_id,
		FROM (SELECT annee_id,
		etat,
		type_heures_id,
		type_heures,
		structure_id,
		intervenant_id,
		sum(hetd) hetd_payables
		FROM (
		SELECT
		annee_id,
		SUM(hetd) hetd_payables
		FROM (SELECT annee_id,
		LOWER(tvh.code) \|\| '-' \|\| evh.code etat,
		10 * tvh.ordre + evh.ordre ordre,
		type_heures_id,
		@@ -33,9 +28,7 @@ FROM (
		structure_id,
		intervenant_id,
		SUM(hetd) hetd
		FROM (
		SELECT
		i.annee_id,
		FROM (SELECT i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id type_heures_id,
		@@ -43,15 +36,13 @@ FROM (
		COALESCE(ep.structure_id, i.structure_id) structure_id,
		fr.intervenant_id,
		SUM(frs.heures_compl_fi) hetd
		FROM
		formule_resultat_service frs
		FROM formule_resultat_service frs
		JOIN formule_resultat fr ON fr.id = frs.formule_resultat_id
		JOIN service s ON s.id = frs.service_id
		JOIN intervenant i ON i.id = fr.intervenant_id
		JOIN type_heures th ON th.code = 'fi'
		LEFT JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id
		GROUP BY
		i.annee_id,
		GROUP BY i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id, th.code,
		@@ -61,8 +52,7 @@ FROM (

		UNION ALL

		SELECT
		i.annee_id,
		SELECT i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id type_heures_id,
		@@ -70,15 +60,13 @@ FROM (
		COALESCE(ep.structure_id, i.structure_id) structure_id,
		fr.intervenant_id,
		SUM(frs.heures_compl_fa) hetd
		FROM
		formule_resultat_service frs
		FROM formule_resultat_service frs
		JOIN formule_resultat fr ON fr.id = frs.formule_resultat_id
		JOIN service s ON s.id = frs.service_id
		JOIN intervenant i ON i.id = fr.intervenant_id
		JOIN type_heures th ON th.code = 'fa'
		LEFT JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id
		GROUP BY
		i.annee_id,
		GROUP BY i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id, th.code,
		@@ -88,8 +76,7 @@ FROM (

		UNION ALL

		SELECT
		i.annee_id,
		SELECT i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id type_heures_id,
		@@ -97,15 +84,13 @@ FROM (
		COALESCE(ep.structure_id, i.structure_id) structure_id,
		fr.intervenant_id,
		SUM(frs.heures_compl_fc) hetd
		FROM
		formule_resultat_service frs
		FROM formule_resultat_service frs
		JOIN formule_resultat fr ON fr.id = frs.formule_resultat_id
		JOIN service s ON s.id = frs.service_id
		JOIN intervenant i ON i.id = fr.intervenant_id
		JOIN type_heures th ON th.code = 'fc'
		LEFT JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id
		GROUP BY
		i.annee_id,
		GROUP BY i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id, th.code,
		@@ -115,38 +100,33 @@ FROM (

		UNION ALL

		SELECT
		i.annee_id,
		SELECT i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id type_heures_id,
		th.code type_heures,
		sr.structure_id,
		fr.intervenant_id,
		sum( frsr.heures_compl_referentiel ) hetd
		FROM
		formule_resultat_service_ref frsr
		SUM(frsr.heures_compl_referentiel) hetd
		FROM formule_resultat_service_ref frsr
		JOIN formule_resultat fr ON fr.id = frsr.formule_resultat_id
		JOIN service_referentiel sr ON sr.id = frsr.service_referentiel_id
		JOIN intervenant i ON i.id = fr.intervenant_id
		JOIN type_heures th ON th.code = 'referentiel'
		GROUP BY
		i.annee_id,
		GROUP BY i.annee_id,
		fr.type_volume_horaire_id,
		fr.etat_volume_horaire_id,
		th.id, th.code,
		fr.intervenant_id,
		sr.structure_id
		) t1
		sr.structure_id) t1
		JOIN type_volume_horaire tvh ON tvh.id = t1.type_volume_horaire_id
		JOIN etat_volume_horaire evh ON evh.id = t1.etat_volume_horaire_id
		GROUP BY
		annee_id, tvh.code, evh.code, tvh.ordre, evh.ordre, type_heures_id, type_heures, structure_id, intervenant_id
		GROUP BY annee_id, tvh.code, evh.code, tvh.ordre, evh.ordre, type_heures_id, type_heures, structure_id,
		intervenant_id

		UNION ALL

		SELECT
		annee_id,
		SELECT annee_id,
		etat,
		ordre,
		type_heures_id,
		@@ -154,9 +134,7 @@ FROM (
		structure_id,
		intervenant_id,
		SUM(hetd) hetd
		FROM (
		SELECT
		i.annee_id,
		FROM (SELECT i.annee_id,
		'demande-mise-en-paiement' etat,
		90 ordre,
		th.id type_heures_id,
		@@ -164,25 +142,23 @@ FROM (
		COALESCE(sr.structure_id, ep.structure_id, i.structure_id) structure_id,
		i.id intervenant_id,
		mep.heures hetd
		FROM
		mise_en_paiement mep
		FROM mise_en_paiement mep
		JOIN type_heures th ON th.id = mep.type_heures_id
		JOIN centre_cout cc ON cc.id = mep.centre_cout_id
		LEFT JOIN formule_resultat_service frs ON frs.id = mep.formule_res_service_id
		LEFT JOIN formule_resultat_service_ref frsr ON frsr.id = mep.formule_res_service_ref_id
		LEFT JOIN formule_resultat fr ON fr.id = COALESCE(frs.formule_resultat_id, frsr.formule_resultat_id)
		LEFT JOIN formule_resultat fr
		ON fr.id = COALESCE(frs.formule_resultat_id, frsr.formule_resultat_id)
		LEFT JOIN service s ON s.id = frs.service_id
		LEFT JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id
		LEFT JOIN service_referentiel sr ON sr.id = frsr.service_referentiel_id
		LEFT JOIN intervenant i ON i.id = fr.intervenant_id
		WHERE
		mep.histo_destruction IS NULL
		WHERE mep.histo_destruction IS NULL
		AND th.eligible_extraction_paie = 1

		UNION ALL

		SELECT
		i.annee_id,
		SELECT i.annee_id,
		'mise-en-paiement' etat,
		91 ordre,
		th.id type_heures_id,
		@@ -190,35 +166,26 @@ FROM (
		COALESCE(sr.structure_id, ep.structure_id, i.structure_id) structure_id,
		i.id intervenant_id,
		mep.heures hetd
		FROM
		mise_en_paiement mep
		FROM mise_en_paiement mep
		JOIN type_heures th ON th.id = mep.type_heures_id
		JOIN centre_cout cc ON cc.id = mep.centre_cout_id
		LEFT JOIN formule_resultat_service frs ON frs.id = mep.formule_res_service_id
		LEFT JOIN formule_resultat_service_ref frsr ON frsr.id = mep.formule_res_service_ref_id
		LEFT JOIN formule_resultat fr ON fr.id = COALESCE(frs.formule_resultat_id, frsr.formule_resultat_id)
		LEFT JOIN formule_resultat fr
		ON fr.id = COALESCE(frs.formule_resultat_id, frsr.formule_resultat_id)
		LEFT JOIN service s ON s.id = frs.service_id
		LEFT JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id
		LEFT JOIN service_referentiel sr ON sr.id = frsr.service_referentiel_id
		LEFT JOIN intervenant i ON i.id = fr.intervenant_id
		WHERE
		mep.histo_destruction IS NULL
		WHERE mep.histo_destruction IS NULL
		AND th.eligible_extraction_paie = 1
		AND mep.PERIODE_PAIEMENT_ID IS NOT NULL
		) t1
		GROUP BY
		annee_id, etat, ordre, type_heures_id, type_heures, structure_id, intervenant_id
		) t2
		GROUP BY
		annee_id,
		etat, ordre
		AND mep.periode_paiement_id IS NOT NULL) t1
		GROUP BY annee_id, etat, ordre, type_heures_id, type_heures, structure_id, intervenant_id) t2
		GROUP BY annee_id, etat, ordre
		, type_heures_id, type_heures
		, structure_id
		, intervenant_id
		ORDER BY
		annee_id, ordre

		) t3
		ORDER BY annee_id, ordre) t3
		JOIN intervenant i ON i.id = t3.intervenant_id
		JOIN statut si ON si.id = i.statut_id
		JOIN type_intervenant ti ON ti.id = si.type_intervenant_id

data/ddl/view/V_INDICATEUR_490.sql

+6 −8

Changes for data/ddl/view/V_INDICATEUR_490.sql: 6 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_INDICATEUR_490 AS
		SELECT
		i.id intervenant_id,
		CREATE
		OR REPLACE FORCE VIEW V_INDICATEUR_490 AS
		SELECT i.id intervenant_id,
		i.structure_id structure_id
		FROM
		intervenant i
		FROM intervenant i
		JOIN statut si ON si.id = i.statut_id
		JOIN type_intervenant ti ON ti.id = si.type_intervenant_id
		JOIN parametre p ON p.nom = 'export_rh_franchissement'
		JOIN tbl_workflow tw ON tw.intervenant_id = i.id AND tw.etape_id = p.valeur
		JOIN parametre p2 ON p2.nom = 'annee'
		WHERE
		i.export_date IS NULL
		WHERE i.export_date IS NULL
		AND ti.code = 'E'
		AND si.code != 'BIATSS'
		AND p2.valeur = i.annee_id
		AND (p2.valeur = i.annee_id OR i.annee_id = p2.valeur - 1)
		AND (COALESCE(i.affectation_fin, to_date('01/01/9999', 'dd/mm/YYYY')) < sysdate OR i.affectation_fin IS NULL )
		AND tw.realisation = tw.objectif
		AND tw.objectif > 0
		No newline at end of file

data/etats_sortie.php

+69 −0

Changes for data/etats_sortie.php: 69 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -70,6 +70,57 @@ return [
		"CODE_ORIGINE": {
		"libelle": "Code origine"
		}
		}',
		],
		[
		'CODE' => 'ecarts-heures-complementaire',
		'LIBELLE' => 'Ecarts heures complémentaires',
		'PDF_TRAITEMENT' => null,
		'AUTO_BREAK' => false,
		'REQUETE' => 'SELECT * FROM v_export_pilotage_ecarts_etats',
		'CSV_PARAMS' => '{
		"INTERVENANT_TYPE_ID": {
		"visible": false
		},
		"STRUCTURE_ID": {
		"visible": false
		},
		"TYPE_HEURES_ID": {
		"visible": false
		},
		"INTERVENANT_ID": {
		"visible": false
		},
		"ANNEE_ID": {
		"visible": false
		},
		"ANNEE": {
		"libelle": "Année"
		},
		"ETAT": {
		"libelle": "Etat"
		},
		"TYPE_HEURES": {
		"libelle": "Type heures"
		},
		"STRUCTURE": {
		"libelle": "Structure"
		},
		"INTERVENANT_TYPE": {
		"libelle": "Type intervenant"
		},
		"INTERVENANT_CODE": {
		"libelle": "Code intervenant"
		},
		"NOM_USUEL": {
		"libelle": "Nom"
		},
		"PRENOM": {
		"libelle": "Prénom"
		},
		"HETD_PAYABLES": {
		"libelle": "HETD payables"
		}
		}',
		],
		[
		@@ -257,4 +308,22 @@ ORDER BY
		"NUMGRP" : { "libelle": "NUMGRP" }
		}',
		],
		[
		'CODE' => 'synthese-privilege',
		'LIBELLE' => 'Synthèse des privilèges par rôle',
		'PDF_TRAITEMENT' => null,
		'AUTO_BREAK' => false,
		'REQUETE' => 'SELECT
		r.libelle role,
		cp.libelle categorie_privilege,
		p.libelle privilege,
		CASE WHEN rp.privilege_id IS NULL THEN \'Non\' ELSE \'Oui\' END acces
		FROM
		role r
		JOIN privilege p ON 1=1
		JOIN categorie_privilege cp ON cp.id = p.categorie_id
		LEFT JOIN role_privilege rp ON rp.privilege_id = p.id AND rp.role_id = r.id
		ORDER BY r.libelle, cp.libelle, p.libelle',
		'CSV_PARAMS' => '',
		],
		];