Merge branch 'feature_rapport_annuel' into release-1.4.7 (bb148dcc) · Commits · open-source / sygal

.gitignore

+5 −8

Changes for .gitignore: 5 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		auth.json
		.idea/
		data/DoctrineModule/
		data/DoctrineORMModule/
		/data/DoctrineModule/
		/data/DoctrineORMModule/
		.DS_Store
		ressources/Logos
		upload/*
		vendor/
		tmp/

		/upload/*
		/vendor
		/tmp/
		.~*
		No newline at end of file

composer.json

+1 −0

Changes for composer.json: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		"ext-imagick": "*",
		"ext-readline": "*",
		"ext-gettext": "*",
		"ext-zip": "*",
		"unicaen/app": "^1.3",
		"unicaen/auth": "^1.3",
		"unicaen/faq": "^1.0",

module/Application/config/module.config.php

+11 −3

Changes for module/Application/config/module.config.php: 11 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		<?php

		namespace Application;

		use Application\Assertion\AssertionAbstractFactory;
		use Application\Cache\MemcachedFactory;
		use Application\Controller\Factory\IndexControllerFactory;
		@@ -8,7 +10,8 @@ use Application\Event\UserAuthenticatedEventListenerFactory;
		use Application\Event\UserRoleSelectedEventListener;
		use Application\Form\Factory\EcoleDoctoraleFormFactory;
		use Application\Navigation\NavigationFactoryFactory;
		use Application\RouteMatchInjector;
		use Application\Search\Filter\Provider\SearchFilterProviderService;
		use Application\Search\Filter\Provider\SearchFilterProviderServiceFactory;
		use Application\Service\AuthorizeServiceAwareInitializer;
		use Application\Service\Role\RoleService;
		use Application\Service\Role\RoleServiceFactory;
		@@ -16,8 +19,6 @@ use Application\Service\ServiceAwareInitializer;
		use Application\Service\Url\UrlServiceFactory;
		use Application\Service\UserContextServiceAwareInitializer;
		use Application\Service\UserContextServiceFactory;
		use Application\SourceCodeStringHelper;
		use Application\SourceCodeStringHelperFactory;
		use Application\View\Helper\EscapeTextHelper;
		use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
		use Doctrine\DBAL\Driver\OCI8\Driver as OCI8;
		@@ -197,6 +198,7 @@ return array(
		'Sygal\Memcached' => MemcachedFactory::class,
		'RoleService' => RoleServiceFactory::class,
		SourceCodeStringHelper::class => SourceCodeStringHelperFactory::class,
		SearchFilterProviderService::class => SearchFilterProviderServiceFactory::class,
		),
		'abstract_factories' => [
		AssertionAbstractFactory::class,
		@@ -277,10 +279,16 @@ return array(
		'062_uploader' => "/js/jquery.fileupload.js",
		'063_uploader' => "/js/unicaen.uploader.widget.js",
		],
		'inline_scripts' => [
		'070_bootstrap-select' => '/vendor/bootstrap-select-1.13.18/js/bootstrap-select.min.js',
		'070_bootstrap-select-fr' => '/vendor/bootstrap-select-1.13.18/js/i18n/defaults-fr_FR.js',
		'081_bootstrap-confirmation' => '/vendor/bootstrap-confirmation.min.js',
		],
		'stylesheets' => [
		'050_bootstrap-theme' => false,
		'100_charte' => '/css/charte.css',
		'200_fa' => '/fontawesome-free-5.12.0-web/css/all.min.css',
		'300_bs' => '/vendor/bootstrap-select-1.13.18/css/bootstrap-select.min.css',
		],
		'printable_stylesheets' => [
		],

module/Application/config/others/fichier-these.config.php

0 → 100755

+245 −0

Changes for module/Application/config/others/fichier-these.config.php: 245 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?php

		/**
		* Config concernant les fichiers liés à une thèse.
		*/

		use Application\Controller\Factory\FichierTheseControllerFactory;
		use Application\Controller\FichierTheseController;
		use Application\Controller\Plugin\UrlFichierThese;
		use Application\Provider\Privilege\ThesePrivileges;
		use Application\Provider\Privilege\ValidationPrivileges;
		use Application\Service\FichierThese\FichierTheseServiceFactory;
		use UnicaenAuth\Guard\PrivilegeController;

		return [
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'deposes',
		],
		'privileges' => ValidationPrivileges::THESE_VALIDATION_RDV_BU,
		],
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'lister-fichiers',
		],
		'privileges' => ThesePrivileges::THESE_CONSULTATION_DEPOT,
		],
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'telecharger-fichier',
		'apercevoir-fichier',
		],
		'privileges' => ThesePrivileges::THESE_TELECHARGEMENT_FICHIER,
		],
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'apercevoir-page-de-couverture',
		],
		'privileges' => ThesePrivileges::THESE_TELECHARGEMENT_FICHIER,
		],
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'televerser-fichier',
		'supprimer-fichier',
		],
		'privileges' => ThesePrivileges::THESE_DEPOT_VERSION_INITIALE,
		],
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'televerser-fichier',
		'supprimer-fichier',
		],
		'privileges' => ThesePrivileges::THESE_DEPOT_VERSION_CORRIGEE,
		],
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'fusionnerConsole',
		],
		'roles' => [],
		],
		[
		'controller' => 'Application\Controller\FichierThese',
		'action' => [
		'recuperer-fusion',
		],
		'roles' => [],
		],
		],
		],
		],
		'router' => [
		'routes' => [
		'fichier' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/[:language/]fichier',
		'defaults' => [
		'controller' => 'Application\Controller\FichierThese',
		'language' => 'fr_FR',
		],
		],
		'may_terminate' => false,
		'child_routes' => [
		'deposes' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/deposes',
		'defaults' => [
		'action' => 'deposes',
		],
		],
		],
		'these' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/these/:these',
		'constraints' => [
		'these' => '\d+',
		],
		'defaults' => [
		'controller' => 'Application\Controller\FichierThese', // indispensable ! :-?
		],
		],
		'may_terminate' => false,
		'child_routes' => [
		'lister-fichiers' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/lister-fichiers',
		'defaults' => [
		'action' => 'lister-fichiers',
		/* @see FichierTheseController::listerFichiersAction() */
		],
		],
		],
		'televerser' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/televerser',
		'defaults' => [
		'action' => 'televerser-fichier',
		/* @see FichierTheseController::televerserFichierAction() */
		],
		],
		],
		'telecharger' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/telecharger/:fichier[/:fichierNom]',
		'constraints' => [
		'fichier' => '[a-zA-Z0-9-]{36}',
		],
		'defaults' => [
		'action' => 'telecharger-fichier',
		/* @see FichierTheseController::telechargerFichierAction() */
		],
		],
		],
		'apercevoir' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/apercevoir/:fichier[/:fichierNom]',
		'constraints' => [
		'fichier' => '[a-zA-Z0-9-]{36}',
		],
		'defaults' => [
		'action' => 'apercevoir-fichier',
		],
		],
		],
		'apercevoir-page-de-couverture' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/apercevoir-page-de-couverture',
		'defaults' => [
		'action' => 'apercevoir-page-de-couverture',
		],
		],
		],
		'supprimer' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/supprimer/:fichier[/:fichierNom]',
		'constraints' => [
		'fichier' => '[a-zA-Z0-9-]{36}',
		],
		'defaults' => [
		'action' => 'supprimer-fichier',
		],
		],
		],
		'recuperer-fusion' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/recuperer-fusion/:outputFile',
		'defaults' => [
		'action' => 'recuperer-fusion',
		],
		],
		],
		],
		], // 'these'
		],
		], // 'fichier'
		],
		],
		'console' => [
		'router' => [
		'routes' => [
		'fusionner' => [
		'options' => [
		'route' => 'fichier fusionner --these= --versionFichier= [--removeFirstPage] [--notifier=]',
		'defaults' => [
		'controller' => 'Application\Controller\FichierThese',
		'action' => 'fusionnerConsole',
		],
		],
		],
		],
		],
		],
		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'admin' => [
		'pages' => [
		'fichiers-deposes' => [
		'label' => 'Fichiers de thèses',
		'route' => 'fichier/deposes',
		'order' => 100,
		'resource' => PrivilegeController::getResourceId('Application\Controller\FichierThese', 'deposes'),
		],
		],
		],
		],
		],
		],
		],
		'service_manager' => [
		'factories' => [
		'FichierTheseService' => FichierTheseServiceFactory::class,
		],
		],
		'controllers' => [
		'factories' => [
		'Application\Controller\FichierThese' => FichierTheseControllerFactory::class,
		],
		],
		'controller_plugins' => [
		'invokables' => [
		'urlFichierThese' => UrlFichierThese::class,
		],
		],
		];

module/Application/config/others/fichier.config.php

+19 −202

File changed.

Preview size limit exceeded, changes collapsed.