Loading admin/actions/test.php +5 −0 Changes for admin/actions/test.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line <?php // Mise à jour $oa->getBdd()->dataUpdater()->run('install', 'TAUX_REMU'); $oa->getBdd()->dataUpdater()->run('install', 'TAUX_REMU_VALEUR'); $oa->getBdd()->dataUpdater()->run('install', 'TYPE_MISSION'); admin/src/DataSource.php +37 −7 Changes for admin/src/DataSource.php: 37 added lines, 7 removed lines. Original line number Diff line number Diff line <?php class DataSource { private OseAdmin $oseAdmin; Loading Loading @@ -269,7 +266,7 @@ class DataSource public function TAUX_REMU() public function TAUX_REMU(string $action) { $data = require $this->oseAdmin->getOseDir() . 'data/taux_remu.php'; Loading @@ -279,17 +276,21 @@ class DataSource $taux = [ 'CODE' => $code, 'LIBELLE' => $taux['libelle'], 'TAUX_REMU_ID' => $taux['parent'] ?? null, ]; if (!($action === 'update' && !in_array($code, ['TLD', 'SMIC']))) { $tauxRemu[] = $taux; } } return $tauxRemu; } public function TAUX_REMU_VALEUR() public function TAUX_REMU_VALEUR(string $action) { $data = require $this->oseAdmin->getOseDir() . 'data/taux_remu.php'; Loading @@ -297,20 +298,49 @@ class DataSource foreach ($data as $code => $taux) { foreach ($taux['valeurs'] as $dateEffet => $valeur) { $dateEffet = \DateTime::createFromFormat('d/m/Y', $dateEffet); $dateEffet->setTime(0, 0, 0); $tauxValeur = [ 'TAUX_REMU_ID' => $code, 'DATE_EFFET' => \DateTime::createFromFormat('d/m/Y', $dateEffet), 'DATE_EFFET' => $dateEffet, 'VALEUR' => $valeur, ]; if (!($action === 'update' && !in_array($code, ['TLD', 'SMIC']))) { $tauxValeurs[] = $tauxValeur; } } } return $tauxValeurs; } public function TYPE_MISSION() { $data = require $this->oseAdmin->getOseDir() . 'data/type_mission.php'; $tms = []; for ($a = 2010; $a <= 2099; $a++) { foreach ($data as $code => $tm) { $tms[] = [ 'CODE' => $code, 'LIBELLE' => $tm['libelle'], 'TAUX_REMU_ID' => $tm['taux-remu'] ?? null, 'TAUX_REMU_MAJORE_ID' => $tm['taux-remu-majore'] ?? null, 'ACCOMPAGNEMENT_ETUDIANTS' => (bool)$tm['accompagnement-etudiants'], 'ANNEE_ID' => $a, 'HISTO_MODIFICATEUR_ID' => null, ]; } } return $tms; } public function TYPE_INDICATEUR() { $data = require $this->oseAdmin->getOseDir() . 'data/indicateurs.php'; Loading data/data_updater_config.php +42 −21 Changes for data/data_updater_config.php: 42 added lines, 21 removed lines. Original line number Diff line number Diff line Loading @@ -103,9 +103,6 @@ return [ 'key' => 'CODE', 'options' => ['delete' => false], ], 'TAUX_HORAIRE_HETD' => [ 'actions' => ['install', 'update'], ], 'TYPE_RESSOURCE' => [ 'actions' => ['install'], 'key' => 'CODE', Loading Loading @@ -152,6 +149,48 @@ return [ 'actions' => ['install'], 'key' => 'CODE', ], 'TAUX_REMU' => [ 'actions' => ['install', 'update'], 'options' => [ 'update' => true, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], ], ], 'key' => 'CODE', ], 'TAUX_REMU_VALEUR' => [ 'actions' => ['install', 'update'], 'options' => [ 'update' => true, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], ], ], 'key' => ['TAUX_REMU_ID', 'DATE_EFFET'], ], 'TYPE_MISSION' => [ 'actions' => ['install'], 'key' => ['CODE','ANNEE_ID'], 'options' => [ 'update' => false, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], 'TAUX_REMU_MAJORE_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], ], ], ], 'SCENARIO' => [ 'actions' => ['install'], 'key' => 'LIBELLE', Loading Loading @@ -240,24 +279,6 @@ return [ 'key' => ['CODE', 'ANNEE_ID'], 'options' => ['columns' => ['TYPE_INTERVENANT_ID' => ['transformer' => 'SELECT id FROM type_intervenant WHERE code = %s']]], ], 'TAUX_REMU' => [ 'actions' => ['install', 'update'], 'options' => ['update' => true, 'delete' => false], 'key' => 'CODE', ], 'TAUX_REMU_VALEUR' => [ 'actions' => ['install', 'update'], 'options' => [ 'update' => true, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE code = %s', ], ], ], 'key' => ['TAUX_REMU_ID', 'DATE_EFFET'], ], 'TYPE_PIECE_JOINTE' => [ 'actions' => ['install'], 'key' => 'CODE', Loading data/taux_remu.php +41 −1 Changes for data/taux_remu.php: 41 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ return [ 'TLD' => [ 'libelle' => 'Taux légal par défaut', 'libelle' => 'Taux légal HETD', 'valeurs' => [ '27/07/2009' => 40.58, '25/06/2014' => 40.91, Loading @@ -10,4 +10,44 @@ return [ '01/07/2022' => 42.86, ], ], 'SMIC' => [ 'libelle' => 'Smic (salaire minimum de croissance)', 'valeurs' => [ '01/01/2014' => 9.53, '01/01/2015' => 9.61, '01/01/2016' => 9.67, '01/01/2017' => 9.76, '01/01/2018' => 9.88, '01/01/2019' => 10.03, '01/01/2020' => 10.15, '01/01/2021' => 10.25, '01/10/2021' => 10.48, '01/01/2022' => 10.57, '01/05/2022' => 10.85, '01/08/2022' => 11.07, '01/01/2023' => 11.27, '01/05/2023' => 11.52, ], ], 'TAUX_1' => [ 'parent' => 'SMIC', 'libelle' => 'Taux 1 (SMIC horaire)', 'valeurs' => [ '01/01/2014' => 1, ], ], 'TAUX_2' => [ 'parent' => 'SMIC', 'libelle' => 'Taux 2 (SMIC horaire x2)', 'valeurs' => [ '01/01/2014' => 2, ], ], 'TAUX_3' => [ 'parent' => 'SMIC', 'libelle' => 'Taux 3 (SMIC horaire x2,5)', 'valeurs' => [ '01/01/2014' => 2.5, ], ], ]; No newline at end of file data/type_mission.php 0 → 100644 +52 −0 Changes for data/type_mission.php: 52 added lines, 0 removed lines. Original line number Diff line number Diff line <?php return [ 'ACCUEIL_ETU' => [ 'libelle' => 'Accueil des étudiants', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'ACCOMP_HANDI' => [ 'libelle' => 'Assistance et accompagnement d’étudiants handicapés', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => true, ], 'TUTORAT' => [ 'libelle' => 'Tutorat', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'SOUTIEN_TIC' => [ 'libelle' => 'Soutien informatique et aide à l’utilisation des nouvelles technologies', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'APPUI_BIBLIO' => [ 'libelle' => 'Service d’appui aux personnels des bibliothèques', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'ANIM_CSSS' => [ 'libelle' => 'Animations culturelles, scientifiques, sportives et sociales', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'AIDE_INS_PRO' => [ 'libelle' => 'Aide à l’insertion professionnelle', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'PROMO_ODF' => [ 'libelle' => 'Promotion de l’offre de formation', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], ]; No newline at end of file Loading
admin/actions/test.php +5 −0 Changes for admin/actions/test.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line <?php // Mise à jour $oa->getBdd()->dataUpdater()->run('install', 'TAUX_REMU'); $oa->getBdd()->dataUpdater()->run('install', 'TAUX_REMU_VALEUR'); $oa->getBdd()->dataUpdater()->run('install', 'TYPE_MISSION');
admin/src/DataSource.php +37 −7 Changes for admin/src/DataSource.php: 37 added lines, 7 removed lines. Original line number Diff line number Diff line <?php class DataSource { private OseAdmin $oseAdmin; Loading Loading @@ -269,7 +266,7 @@ class DataSource public function TAUX_REMU() public function TAUX_REMU(string $action) { $data = require $this->oseAdmin->getOseDir() . 'data/taux_remu.php'; Loading @@ -279,17 +276,21 @@ class DataSource $taux = [ 'CODE' => $code, 'LIBELLE' => $taux['libelle'], 'TAUX_REMU_ID' => $taux['parent'] ?? null, ]; if (!($action === 'update' && !in_array($code, ['TLD', 'SMIC']))) { $tauxRemu[] = $taux; } } return $tauxRemu; } public function TAUX_REMU_VALEUR() public function TAUX_REMU_VALEUR(string $action) { $data = require $this->oseAdmin->getOseDir() . 'data/taux_remu.php'; Loading @@ -297,20 +298,49 @@ class DataSource foreach ($data as $code => $taux) { foreach ($taux['valeurs'] as $dateEffet => $valeur) { $dateEffet = \DateTime::createFromFormat('d/m/Y', $dateEffet); $dateEffet->setTime(0, 0, 0); $tauxValeur = [ 'TAUX_REMU_ID' => $code, 'DATE_EFFET' => \DateTime::createFromFormat('d/m/Y', $dateEffet), 'DATE_EFFET' => $dateEffet, 'VALEUR' => $valeur, ]; if (!($action === 'update' && !in_array($code, ['TLD', 'SMIC']))) { $tauxValeurs[] = $tauxValeur; } } } return $tauxValeurs; } public function TYPE_MISSION() { $data = require $this->oseAdmin->getOseDir() . 'data/type_mission.php'; $tms = []; for ($a = 2010; $a <= 2099; $a++) { foreach ($data as $code => $tm) { $tms[] = [ 'CODE' => $code, 'LIBELLE' => $tm['libelle'], 'TAUX_REMU_ID' => $tm['taux-remu'] ?? null, 'TAUX_REMU_MAJORE_ID' => $tm['taux-remu-majore'] ?? null, 'ACCOMPAGNEMENT_ETUDIANTS' => (bool)$tm['accompagnement-etudiants'], 'ANNEE_ID' => $a, 'HISTO_MODIFICATEUR_ID' => null, ]; } } return $tms; } public function TYPE_INDICATEUR() { $data = require $this->oseAdmin->getOseDir() . 'data/indicateurs.php'; Loading
data/data_updater_config.php +42 −21 Changes for data/data_updater_config.php: 42 added lines, 21 removed lines. Original line number Diff line number Diff line Loading @@ -103,9 +103,6 @@ return [ 'key' => 'CODE', 'options' => ['delete' => false], ], 'TAUX_HORAIRE_HETD' => [ 'actions' => ['install', 'update'], ], 'TYPE_RESSOURCE' => [ 'actions' => ['install'], 'key' => 'CODE', Loading Loading @@ -152,6 +149,48 @@ return [ 'actions' => ['install'], 'key' => 'CODE', ], 'TAUX_REMU' => [ 'actions' => ['install', 'update'], 'options' => [ 'update' => true, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], ], ], 'key' => 'CODE', ], 'TAUX_REMU_VALEUR' => [ 'actions' => ['install', 'update'], 'options' => [ 'update' => true, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], ], ], 'key' => ['TAUX_REMU_ID', 'DATE_EFFET'], ], 'TYPE_MISSION' => [ 'actions' => ['install'], 'key' => ['CODE','ANNEE_ID'], 'options' => [ 'update' => false, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], 'TAUX_REMU_MAJORE_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE histo_destruction IS NULL AND code = %s', ], ], ], ], 'SCENARIO' => [ 'actions' => ['install'], 'key' => 'LIBELLE', Loading Loading @@ -240,24 +279,6 @@ return [ 'key' => ['CODE', 'ANNEE_ID'], 'options' => ['columns' => ['TYPE_INTERVENANT_ID' => ['transformer' => 'SELECT id FROM type_intervenant WHERE code = %s']]], ], 'TAUX_REMU' => [ 'actions' => ['install', 'update'], 'options' => ['update' => true, 'delete' => false], 'key' => 'CODE', ], 'TAUX_REMU_VALEUR' => [ 'actions' => ['install', 'update'], 'options' => [ 'update' => true, 'delete' => false, 'columns' => [ 'TAUX_REMU_ID' => [ 'transformer' => 'SELECT id FROM taux_remu WHERE code = %s', ], ], ], 'key' => ['TAUX_REMU_ID', 'DATE_EFFET'], ], 'TYPE_PIECE_JOINTE' => [ 'actions' => ['install'], 'key' => 'CODE', Loading
data/taux_remu.php +41 −1 Changes for data/taux_remu.php: 41 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ return [ 'TLD' => [ 'libelle' => 'Taux légal par défaut', 'libelle' => 'Taux légal HETD', 'valeurs' => [ '27/07/2009' => 40.58, '25/06/2014' => 40.91, Loading @@ -10,4 +10,44 @@ return [ '01/07/2022' => 42.86, ], ], 'SMIC' => [ 'libelle' => 'Smic (salaire minimum de croissance)', 'valeurs' => [ '01/01/2014' => 9.53, '01/01/2015' => 9.61, '01/01/2016' => 9.67, '01/01/2017' => 9.76, '01/01/2018' => 9.88, '01/01/2019' => 10.03, '01/01/2020' => 10.15, '01/01/2021' => 10.25, '01/10/2021' => 10.48, '01/01/2022' => 10.57, '01/05/2022' => 10.85, '01/08/2022' => 11.07, '01/01/2023' => 11.27, '01/05/2023' => 11.52, ], ], 'TAUX_1' => [ 'parent' => 'SMIC', 'libelle' => 'Taux 1 (SMIC horaire)', 'valeurs' => [ '01/01/2014' => 1, ], ], 'TAUX_2' => [ 'parent' => 'SMIC', 'libelle' => 'Taux 2 (SMIC horaire x2)', 'valeurs' => [ '01/01/2014' => 2, ], ], 'TAUX_3' => [ 'parent' => 'SMIC', 'libelle' => 'Taux 3 (SMIC horaire x2,5)', 'valeurs' => [ '01/01/2014' => 2.5, ], ], ]; No newline at end of file
data/type_mission.php 0 → 100644 +52 −0 Changes for data/type_mission.php: 52 added lines, 0 removed lines. Original line number Diff line number Diff line <?php return [ 'ACCUEIL_ETU' => [ 'libelle' => 'Accueil des étudiants', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'ACCOMP_HANDI' => [ 'libelle' => 'Assistance et accompagnement d’étudiants handicapés', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => true, ], 'TUTORAT' => [ 'libelle' => 'Tutorat', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'SOUTIEN_TIC' => [ 'libelle' => 'Soutien informatique et aide à l’utilisation des nouvelles technologies', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'APPUI_BIBLIO' => [ 'libelle' => 'Service d’appui aux personnels des bibliothèques', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'ANIM_CSSS' => [ 'libelle' => 'Animations culturelles, scientifiques, sportives et sociales', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'AIDE_INS_PRO' => [ 'libelle' => 'Aide à l’insertion professionnelle', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], 'PROMO_ODF' => [ 'libelle' => 'Promotion de l’offre de formation', 'taux-remu' => 'TAUX_1', 'taux-remu-majore' => null, 'accompagnement-etudiants' => false, ], ]; No newline at end of file