Retouche de la partie Element/Competence (831f6a24) · Commits · open-source / emc2

documentation/release/3.1.7.md

+63 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ JOIN unicaen_privilege_categorie cp ON cp.CODE = 'metier';

		* Amélioration du module `Element`
		```postgresql
		-- application ----
		alter table element_application_element alter column clef set default false;
		update element_application_element set clef=false where clef IS NULL;
		alter table element_application_element alter column clef set not null;
		@@ -72,6 +73,68 @@ SELECT cp.id, d.code, d.lib, d.ordre
		FROM d
		JOIN unicaen_privilege_categorie cp ON cp.CODE = 'application';

		alter table element_application_theme drop column couleur;

		update unicaen_privilege_privilege set ordre = 40 where code='applicationtheme_modifier';
		update unicaen_privilege_privilege set ordre = 60 where code='applicationtheme_effacer';

		INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
		WITH d(code, lib, ordre) AS (
		SELECT 'applicationtheme_ajouter', 'Ajouter', 30 UNION
		SELECT 'applicationtheme_historiser', 'Historiser/Restaurer', 50
		)
		SELECT cp.id, d.code, d.lib, d.ordre
		FROM d
		JOIN unicaen_privilege_categorie cp ON cp.CODE = 'applicationtheme';

		-- competence ----
		alter table element_competence_element alter column clef set default false;
		update element_competence_element set clef=false where clef IS NULL;
		alter table element_competence_element alter column clef set not null;

		alter table element_competence alter column id_source type varchar(256) using id_source::varchar(256);

		update unicaen_privilege_privilege set ordre = 40 where code='competence_modifier';
		update unicaen_privilege_privilege set ordre = 60 where code='competence_effacer';

		INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
		WITH d(code, lib, ordre) AS (
		SELECT 'competence_ajouter', 'Ajouter', 30 UNION
		SELECT 'competence_historiser', 'Historiser/Restaurer', 50 UNION
		SELECT 'competence_substituer', 'Fusionner', 100
		)
		SELECT cp.id, d.code, d.lib, d.ordre
		FROM d
		JOIN unicaen_privilege_categorie cp ON cp.CODE = 'competence';

		update unicaen_privilege_privilege set ordre = 40 where code='competencetheme_modifier';
		update unicaen_privilege_privilege set ordre = 60 where code='competencetheme_effacer';

		INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
		WITH d(code, lib, ordre) AS (
		SELECT 'competencetheme_ajouter', 'Ajouter', 30 UNION
		SELECT 'competencetheme_historiser', 'Historiser/Restaurer', 50
		)
		SELECT cp.id, d.code, d.lib, d.ordre
		FROM d
		JOIN unicaen_privilege_categorie cp ON cp.CODE = 'competencetheme';

		alter table element_competence_type drop column couleur;

		update unicaen_privilege_privilege set ordre = 40 where code='competencetype_modifier';
		update unicaen_privilege_privilege set ordre = 60 where code='competencetype_effacer';

		INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
		WITH d(code, lib, ordre) AS (
		SELECT 'competencetype_ajouter', 'Ajouter', 30 UNION
		SELECT 'competencetype_historiser', 'Historiser/Restaurer', 50
		)
		SELECT cp.id, d.code, d.lib, d.ordre
		FROM d
		JOIN unicaen_privilege_categorie cp ON cp.CODE = 'competencetype';

		-- niveau ---

		update unicaen_privilege_privilege set ordre = 40 where code='niveau_modifier';
		update unicaen_privilege_privilege set ordre = 60 where code='niveau_effacer';

module/Element/config/merged/competence-theme.config.php

+24 −1

Original line number	Diff line number	Diff line
		@@ -41,12 +41,28 @@ return [
		'controller' => CompetenceThemeController::class,
		'action' => [
		'ajouter',
		],
		'privileges' => [
		CompetencethemePrivileges::COMPETENCETHEME_AJOUTER,
		],
		],
		[
		'controller' => CompetenceThemeController::class,
		'action' => [
		'modifier',
		],
		'privileges' => [
		CompetencethemePrivileges::COMPETENCETHEME_MODIFIER,
		],
		],
		[
		'controller' => CompetenceThemeController::class,
		'action' => [
		'historiser',
		'restaurer',
		],
		'privileges' => [
		CompetencethemePrivileges::COMPETENCETHEME_MODIFIER,
		CompetencethemePrivileges::COMPETENCETHEME_HISTORISER,
		],
		],
		[
		@@ -76,6 +92,7 @@ return [
		'options' => [
		'route' => '/competence-theme',
		'defaults' => [
		/** @see CompetenceThemeController::indexAction() */
		'controller' => CompetenceThemeController::class,
		'action' => 'index',
		],
		@@ -87,6 +104,7 @@ return [
		'options' => [
		'route' => '/afficher/:competence-theme',
		'defaults' => [
		/** @see CompetenceThemeController::afficherAction() */
		'controller' => CompetenceThemeController::class,
		'action' => 'afficher',
		],
		@@ -97,6 +115,7 @@ return [
		'options' => [
		'route' => '/ajouter',
		'defaults' => [
		/** @see CompetenceThemeController::ajouterAction() */
		'controller' => CompetenceThemeController::class,
		'action' => 'ajouter',
		],
		@@ -107,6 +126,7 @@ return [
		'options' => [
		'route' => '/modifier/:competence-theme',
		'defaults' => [
		/** @see CompetenceThemeController::modifierAction() */
		'controller' => CompetenceThemeController::class,
		'action' => 'modifier',
		],
		@@ -117,6 +137,7 @@ return [
		'options' => [
		'route' => '/historiser/:competence-theme',
		'defaults' => [
		/** @see CompetenceThemeController::historiserAction() */
		'controller' => CompetenceThemeController::class,
		'action' => 'historiser',
		],
		@@ -127,6 +148,7 @@ return [
		'options' => [
		'route' => '/restaurer/:competence-theme',
		'defaults' => [
		/** @see CompetenceThemeController::restaurerAction() */
		'controller' => CompetenceThemeController::class,
		'action' => 'restaurer',
		],
		@@ -137,6 +159,7 @@ return [
		'options' => [
		'route' => '/detruire/:competence-theme',
		'defaults' => [
		/** @see CompetenceThemeController::detruireAction() */
		'controller' => CompetenceThemeController::class,
		'action' => 'detruire',
		],

module/Element/config/merged/competence-type.config.php

+24 −1

Original line number	Diff line number	Diff line
		@@ -41,12 +41,28 @@ return [
		'controller' => CompetenceTypeController::class,
		'action' => [
		'ajouter',
		],
		'privileges' => [
		CompetencetypePrivileges::COMPETENCETYPE_AJOUTER,
		],
		],
		[
		'controller' => CompetenceTypeController::class,
		'action' => [
		'modifier',
		],
		'privileges' => [
		CompetencetypePrivileges::COMPETENCETYPE_MODIFIER,
		],
		],
		[
		'controller' => CompetenceTypeController::class,
		'action' => [
		'historiser',
		'restaurer',
		],
		'privileges' => [
		CompetencetypePrivileges::COMPETENCETYPE_MODIFIER,
		CompetencetypePrivileges::COMPETENCETYPE_HISTORISER,
		],
		],
		[
		@@ -76,6 +92,7 @@ return [
		'options' => [
		'route' => '/competence-type',
		'defaults' => [
		/** @see CompetenceTypeController::indexAction() */
		'controller' => CompetenceTypeController::class,
		'action' => 'index',
		],
		@@ -87,6 +104,7 @@ return [
		'options' => [
		'route' => '/afficher/:competence-type',
		'defaults' => [
		/** @see CompetenceTypeController::afficherAction() */
		'controller' => CompetenceTypeController::class,
		'action' => 'afficher',
		],
		@@ -97,6 +115,7 @@ return [
		'options' => [
		'route' => '/ajouter',
		'defaults' => [
		/** @see CompetenceTypeController::ajouterAction() */
		'controller' => CompetenceTypeController::class,
		'action' => 'ajouter',
		],
		@@ -107,6 +126,7 @@ return [
		'options' => [
		'route' => '/modifier/:competence-type',
		'defaults' => [
		/** @see CompetenceTypeController::modifierAction() */
		'controller' => CompetenceTypeController::class,
		'action' => 'modifier',
		],
		@@ -117,6 +137,7 @@ return [
		'options' => [
		'route' => '/historiser/:competence-type',
		'defaults' => [
		/** @see CompetenceTypeController::historiserAction() */
		'controller' => CompetenceTypeController::class,
		'action' => 'historiser',
		],
		@@ -127,6 +148,7 @@ return [
		'options' => [
		'route' => '/restaurer/:competence-type',
		'defaults' => [
		/** @see CompetenceTypeController::restaurerAction() */
		'controller' => CompetenceTypeController::class,
		'action' => 'restaurer',
		],
		@@ -137,6 +159,7 @@ return [
		'options' => [
		'route' => '/detruire/:competence-type',
		'defaults' => [
		/** @see CompetenceTypeController::detruireAction() */
		'controller' => CompetenceTypeController::class,
		'action' => 'detruire',
		],

module/Element/config/merged/competence.config.php

+34 −2

Original line number	Diff line number	Diff line
		@@ -49,13 +49,28 @@ return [
		'controller' => CompetenceController::class,
		'action' => [
		'ajouter',
		],
		'privileges' => [
		CompetencePrivileges::COMPETENCE_AJOUTER,
		],
		],
		[
		'controller' => CompetenceController::class,
		'action' => [
		'modifier',
		],
		'privileges' => [
		CompetencePrivileges::COMPETENCE_MODIFIER,
		],
		],
		[
		'controller' => CompetenceController::class,
		'action' => [
		'historiser',
		'restaurer',
		'substituer'
		],
		'privileges' => [
		CompetencePrivileges::COMPETENCE_MODIFIER,
		CompetencePrivileges::COMPETENCE_HISTORISER,
		],
		],
		[
		@@ -67,6 +82,15 @@ return [
		CompetencePrivileges::COMPETENCE_EFFACER,
		],
		],
		[
		'controller' => CompetenceController::class,
		'action' => [
		'substituer'
		],
		'privileges' => [
		CompetencePrivileges::COMPETENCE_SUBSTITUER,
		],
		],
		],
		],
		],
		@@ -85,6 +109,7 @@ return [
		'options' => [
		'route' => '/competence',
		'defaults' => [
		/** @see CompetenceController::indexAction() */
		'controller' => CompetenceController::class,
		'action' => 'index',
		],
		@@ -96,6 +121,7 @@ return [
		'options' => [
		'route' => '/afficher/:competence',
		'defaults' => [
		/** @see CompetenceController::afficherAction() */
		'controller' => CompetenceController::class,
		'action' => 'afficher',
		],
		@@ -106,6 +132,7 @@ return [
		'options' => [
		'route' => '/ajouter[/:competence-type]',
		'defaults' => [
		/** @see CompetenceController::ajouterAction() */
		'controller' => CompetenceController::class,
		'action' => 'ajouter',
		],
		@@ -116,6 +143,7 @@ return [
		'options' => [
		'route' => '/modifier/:competence',
		'defaults' => [
		/** @see CompetenceController::modifierAction() */
		'controller' => CompetenceController::class,
		'action' => 'modifier',
		],
		@@ -126,6 +154,7 @@ return [
		'options' => [
		'route' => '/historiser/:competence',
		'defaults' => [
		/** @see CompetenceController::historiserAction() */
		'controller' => CompetenceController::class,
		'action' => 'historiser',
		],
		@@ -136,6 +165,7 @@ return [
		'options' => [
		'route' => '/restaurer/:competence',
		'defaults' => [
		/** @see CompetenceController::restaurerAction() */
		'controller' => CompetenceController::class,
		'action' => 'restaurer',
		],
		@@ -146,6 +176,7 @@ return [
		'options' => [
		'route' => '/detruire/:competence',
		'defaults' => [
		/** @see CompetenceController::detruireAction() */
		'controller' => CompetenceController::class,
		'action' => 'detruire',
		],
		@@ -156,6 +187,7 @@ return [
		'options' => [
		'route' => '/substituer/:competence',
		'defaults' => [
		/** @see CompetenceController::substituerAction() */
		'controller' => CompetenceController::class,
		'action' => 'substituer',
		],

module/Element/src/Element/Controller/ApplicationController.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ class ApplicationController extends AbstractActionController {
		}

		$vm = new ViewModel();
		$vm->setTemplate('application/default/default-form');
		$vm->setTemplate('default/default-form');
		$vm->setVariables([
		'title' => 'Ajouter une application',
		'form' => $form,
		@@ -116,7 +116,7 @@ class ApplicationController extends AbstractActionController {
		}

		$vm = new ViewModel();
		$vm->setTemplate('application/default/default-form');
		$vm->setTemplate('default/default-form');
		$vm->setVariables([
		'title' => 'Modifier une application',
		'form' => $form,
		@@ -139,7 +139,7 @@ class ApplicationController extends AbstractActionController {

		$vm = new ViewModel();
		if ($application !== null) {
		$vm->setTemplate('application/default/confirmation');
		$vm->setTemplate('default/confirmation');
		$vm->setVariables([
		'title' => "Suppression de l'application [" . $application->getLibelle(). "]",
		'text' => "La suppression est définitive êtes-vous sûr·e de vouloir continuer ?",