Merge branch 'FJ_Administration_Periodes' (524d93ae) · Commits · open-source / OSE

data/ddl/table/PERIODE.php

+11 −23

Changes for data/ddl/table/PERIODE.php: 11 added lines, 23 removed lines.
Original line number	Diff line number	Diff line
		@@ -33,18 +33,6 @@ return [
		'position' => 14,
		'commentaire' => NULL,
		],
		'ECART_MOIS_PAIEMENT' => [
		'name' => 'ECART_MOIS_PAIEMENT',
		'type' => 'int',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => FALSE,
		'default' => NULL,
		'position' => 15,
		'commentaire' => NULL,
		],
		'ENSEIGNEMENT' => [
		'name' => 'ENSEIGNEMENT',
		'type' => 'bool',
		@@ -52,10 +40,10 @@ return [
		'length' => 0,
		'scale' => '0',
		'precision' => 1,
		'nullable' => TRUE,
		'default' => NULL,
		'nullable' => false,
		'default' => null,
		'position' => 6,
		'commentaire' => NULL,
		'commentaire' => null,
		],
		'HISTO_CREATEUR_ID' => [
		'name' => 'HISTO_CREATEUR_ID',
		@@ -146,12 +134,12 @@ return [
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 15,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'scale' => null,
		'precision' => null,
		'nullable' => false,
		'default' => null,
		'position' => 4,
		'commentaire' => NULL,
		'commentaire' => null,
		],
		'LIBELLE_LONG' => [
		'name' => 'LIBELLE_LONG',
		@@ -184,10 +172,10 @@ return [
		'length' => 0,
		'scale' => '0',
		'precision' => 1,
		'nullable' => TRUE,
		'default' => NULL,
		'nullable' => false,
		'default' => null,
		'position' => 7,
		'commentaire' => NULL,
		'commentaire' => null,
		],
		],
		];

data/ddl_columns_pos.php

+0 −1

Changes for data/ddl_columns_pos.php: 0 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -1074,7 +1074,6 @@ return [
		'HISTO_DESTRUCTION',
		'HISTO_DESTRUCTEUR_ID',
		'ECART_MOIS',
		'ECART_MOIS_PAIEMENT',
		],
		'PIECE_JOINTE' => [
		'ID',

data/nomenclatures.php

+0 −19

Changes for data/nomenclatures.php: 0 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -269,7 +269,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 0,
		"ECART_MOIS_PAIEMENT" => -1,
		],
		[
		"CODE" => "P02",
		@@ -279,7 +278,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 1,
		"ECART_MOIS_PAIEMENT" => 0,
		],
		[
		"CODE" => "P03",
		@@ -289,7 +287,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 2,
		"ECART_MOIS_PAIEMENT" => 1,
		],
		[
		"CODE" => "P04",
		@@ -299,7 +296,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 3,
		"ECART_MOIS_PAIEMENT" => 2,
		],
		[
		"CODE" => "P05",
		@@ -309,7 +305,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 4,
		"ECART_MOIS_PAIEMENT" => 3,
		],
		[
		"CODE" => "P06",
		@@ -319,7 +314,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 5,
		"ECART_MOIS_PAIEMENT" => 4,
		],
		[
		"CODE" => "P07",
		@@ -329,7 +323,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 6,
		"ECART_MOIS_PAIEMENT" => 5,
		],
		[
		"CODE" => "P08",
		@@ -339,7 +332,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 7,
		"ECART_MOIS_PAIEMENT" => 6,
		],
		[
		"CODE" => "P09",
		@@ -349,7 +341,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 8,
		"ECART_MOIS_PAIEMENT" => 7,
		],
		[
		"CODE" => "P10",
		@@ -359,7 +350,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 9,
		"ECART_MOIS_PAIEMENT" => 8,
		],
		[
		"CODE" => "P11",
		@@ -369,7 +359,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 10,
		"ECART_MOIS_PAIEMENT" => 9,
		],
		[
		"CODE" => "P12",
		@@ -379,7 +368,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 11,
		"ECART_MOIS_PAIEMENT" => 10,
		],
		[
		"CODE" => "P13",
		@@ -389,7 +377,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 12,
		"ECART_MOIS_PAIEMENT" => 11,
		],
		[
		"CODE" => "P14",
		@@ -399,7 +386,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 13,
		"ECART_MOIS_PAIEMENT" => 12,
		],
		[
		"CODE" => "P15",
		@@ -409,7 +395,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 14,
		"ECART_MOIS_PAIEMENT" => 13,
		],
		[
		"CODE" => "P16",
		@@ -419,7 +404,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 15,
		"ECART_MOIS_PAIEMENT" => 14,
		],
		[
		"CODE" => "PTD",
		@@ -429,7 +413,6 @@ return [
		"ENSEIGNEMENT" => false,
		"PAIEMENT" => true,
		"ECART_MOIS" => 16,
		"ECART_MOIS_PAIEMENT" => 15,
		],
		[
		"CODE" => "S1",
		@@ -439,7 +422,6 @@ return [
		"ENSEIGNEMENT" => true,
		"PAIEMENT" => false,
		"ECART_MOIS" => 0,
		"ECART_MOIS_PAIEMENT" => -1,
		],
		[
		"CODE" => "S2",
		@@ -449,7 +431,6 @@ return [
		"ENSEIGNEMENT" => true,
		"PAIEMENT" => false,
		"ECART_MOIS" => 5,
		"ECART_MOIS_PAIEMENT" => 4,
		],
		],

data/privileges.php

+2 −0

Changes for data/privileges.php: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -336,6 +336,8 @@ return [
		'campagnes-saisie-visualisation' => 'Campagnes de saisie - Visualisation',
		'annees-edition' => 'Années - Édition',
		'annees-visualisation' => 'Années - Visualisation',
		'periodes-edition' => 'Périodes - Édition',
		'periodes-visualisation' => 'Périodes - Visualisation',
		],
		],

module/Application/config/administration.config.php

+22 −1

Changes for module/Application/config/administration.config.php: 22 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -74,6 +74,17 @@ return [
		],
		'may_terminate' => true,
		],
		'administration-periode' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/administration-periode',
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'action' => 'administration-periode',
		],
		],
		'may_terminate' => true,
		],
		],
		],

		@@ -133,6 +144,14 @@ return [
		],
		],
		],
		'gestion-periode' => [
		'label' => 'Gestion des periodes',
		'icon' => 'glyphicon glyphicon - list-alt',
		'route' => 'periodes',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Periode', 'index'),
		'order' => 84,
		'border - color' => '#111',
		],
		'gestion-intervenant' => [
		'label' => 'Gestion intervenants (Statuts, PJ, etc...)',
		'icon' => 'glyphicon glyphicon - list-alt',
		@@ -216,7 +235,8 @@ return [
		'administration-financiere',
		'administration-intervenant',
		'administration-referentiel-commun',
		'administration-nomenclature-rh'],
		'administration-nomenclature-rh',
		'administration-periode',],
		'privileges' => [
		Privileges::IMPORT_ECARTS,
		Privileges::IMPORT_MAJ,
		@@ -247,6 +267,7 @@ return [
		Privileges::MOTIF_NON_PAIEMENT_VISUALISATION,
		Privileges::ODF_RECONDUCTION_OFFRE,
		Privileges::STRUCTURES_ADMINISTRATION_VISUALISATION,
		Privileges::PARAMETRES_PERIODES_VISUALISATION,
		],
		'assertion' => Assertion\GestionAssertion::class,
		],