Progresse (169eb930) · Commits · open-source / emc2

documentation/release/3.1.5.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,4 +48,5 @@ JOIN unicaen_privilege_categorie cp ON cp.CODE = 'agentaffichage';
		composer update unicaen/utilisateur
		composer update unicaen/privilege
		composer update unicaen/authentification
		composer update unicaen/mail
		```

documentation/release/3.1.6.md

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		```sql
		create table missionprincipale
		(
		id serial not null
		constraint missionprincipale_pk
		primary key,
		libelle varchar(1024),
		niveau_id integer
		constraint missionprincipale_carriere_niveau_enveloppe_id_fk
		references carriere_niveau_enveloppe
		on delete cascade,
		histo_creation timestamp default now() not null,
		histo_createur_id integer default 0 not null
		constraint missionprincipale_unicaen_utilisateur_user_id_fk3
		references unicaen_utilisateur_user,
		histo_modification timestamp,
		histo_modificateur_id integer
		constraint missionprincipale_unicaen_utilisateur_user_id_fk
		references unicaen_utilisateur_user,
		histo_destruction timestamp,
		histo_destructeur_id integer
		constraint missionprincipale_unicaen_utilisateur_user_id_fk2
		references unicaen_utilisateur_user
		);


		insert into missionprincipale (id, libelle, niveau_id)
		select a.id, al.libelle, a.niveaux_id
		from activite a
		join activite_libelle al on a.id = al.activite_id
		where a.histo_destruction IS NULL AND al.
		histo_destruction IS NULL;

		drop table activite_libelle;

		select max(id) from missionprincipale;
		alter sequence missionprincipale_id_seq restart with 14; -- TODO changer avec valeur ci-dessus

		alter table activite_domaine rename to missionprincipale_domaine;
		alter table missionprincipale_domaine rename column activite_id to mission_id;
		alter table activite_description rename to missionprincipale_activite;
		alter table missionprincipale_activite rename column activite_id to mission_id;
		alter table activite_application rename to missionprincipale_application;
		alter table missionprincipale_application rename column activite_id to mission_id;
		alter table activite_competence rename to missionprincipale_competence;
		alter table missionprincipale_competence rename column activite_id to mission_id;
		drop table activite_formation;
		alter table fichemetier_activite rename column activite_id to mission_id;
		alter table fichemetier_activite drop constraint fichemetier_activite_activite_id_fk;
		alter table fichemetier_activite add constraint fichemetier_activite_missionprincipale_id_fk foreign key (mission_id) references missionprincipale on delete cascade;
		alter table fichemetier_activite rename to fichemetier_mission;

		alter table fichemetier_mission rename column position to ordre;
		alter table fichemetier_mission rename column fiche_id to fichemetier_id;


		INSERT INTO unicaen_privilege_categorie (code, libelle, ordre, namespace)
		VALUES ('missionprincipale', 'Gestion des missions principales', 800, 'FicheMetier\Provider\Privilege');
		INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
		WITH d(code, lib, ordre) AS (
		SELECT 'missionprincipale_index', 'Accéder à l''index', 10 UNION
		SELECT 'missionprincipale_afficher', 'Afficher', 20 UNION
		SELECT 'missionprincipale_ajouter', 'Ajouter', 30 UNION
		SELECT 'missionprincipale_modifier', 'Modifier', 40 UNION
		SELECT 'missionprincipale_historiser', 'Historiser/Restaurer', 50 UNION
		SELECT 'missionprincipale_supprimer', 'Supprimer', 60
		)
		SELECT cp.id, d.code, d.lib, d.ordre
		FROM d
		JOIN unicaen_privilege_categorie cp ON cp.CODE = 'missionprincipale';

		```
		No newline at end of file

module/Application/config/merged/activite.config.php→module/Application/config/merged/activite.config.php.old

+1 −31

Original line number	Diff line number	Diff line
		@@ -105,33 +105,7 @@ return [
		],
		],

		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'gestion' => [
		'pages' => [
		'mission-pincipale' => [
		'label' => 'Missions principales / Activités',
		'route' => 'activite',
		'resource' => ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_AFFICHER),
		'order' => 1020,
		'icon' => 'fas fa-angle-right',
		'pages' => [
		'modifier' => [
		'label' => 'Modifier une activité',
		'route' => 'activite/modifier',
		'resource' => ActivitePrivileges::getResourceId(ActivitePrivileges::ACTIVITE_MODIFIER),
		'order' => 1000,
		]
		]
		],
		],
		],
		],
		],
		],
		],


		'router' => [
		'routes' => [
		@@ -139,10 +113,6 @@ return [
		'type' => Literal::class,
		'options' => [
		'route' => '/mission-principale',
		'defaults' => [
		'controller' => ActiviteController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [

module/Application/config/merged/fiche-poste.config.php

+14 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ use Application\Form\Rifseep\RifseepHydratorFactory;
		use Application\Form\SpecificitePoste\SpecificitePosteForm;
		use Application\Form\SpecificitePoste\SpecificitePosteFormFactory;
		use Application\Form\SpecificitePoste\SpecificitePosteHydrator;
		use Application\Provider\Privilege\FicheMetierPrivileges;
		use Application\Provider\Privilege\FichePostePrivileges;
		use Application\Service\ActivitesDescriptionsRetirees\ActivitesDescriptionsRetireesService;
		use Application\Service\ActivitesDescriptionsRetirees\ActivitesDescriptionsRetireesServiceFactory;
		@@ -48,8 +49,11 @@ use Application\Service\Poste\PosteService;
		use Application\Service\Poste\PosteServiceFactory;
		use Application\Service\SpecificitePoste\SpecificitePosteService;
		use Application\Service\SpecificitePoste\SpecificitePosteServiceFactory;
		use Application\View\Helper\FicheMetierExterneViewHelper;
		use Application\View\Helper\FichePosteGraphViewHelper;
		use Application\View\Helper\FichesPostesAsArrayViewHelperFactory;
		use Application\View\Helper\RaisonsViewHelper;
		use Application\View\Helper\SpecificitePosteViewHelper;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;
		use Laminas\Router\Http\Literal;
		@@ -202,6 +206,13 @@ return [
		'pages' => [
		'gestion' => [
		'pages' => [
		'fiches' => [
		'label' => 'Gestion des fiches',
		'route' => 'fiche-metier-type',
		'resource' => FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_INDEX) ,
		'order' => 2000,
		'dropdown-header' => true,
		],
		'fiche-poste' => [
		'label' => 'Fiches de poste',
		'route' => 'fiche-poste',
		@@ -631,6 +642,9 @@ return [
		],
		'view_helpers' => [
		'invokables' => [
		'specificitePoste' => SpecificitePosteViewHelper::class,
		'ficheMetierExterne' => FicheMetierExterneViewHelper::class,
		'raisons' => RaisonsViewHelper::class,
		'fichePosteGraph' => FichePosteGraphViewHelper::class,
		],
		'factories' => [

module/Application/src/Application/Controller/ConfigurationController.php

+6 −6

Original line number	Diff line number	Diff line
		@@ -2,22 +2,22 @@

		namespace Application\Controller;

		use Element\Entity\Db\Application;
		use Element\Entity\Db\Competence;
		use Application\Entity\Db\ConfigurationFicheMetier;
		use Formation\Entity\Db\Formation;
		use Application\Form\ConfigurationFicheMetier\ConfigurationFicheMetierFormAwareTrait;
		use Application\Service\Configuration\ConfigurationServiceAwareTrait;
		use Element\Entity\Db\Application;
		use Element\Entity\Db\Competence;
		use Element\Service\Application\ApplicationServiceAwareTrait;
		use Element\Service\Competence\CompetenceServiceAwareTrait;
		use Application\Service\Configuration\ConfigurationServiceAwareTrait;
		use Application\Service\FicheMetier\FicheMetierServiceAwareTrait;
		use FicheMetier\Service\FicheMetier\FicheMetierServiceAwareTrait;
		use Formation\Entity\Db\Formation;
		use Formation\Service\Formation\FormationServiceAwareTrait;
		use UnicaenAutoform\Service\Formulaire\FormulaireServiceAwareTrait;
		use Laminas\Form\Element\Select;
		use Laminas\Http\Request;
		use Laminas\Mvc\Controller\AbstractActionController;
		use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
		use Laminas\View\Model\ViewModel;
		use UnicaenAutoform\Service\Formulaire\FormulaireServiceAwareTrait;

		/** @method FlashMessenger flashMessenger() */