Commit 8cccc7fd authored by lecluse's avatar lecluse
Browse files

Refonte des messages d'erreur pour les rendre + propres, un peu de deseign,...

Refonte des messages d'erreur pour les rendre + propres, un peu de deseign, correction de bugs divers
parent 6a04a318
......@@ -50,7 +50,7 @@ if ($controller->getRequest()->isPost() && $form->isValid()) {
<h3>Etape 2 : Création des fichiers sources du formulaire</h3>
<?php
$sCodeGenerator->setTemplate('Form')->setParams($params)->generateToHtml($params['fileName'])->generateToFile($params['fileName']);
$sCodeGenerator->setTemplate('OseForm')->setParams($params)->generateToHtml($params['fileName'])->generateToFile($params['fileName']);
$p = $sCodeGenerator->generateFormTraitParams($targetFullClass, $name, $module . '\Form');
$sCodeGenerator->setTemplate('FormAwareTrait')->setParams($p)->generateToHtml($p['fileName'])->generateToFile($p['fileName']);
......
......@@ -147,33 +147,33 @@
},
{
"name": "doctrine/cache",
"version": "v1.5.2",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "47c7128262da274f590ae6f86eb137a7a64e82af"
"reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/47c7128262da274f590ae6f86eb137a7a64e82af",
"reference": "47c7128262da274f590ae6f86eb137a7a64e82af",
"url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
"reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
"php": "~5.5|~7.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"phpunit/phpunit": ">=3.7",
"phpunit/phpunit": "~4.8|~5.0",
"predis/predis": "~1.0",
"satooshi/php-coveralls": "~0.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5.x-dev"
"dev-master": "1.6.x-dev"
}
},
"autoload": {
......@@ -213,7 +213,7 @@
"cache",
"caching"
],
"time": "2015-12-03 10:50:37"
"time": "2015-12-31 16:37:02"
},
{
"name": "doctrine/collections",
......@@ -283,16 +283,16 @@
},
{
"name": "doctrine/common",
"version": "v2.5.2",
"version": "v2.5.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
"reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c"
"reference": "10f1f19651343f87573129ca970aef1a47a6f29e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
"reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
"url": "https://api.github.com/repos/doctrine/common/zipball/10f1f19651343f87573129ca970aef1a47a6f29e",
"reference": "10f1f19651343f87573129ca970aef1a47a6f29e",
"shasum": ""
},
"require": {
......@@ -352,24 +352,24 @@
"persistence",
"spl"
],
"time": "2015-12-04 12:49:42"
"time": "2015-12-25 13:10:16"
},
{
"name": "doctrine/dbal",
"version": "v2.5.2",
"version": "v2.5.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c"
"reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c",
"reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
"reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
"shasum": ""
},
"require": {
"doctrine/common": ">=2.4,<2.6-dev",
"doctrine/common": ">=2.4,<2.7-dev",
"php": ">=5.3.2"
},
"require-dev": {
......@@ -423,7 +423,7 @@
"persistence",
"queryobject"
],
"time": "2015-09-16 16:29:33"
"time": "2016-01-05 22:11:12"
},
{
"name": "doctrine/doctrine-module",
......@@ -758,22 +758,22 @@
},
{
"name": "doctrine/orm",
"version": "v2.5.2",
"version": "v2.5.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff"
"reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/464b5fdbfbbeb4a65465ac173c4c5d90960f41ff",
"reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
"reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
"shasum": ""
},
"require": {
"doctrine/cache": "~1.4",
"doctrine/collections": "~1.2",
"doctrine/common": ">=2.5-dev,<2.6-dev",
"doctrine/common": ">=2.5-dev,<2.7-dev",
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
"doctrine/instantiator": "~1.0.1",
"ext-pdo": "*",
......@@ -782,7 +782,6 @@
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "dev-master",
"symfony/yaml": "~2.3|~3.0"
},
"suggest": {
......@@ -831,7 +830,7 @@
"database",
"orm"
],
"time": "2015-11-23 12:44:25"
"time": "2016-01-05 21:34:58"
},
{
"name": "jasig/phpcas",
......@@ -1006,16 +1005,16 @@
},
{
"name": "rwoverdijk/assetmanager",
"version": "1.4.4",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/RWOverdijk/AssetManager.git",
"reference": "fed0e5cc6799a595627c79c41da4492f6e857cc0"
"reference": "ced629631ff612b8b3dd3a2e83ac8e77ac946fcd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RWOverdijk/AssetManager/zipball/fed0e5cc6799a595627c79c41da4492f6e857cc0",
"reference": "fed0e5cc6799a595627c79c41da4492f6e857cc0",
"url": "https://api.github.com/repos/RWOverdijk/AssetManager/zipball/ced629631ff612b8b3dd3a2e83ac8e77ac946fcd",
"reference": "ced629631ff612b8b3dd3a2e83ac8e77ac946fcd",
"shasum": ""
},
"require": {
......@@ -1063,20 +1062,20 @@
"zend framework 2",
"zf2"
],
"time": "2015-03-12 07:10:33"
"time": "2016-01-21 09:21:54"
},
{
"name": "symfony/console",
"version": "v3.0.0",
"version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "175871ca8d1ef16ff8d8cac395a1c73afa8d0e63"
"reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/175871ca8d1ef16ff8d8cac395a1c73afa8d0e63",
"reference": "175871ca8d1ef16ff8d8cac395a1c73afa8d0e63",
"url": "https://api.github.com/repos/symfony/console/zipball/ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
"reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
"shasum": ""
},
"require": {
......@@ -1123,29 +1122,32 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2015-11-30 12:36:17"
"time": "2015-12-22 10:39:06"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.0.0",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "0b6a8940385311a24e060ec1fe35680e17c74497"
"reference": "1289d16209491b584839022f29257ad859b8532d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497",
"reference": "0b6a8940385311a24e060ec1fe35680e17c74497",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
"reference": "1289d16209491b584839022f29257ad859b8532d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
"ext-mbstring": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
},
"autoload": {
......@@ -1179,20 +1181,20 @@
"portable",
"shim"
],
"time": "2015-11-04 20:28:58"
"time": "2016-01-20 09:13:37"
},
{
"name": "symfony/process",
"version": "v2.8.0",
"version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312"
"reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
"reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
"url": "https://api.github.com/repos/symfony/process/zipball/6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
"reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
"shasum": ""
},
"require": {
......@@ -1228,7 +1230,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2015-11-30 12:35:10"
"time": "2016-01-06 09:59:23"
},
{
"name": "unicaen/unicaen-app",
......@@ -1236,7 +1238,7 @@
"source": {
"type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenApp",
"reference": "/trunk/@664"
"reference": "/trunk/@676"
},
"require": {
"doctrine/doctrine-orm-module": ">=0.7",
......@@ -1286,7 +1288,7 @@
"source": {
"type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenAuth",
"reference": "/trunk/@257"
"reference": "/trunk/@263"
},
"require": {
"bjyoungblood/bjy-authorize": ">=1.4",
......@@ -3765,16 +3767,16 @@
},
{
"name": "phpunit/phpunit",
"version": "4.8.19",
"version": "4.8.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "b2caaf8947aba5e002d42126723e9d69795f32b4"
"reference": "ea76b17bced0500a28098626b84eda12dbcf119c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b2caaf8947aba5e002d42126723e9d69795f32b4",
"reference": "b2caaf8947aba5e002d42126723e9d69795f32b4",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea76b17bced0500a28098626b84eda12dbcf119c",
"reference": "ea76b17bced0500a28098626b84eda12dbcf119c",
"shasum": ""
},
"require": {
......@@ -3833,7 +3835,7 @@
"testing",
"xunit"
],
"time": "2015-11-30 08:18:59"
"time": "2015-12-12 07:45:58"
},
{
"name": "phpunit/phpunit-mock-objects",
......@@ -4264,16 +4266,16 @@
},
{
"name": "symfony/yaml",
"version": "v3.0.0",
"version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002"
"reference": "3df409958a646dad2bc5046c3fb671ee24a1a691"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
"url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691",
"reference": "3df409958a646dad2bc5046c3fb671ee24a1a691",
"shasum": ""
},
"require": {
......@@ -4309,7 +4311,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2015-11-30 12:36:17"
"time": "2015-12-26 13:39:53"
},
{
"name": "unicaen/unicaen-code",
......@@ -4317,7 +4319,7 @@
"source": {
"type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenCode",
"reference": "/trunk/@14"
"reference": "/trunk/@28"
},
"require-dev": {
"phpunit/phpunit": ">=3.7",
......
About this directory:
=====================
By default, this application is configured to load all configs in
`./config/autoload/{,*.}{global,local}.php`. Doing this provides a
location for a developer to drop in configuration override files provided by
modules, as well as cleanly provide individual, application-wide config files
for things like database connections, etc.
<?php
return [
'view_manager' => [
'display_not_found_reason' => false,
'display_exceptions' => false,
],
];
......@@ -5,11 +5,11 @@ from
intervenant i
JOIN formule_resultat fr ON fr.intervenant_id = i.id
where
source_code IN (select source_code from intervenant where id = 8334)
source_code IN (select source_code from intervenant where id = 6860)
AND i.annee_id = 2014
AND fr.total > 0)
WHERE
id = 8334
id = 6860
AND premier_recrutement IS NULL
;
......@@ -25,6 +25,3 @@ where
select source_code from intervenant where id = 5249;
8329 8334
\ No newline at end of file
......@@ -11,12 +11,12 @@ const R_INTERVENANT_EXTERIEUR = Acl\IntervenantExterieurRole::ROLE_ID;
$main = [
'doctrine' => [
'connection' => [
'connection' => [
'orm_default' => [
'driverClass' => \Doctrine\DBAL\Driver\OCI8\Driver::class,
],
],
'driver' => [
'driver' => [
'orm_default_driver' => [
'class' => \Doctrine\ORM\Mapping\Driver\XmlDriver::class,
'paths' => [
......@@ -46,7 +46,7 @@ $main = [
],
],
],
'eventmanager' => [
'eventmanager' => [
'orm_default' => [
'subscribers' => [
\Doctrine\DBAL\Event\Listeners\OracleSessionInit::class,
......@@ -54,7 +54,7 @@ $main = [
],
],
],
'cache' => [
'cache' => [
'apc' => [
'namespace' => 'OSE__' . __NAMESPACE__,
],
......@@ -216,6 +216,12 @@ $main = [
'template_path_stack' => [
__DIR__ . '/../view',
],
'template_map' => [
'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
//'error/404' => __DIR__ . '/../view/error/404.phtml',
'error/index' => __DIR__ . '/../view/error/index.phtml',
],
'layout' => 'layout/layout', // e.g., 'layout/layout'
],
'public_files' => [
'inline_scripts' => [
......@@ -238,6 +244,7 @@ $main = [
17 => 'css/service.css',
18 => 'css/acceuil.css',
19 => 'css/droits.css',
20 => 'css/callout.css',
],
],
];
......
msgid ""
msgstr ""
"Project-Id-Version: ZendSkeletonApplication\n"
"Project-Id-Version: OSE\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-28 09:32+0100\n"
"PO-Revision-Date: 2014-02-28 09:32+0100\n"
......@@ -17,154 +17,46 @@ msgstr ""
"X-Poedit-SearchPath-0: ..\n"
#: ../src/Application/Controller/IntervenantController.php:46
#: ../src/Application/Controller/DemoController.php:36
msgid "Intervenant :"
msgstr "Intervenant :"
#: ../src/Application/Controller/RechercheController.php:24
#: ../src/Application/Controller/DemoController.php:79
msgid "Recherche :"
msgstr "Recherche :"
#: ../src/Application/Controller/DemoController.php:118
msgid "Test"
msgstr "Test"
#: ../view/application/index/index.phtml:5
msgid "Connectez-vous..."
msgstr "Connectez-vous..."
#~ msgid "Skeleton Application"
#~ msgstr "Skeleton Application"
#~ msgid "Home"
#~ msgstr "Accueil"
#~ msgid "All rights reserved."
#~ msgstr "Tous droits réservés."
#~ msgid "Welcome to %sZend Framework 2%s"
#~ msgstr "Bienvenue dans le %sZend Framework 2%s"
#~ msgid ""
#~ "Congratulations! You have successfully installed the %sZF2 Skeleton "
#~ "Application%s. You are currently running Zend Framework version %s. This "
#~ "skeleton can serve as a simple starting point for you to begin building "
#~ "your application on ZF2."
#~ msgstr ""
#~ "Félicitations ! Vous avez installé avec succès le %sZF2 Skeleton "
#~ "Application%s. Vous utilisez actuellement Zend Framework version %s. "
#~ "Cette structure peut vous servir comme un point de départ simple pour "
#~ "démarrer la construction de votre application avec ZF2."
#~ msgid "Fork Zend Framework 2 on GitHub"
#~ msgstr "Faites un Fork de Zend Framework 2 sur GitHub"
#~ msgid "Follow Development"
#~ msgstr "Suivre le développement"
#~ msgid ""
#~ "Zend Framework 2 is under active development. If you are interested in "
#~ "following the development of ZF2, there is a special ZF2 portal on the "
#~ "official Zend Framework website which provides links to the ZF2 %swiki%s, "
#~ "%sdev blog%s, %sissue tracker%s, and much more. This is a great resource "
#~ "for staying up to date with the latest developments!"
#~ msgstr ""
#~ "Zend Framework 2 est en cours de développement. Si vous êtes intéressé "
#~ "pour suivre l'évolution de ZF2, il existe un portail dédié à ZF2 sur le "
#~ "site officiel Zend Framework qui propose des liens vers le %swiki%s ZF2, "
#~ "%sdev blog%s, %ssuivi des problèmes%s, et bien plus encore. Il s'agit "
#~ "d'une excellente ressource pour rester à jour sur les dernières "
#~ "évolutions !"
#~ msgid "ZF2 Development Portal"
#~ msgstr "Portail sur le développement de ZF2"
#~ msgid "Discover Modules"
#~ msgstr "Découvrez les modules"
#~ msgid ""
#~ "The community is working on developing a community site to serve as a "
#~ "repository and gallery for ZF2 modules. The project is available %son "
#~ "GitHub%s. The site is currently live and currently contains a list of "
#~ "some of the modules already available for ZF2."
#~ msgstr ""
#~ "La communauté travaille sur le développement d'un site communautaire avec "
#~ "l'objectif de servir de dépôt et de galerie pour les modules ZF2. Le "
#~ "projet est disponible %ssur GitHub%s. Le site est déjà en ligne, et "
#~ "contient une liste non exhaustive des modules déjà disponibles pour ZF2."
#~ msgid "Explore ZF2 Modules"
#~ msgstr "Explorer les modules ZF2"
#~ msgid "Help &amp; Support"
#~ msgstr "Aide &amp; support"
#~ msgid ""
#~ "If you need any help or support while developing with ZF2, you may reach "
#~ "us via IRC: %s#zftalk on Freenode%s. We'd love to hear any questions or "
#~ "feedback you may have regarding the beta releases. Alternatively, you may "
#~ "subscribe and post questions to the %smailing lists%s."
#~ msgstr ""
#~ "Si vous avez besoin d'aide ou de support en développant avec ZF2, vous "
#~ "pouvez nous joindre sur IRC : %s#zftalk sur Freenode%s. Nous aimerions "
#~ "avoir vos questions ou vos commentaires que vous pourriez avoir au sujet "
#~ "des versions bêta. Sinon, vous pouvez vous abonner, et poser des "
#~ "questions sur la %sliste de diffusion%s."
#~ msgid "Ping us on IRC"
#~ msgstr "Rejoignez-nous sur IRC"
#~ msgid "An error occurred"
#~ msgstr "Une erreur est survenue"
#~ msgid "Additional information"
#~ msgstr "Informations complémentaires"
#~ msgid "File"
#~ msgstr "Fichier"
#~ msgid "Message"
#~ msgstr "Message"
#~ msgid "Stack trace"
#~ msgstr "Pile d'exécution"
#~ msgid "Previous exceptions"
#~ msgstr "Exceptions précédentes"
msgid "Home"
msgstr "Accueil"
#~ msgid "No Exception available"
#~ msgstr "Aucune exception disponible"
msgid "An error occurred"
msgstr "Une erreur est survenue"
#~ msgid "A 404 error occurred"
#~ msgstr "Une erreur 404 est survenue"
msgid "Additional information"
msgstr "Informations complémentaires"
#~ msgid "The requested controller was unable to dispatch the request."
#~ msgstr "Le contrôleur demandé n'a pas pu dispatcher la requête."
msgid "Message"
msgstr "Méssage"
#~ msgid ""
#~ "The requested controller could not be mapped to an existing controller "
#~ "class."
#~ msgstr ""
#~ "Le contrôleur demandé ne correspond pas à une classe existante de "
#~ "contrôleur."
msgid "Stack trace"
msgstr "Pile d'exécution"
#~ msgid "The requested controller was not dispatchable."
#~ msgstr "Le contrôleur demandé n'est pas dispatchable."
msgid "Previous exceptions"
msgstr "Exceptions précédentes"
#~ msgid "The requested URL could not be matched by routing."
#~ msgstr "L'URL demandée n'a pas pu trouver de route correspondante."
msgid "No Exception available"
msgstr "Aucune exception disponible"
#~ msgid "We cannot determine at this time why a 404 was generated."
#~ msgstr ""
#~ "Nous ne pouvons pas déterminer pour le moment pourquoi une 404 a été "
#~ "générée."
msgid "A 404 error occurred"
msgstr "Une erreur 404 est survenue"
#~ msgid "Controller"
#~ msgstr "Contrôleur"
msgid "The requested controller was unable to dispatch the request."
msgstr "Le contrôleur demandé n'a pas pu dispatcher la requête."
#~ msgid "resolves to %s"
#~ msgstr "résout en %s"
msgid "The requested URL could not be matched by routing."
msgstr "L'URL demandée n'a pas pu trouver de route correspondante."
#~ msgid "Exception"
#~ msgstr "Exception"
msgid "An error occurred during execution; please try again later."
msgstr "Une erreur est survenue pendant l'exécution; Merci de réessayer plus tard."
\ No newline at end of file
......@@ -7,6 +7,7 @@ use UnicaenApp\View\Helper\TagViewHelper;