Merge branch 'alc-reconduction-offre' into 'master' (55137694) · Commits · JACQUOT Frederic / OSE

Dockerfile

+2 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@ ENV APACHE_CONF_DIR=/etc/apache2 \
		APPLICATION_ENV=dev

		## Installation de packages requis.
		RUN apt-get update -y
		RUN apt-get upgrade -y
		RUN apt-get install -y unoconv

		# Nettoyage

data/privileges.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ return [
		'grands-types-diplome-edition' => 'Grands types de diplômes (édition)',
		'types-diplome-visualisation' => 'Types de diplômes (visualisation)',
		'types-diplome-edition' => 'Types de diplômes (édition)',
		'reconduction-offre' => 'Prolongation de l\'offre l\'année suivante',
		],
		],

module/Application/config/aaa_module.config.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@ $config = [
		Service\DepartementService::class => Service\DepartementService::class,
		Service\FichierService::class => Service\FichierService::class,
		Service\TauxHoraireHETDService::class => Service\TauxHoraireHETDService::class,
		Assertion\InformationAssertion::class => Assertion\InformationAssertion::class,
		ORM\Event\Listeners\HistoriqueListener::class => ORM\Event\Listeners\HistoriqueListener::class,
		],
		'factories' => [

module/Application/config/administration.config.php

+2 −1

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ return [
		Privileges::DOMAINES_FONCTIONNELS_ADMINISTRATION_VISUALISATION,
		Privileges::MOTIFS_MODIFICATION_SERVICE_DU_VISUALISATION,
		Privileges::MOTIF_NON_PAIEMENT_VISUALISATION,
		Privileges::ODF_RECONDUCTION_OFFRE,
		Privileges::STRUCTURES_ADMINISTRATION_VISUALISATION,
		],
		'assertion' => Assertion\GestionAssertion::class,

module/Application/config/offre-formation.config.php

+43 −16

Original line number	Diff line number	Diff line
		@@ -33,6 +33,15 @@ return [
		],
		],
		],
		'reconduction' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/reconduction',
		'defaults' => [
		'action' => 'reconduction',
		],
		],
		],
		'element' => [
		'type' => 'Literal',
		'options' => [
		@@ -199,6 +208,16 @@ return [
		'route' => 'of',
		'resource' => PrivilegeController::getResourceId('Application\Controller\OffreFormation', 'index'),
		],
		'administration' => [
		'pages' => [
		'reconduction-offre' => [
		'label' => 'Reconduction de l\'offre de formation',
		'icon' => 'glyphicon glyphicon-list-alt',
		'route' => 'of/reconduction',
		'resource' => PrivilegeController::getResourceId('Application\Controller\OffreFormation', 'reconduction'),
		],
		],
		],
		],
		],
		],
		@@ -217,6 +236,11 @@ return [
		'action' => ['export'],
		'privileges' => Privileges::ODF_EXPORT_CSV,
		],
		[
		'controller' => 'Application\Controller\OffreFormation',
		'action' => ['reconduction'],
		'privileges' => Privileges::ODF_RECONDUCTION_OFFRE,
		],
		/* Etapes */
		[
		'controller' => 'Application\Controller\OffreFormation\Etape',
		@@ -346,9 +370,12 @@ return [
		Service\ElementModulateurService::class => Service\ElementModulateurService::class,
		Service\TypeModulateurService::class => Service\TypeModulateurService::class,
		Service\DomaineFonctionnelService::class => Service\DomaineFonctionnelService::class,
		Assertion\OffreDeFormationAssertion::class => Assertion\OffreDeFormationAssertion::class,
		Service\OffreFormationService::class => Service\OffreFormationService::class,
		Processus\ReconductionProcessus::class => Processus\ReconductionProcessus::class,
		],
		'factories' => [
		Assertion\OffreDeFormationAssertion::class => \UnicaenAuth\Assertion\AssertionFactory::class,
		Processus\ReconductionProcessus::class => Processus\Factory\ReconductionProcessusFactory::class,
		],
		],
		'form_elements' => [