Ajout des types de notes dans la table type_note (ca0d60b2) · Commits · open-source / OSE

admin/src/DataGen.php

+19 −38

Changes for admin/src/DataGen.php: 19 added lines, 38 removed lines.
Original line number	Diff line number	Diff line
		<?php





		class DataGen
		{
		use \BddAdmin\Logger\LoggerAwareTrait;
		@@ -67,6 +64,11 @@ class DataGen
		'options' => ['update' => false, 'delete' => false],
		'key' => 'NUMERO',
		],
		[
		'table' => 'TYPE_NOTE',
		'context' => ['install', 'update'],
		'key' => 'CODE',
		],
		[
		'table' => 'TYPE_VOLUME_HORAIRE',
		'context' => ['install', 'update'],
		@@ -117,7 +119,7 @@ class DataGen
		'table' => 'PRIVILEGE',
		'context' => ['install', 'update', 'privileges'],
		'key' => ['CATEGORIE_ID', 'CODE'],
		'options' => ['columns' => ['CATEGORIE_ID' => ['transformer' => 'SELECT ID FROM CATEGORIE_PRIVILEGE WHERE CODE = %s']]],
		'options' => ['columns' => ['CATEGORIE_ID' => ['transformer' => 'SELECT id FROM categorie_privilege WHERE code = %s']]],
		],
		[
		'table' => 'TYPE_INDICATEUR',
		@@ -233,15 +235,15 @@ class DataGen
		'table' => 'ROLE',
		'context' => ['install'],
		'key' => 'CODE',
		'options' => ['columns' => ['PERIMETRE_ID' => ['transformer' => 'SELECT ID FROM PERIMETRE WHERE CODE = %s']]],
		'options' => ['columns' => ['PERIMETRE_ID' => ['transformer' => 'SELECT id FROM perimetre WHERE code = %s']]],
		],
		[
		'table' => 'ROLE_PRIVILEGE',
		'context' => ['install'],
		'key' => ['ROLE_ID', 'PRIVILEGE_ID'],
		'options' => ['columns' => [
		'ROLE_ID' => ['transformer' => 'SELECT ID FROM ROLE WHERE HISTO_DESTRUCTION IS NULL AND CODE = %s'],
		'PRIVILEGE_ID' => ['transformer' => 'SELECT P.ID FROM PRIVILEGE P JOIN CATEGORIE_PRIVILEGE CP ON CP.ID = P.CATEGORIE_ID WHERE CP.CODE \|\| \'-\' \|\| P.CODE = %s'],
		'ROLE_ID' => ['transformer' => 'SELECT id FROM role WHERE histo_destruction IS NULL AND code = %s'],
		'PRIVILEGE_ID' => ['transformer' => 'SELECT p.id FROM privilege p JOIN categorie_privilege cp ON cp.id = p.categorie_id WHERE cp.code \|\| \'-\' \|\| p.code = %s'],
		],],
		],
		[
		@@ -249,8 +251,8 @@ class DataGen
		'context' => ['install'],
		'key' => ['UTILISATEUR_ID', 'ROLE_ID'],
		'options' => ['columns' => [
		'ROLE_ID' => ['transformer' => 'SELECT ID FROM ROLE WHERE HISTO_DESTRUCTION IS NULL AND CODE = %s'],
		'UTILISATEUR_ID' => ['transformer' => 'SELECT ID FROM UTILISATEUR WHERE USERNAME = %s'],
		'ROLE_ID' => ['transformer' => 'SELECT id FROM role WHERE histo_destruction IS NULL AND code = %s'],
		'UTILISATEUR_ID' => ['transformer' => 'SELECT id FROM utilisateur WHERE username = %s'],
		],],
		],

		@@ -285,7 +287,7 @@ class DataGen
		'table' => 'GRADE',
		'context' => ['install'],
		'key' => 'SOURCE_CODE',
		'options' => ['columns' => ['CORPS_ID' => ['transformer' => 'SELECT ID FROM CORPS WHERE SOURCE_CODE = %s']]],
		'options' => ['columns' => ['CORPS_ID' => ['transformer' => 'SELECT id FROM corps WHERE source_code = %s']]],
		],
		[
		'table' => 'DISCIPLINE',
		@@ -301,7 +303,7 @@ class DataGen
		'table' => 'FONCTION_REFERENTIEL',
		'context' => ['install'],
		'key' => 'CODE',
		'options' => ['columns' => ['DOMAINE_FONCTIONNEL_ID' => ['transformer' => 'SELECT ID FROM DOMAINE_FONCTIONNEL WHERE SOURCE_CODE = %s']]],
		'options' => ['columns' => ['DOMAINE_FONCTIONNEL_ID' => ['transformer' => 'SELECT id FROM domaine_fonctionnel WHERE source_code = %s']]],
		],
		[
		'table' => 'MOTIF_MODIFICATION_SERVICE',
		@@ -317,7 +319,7 @@ class DataGen
		'table' => 'STATUT',
		'context' => ['install'],
		'key' => 'CODE',
		'options' => ['columns' => ['TYPE_INTERVENANT_ID' => ['transformer' => 'SELECT ID FROM TYPE_INTERVENANT WHERE CODE = %s']]],
		'options' => ['columns' => ['TYPE_INTERVENANT_ID' => ['transformer' => 'SELECT id FROM type_intervenant WHERE code = %s']]],
		],
		[
		'table' => 'TYPE_PIECE_JOINTE',
		@@ -329,8 +331,8 @@ class DataGen
		'context' => ['install'],
		'key' => ['STATUT_ID', 'TYPE_PIECE_JOINTE_ID'],
		'options' => ['columns' => [
		'STATUT_ID' => ['transformer' => 'SELECT ID FROM STATUT WHERE HISTO_DESTRUCTION IS NULL AND CODE = %s'],
		'TYPE_PIECE_JOINTE_ID' => ['transformer' => 'SELECT ID FROM TYPE_PIECE_JOINTE WHERE HISTO_DESTRUCTION IS NULL AND CODE = %s'],
		'STATUT_ID' => ['transformer' => 'SELECT id FROM statut WHERE histo_destruction IS NULL AND code = %s'],
		'TYPE_PIECE_JOINTE_ID' => ['transformer' => 'SELECT id FROM type_piece_jointe WHERE histo_destruction IS NULL AND code = %s'],
		],],
		],
		[
		@@ -338,9 +340,9 @@ class DataGen
		'context' => ['install'],
		'key' => ['ETAPE_SUIV_ID', 'ETAPE_PREC_ID'],
		'options' => ['columns' => [
		'ETAPE_PREC_ID' => ['transformer' => 'SELECT ID FROM WF_ETAPE WHERE CODE = %s'],
		'ETAPE_SUIV_ID' => ['transformer' => 'SELECT ID FROM WF_ETAPE WHERE CODE = %s'],
		'TYPE_INTERVENANT_ID' => ['transformer' => 'SELECT ID FROM TYPE_INTERVENANT WHERE CODE = %s'],
		'ETAPE_PREC_ID' => ['transformer' => 'SELECT id FROM wf_etape WHERE code = %s'],
		'ETAPE_SUIV_ID' => ['transformer' => 'SELECT id FROM wf_etape WHERE code = %s'],
		'TYPE_INTERVENANT_ID' => ['transformer' => 'SELECT id FROM type_intervenant WHERE code = %s'],
		],],
		],

		@@ -354,7 +356,6 @@ class DataGen
		];



		public function __construct(OseAdmin $oseAdmin)
		{
		$this->oseAdmin = $oseAdmin;
		@@ -362,28 +363,24 @@ class DataGen
		}



		public function install(string $table = null)
		{
		return $this->action('install', $table);
		}



		public function update(string $table = null)
		{
		return $this->action('update', $table);
		}



		public function updatePrivileges()
		{
		return $this->action('privileges');
		}



		private function action(string $action, string $table = null)
		{
		$this->logBegin($this->actions[$action]);
		@@ -403,7 +400,6 @@ class DataGen
		}



		private function syncTable(string $table, array $params)
		{
		$tableObject = $this->oseAdmin->getBdd()->getTable($table);
		@@ -452,7 +448,6 @@ class DataGen
		}



		private function getAnneeCourante(): int
		{
		$now = new \DateTime();
		@@ -465,7 +460,6 @@ class DataGen
		}



		public function ANNEE()
		{
		$annees = [];
		@@ -490,7 +484,6 @@ class DataGen
		}



		public function DEPARTEMENT()
		{
		$departements = [];
		@@ -518,7 +511,6 @@ class DataGen
		}



		public function IMPORT_TABLES()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/import_tables.php';
		@@ -536,14 +528,12 @@ class DataGen
		}



		public function ETAT_SORTIE()
		{
		return require $this->oseAdmin->getOseDir() . 'data/etats_sortie.php';
		}



		public function CATEGORIE_PRIVILEGE()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/privileges.php';
		@@ -560,7 +550,6 @@ class DataGen
		}



		public function PRIVILEGE()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/privileges.php';
		@@ -582,7 +571,6 @@ class DataGen
		}



		public function FORMULE()
		{
		$data = $this->nomenclature['FORMULE'];
		@@ -601,7 +589,6 @@ class DataGen
		}



		public function PLAFOND()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/plafonds.php';
		@@ -623,7 +610,6 @@ class DataGen
		}



		public function PLAFOND_ETAT()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/plafonds.php';
		@@ -644,7 +630,6 @@ class DataGen
		}



		public function PLAFOND_PERIMETRE()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/plafonds.php';
		@@ -664,7 +649,6 @@ class DataGen
		}



		public function TYPE_INDICATEUR()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/indicateurs.php';
		@@ -683,7 +667,6 @@ class DataGen
		}



		public function INDICATEUR()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/indicateurs.php';
		@@ -707,7 +690,6 @@ class DataGen
		}



		public function WF_ETAPE()
		{
		$data = require $this->oseAdmin->getOseDir() . 'data/workflow_etapes.php';
		@@ -723,7 +705,6 @@ class DataGen
		}



		public function PARAMETRE()
		{
		$bdd = $this->oseAdmin->getBdd();

data/nomenclatures.php

+15 −0

Changes for data/nomenclatures.php: 15 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -772,6 +772,7 @@ return [
		],
		],


		'TYPE_HEURES' => [
		[
		'ID' => 1,
		@@ -881,6 +882,20 @@ return [
		"VISIBLE_EXTERIEUR" => true,
		],
		],
		"TYPE_NOTE" => [
		[
		"ID" => 1,
		"LIBELLE" => "Email",
		"CODE" => "email",
		],
		[
		"ID" => 2,
		"LIBELLE" => "Note",
		"CODE" => "note",
		],


		],

		'TYPE_RESSOURCE' => [
		[