diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..8b26da7fa3eebadad167f4abae021e498a96898e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM php:7.3-apache
+
+# Install modules
+RUN apt-get update \
+ && apt-get install -y zlib1g zlib1g-dev libpq-dev libpq5 libzip-dev zip unzip \
+ && docker-php-ext-install pgsql pdo_pgsql zip
+
+RUN a2enmod rewrite
+
+COPY . /srv/app
+COPY ./conf-dev/vhost.conf /etc/apache2/sites-available/000-default.conf
+
+WORKDIR /srv/app
+
+CMD ["apache2-foreground"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..b0767bbf5f4cf2a5f305a629191169efbb282492
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,53 @@
+UID := 1000
+GID := 1000
+
+list:
+ @echo ""
+ @echo "Useful targets:"
+ @echo ""
+ @echo " install_php > install php composer dependancies"
+ @echo " install_frontend > install frontend dependancies (js, css...)"
+ @echo " up > build php image and start jdev-boarding containers for dev only (php + mailer)"
+ @echo " start > start jdev-boarding containers"
+ @echo " restart > restart jdev-boarding containers"
+ @echo " stop > stop and kill running jdev-boarding containers"
+ @echo " logs > display jdev-boarding containers logs"
+ @echo " shell > shell into php jdev-boarding container"
+ @echo " gendb > generate the jdev-boarding database"
+ @echo " remove-pgdata > remove the volume of database"
+ @echo ""
+
+install_php:
+ @docker run --init -it --rm --user $(UID):$(GID) \
+ -e COMPOSER_CACHE_DIR=/dev/null \
+ -v $(CURDIR):/project \
+ -w /project jakzal/phpqa composer install --ignore-platform-reqs
+
+install_frontend:
+ @docker build -t jdev-bower conf-dev/npm && docker run --init -it --rm --user $(UID):$(GID) \
+ -v $(CURDIR):/project \
+ -w /project jdev-bower bower install
+
+up:
+ @docker-compose up --build -d
+
+start:
+ @docker-compose up -d
+
+restart: stop start
+
+stop:
+ @docker-compose kill
+ @docker-compose rm -v --force
+
+logs:
+ @docker-compose logs -f -t
+
+shell:
+ @docker-compose exec php bash
+
+gendb:
+ @docker-compose exec php ./vendor/bin/doctrine orm:schema-tool:create
+
+remove-pgdata:
+ @docker volume rm jdev-boarding_pgdata
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d4faa353fab179f172362f1a17c5510f036c42bf
--- /dev/null
+++ b/README.md
@@ -0,0 +1,83 @@
+# JDEV BOARDING
+
+## Introduction
+
+Jdev-boarding est le logiciel utilisé pour les inscriptions et le suivi de l'évenement des JDEVs.
+
+Le logiciel jdev-boarding est sous licence `CeCILL` (voir le fichier LICENCE Ã la racine du projet).
+
+## Authors
+
+Voici la liste des personnes ayant participées au projet jdev-boarding:
+
+* `Chrystel Moreau` : Laboratoire d'Astrophysique de Marseille (CNRS)
+* `François Agneray` : Laboratoire d'Astrophysique de Marseille (CNRS)
+
+# Guide d'installation
+
+## Prérequis
+
+Avant de vous lancer dans l'installation du logiciel jdev-boarding sur votre machine, vous devez vous assurer que les commandes suivantes sont installées sur votre ordinateur:
+
+1. `make`
+2. `docker`
+3. `docker-compose`
+
+Vous aurez également besoin d'une connexion Internet pour effectuer l'installation.
+
+## La liste des commandes
+
+Le fichier `Makefile` que vous pouvez trouver à la racine du projet contient l'ensemble des commandes disponibles et qui vous aiderons dans l'installation et le démarrage du logiciel.
+
+Pour voir la liste des commandes possibles vous pouvez ouvrir un terminal et taper:
+
+> make
+
+**Attention**: Le fichier `docker-compose.yml` et les commandes du ` Makefile` ne doivent être utilisées que pour le dévloppement et non pas dans un mode production.
+
+## Installation des dépendances
+
+Pour effectuer l'installation des dépendances php et des dépendances `frontend` (js, css...), tapez:
+
+> make install_php
+
+L'outil `Composer.phar` va télécharger automatiquement les dépendances php qui sont listées dans le fichier `composer.json`. Les dépendances seront stockées dans un dossier `vendor` du projet.
+
+> make install_frontend
+
+L'outil `bower` va télécharger automatiquement les dépendances front (js, css) qui sont listées dans le fichier `bower.json`.
+Les dépendandes seront stockées dans un dossier `public/bower_components` du projet.
+
+Après cela jdev-boarding peut fonctionner.
+
+## Lancement du jdev-boarding
+
+Jdev-boarding est configuré pour fonctionner dans un environnement docker. Si vous ouvrez le fichier `docker-compose.yml` vous pouvez voir les conteneurs qui sont utilisés dans le mode développement.
+
+`Makefile` fournit une liste de commandes pour builder et lancer les conteneurs:
+
+> make up
+
+**Note:** Cette commande utilise le fichier `docker-compose` pour fonctionner. Les opérations peuvent prendre quelques minutes car cela nécessite de télécharger des images sur le docker hub.
+
+Vous pouvez lister les conteneurs qui tournent sur votre machine:
+
+> docker-compose ps
+
+Vous pouvez aussi afficher les logs des conteneurs lancés:
+
+> make logs
+
+## Installation de la base de données
+
+Jdev-boarding à besoin d'une base de données pour fonctionner.
+
+Pour pouvoir générer les tables automatiquement vous pouvez lancer la commane suivante:
+
+> make gendb
+
+## Accès
+
+Vous poucez maintenant vous rendre sur votre navigateur pour afficher le boarding:
+
+> http://localhost:8080
diff --git a/VERSION b/VERSION
index 56e972a21b211a8e46c0fc8a960f05d6bf06b8d5..389f7740ee0e4952d9c89a4854e132e222e8df59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5
\ No newline at end of file
+4.0
\ No newline at end of file
diff --git a/app/actions.php b/app/actions.php
index 02eb02f11a3ffaf59d9cd9dbef5a0d231ea28116..edc8d12b23d951fe7a7a3fd11d05e9dbf7fcf408 100644
--- a/app/actions.php
+++ b/app/actions.php
@@ -57,12 +57,8 @@ $container[App\Action\InscriptionAction::class] = function ($c) {
return new App\Action\InscriptionAction($c->get('view'), $c->get('logger'), $c->get('em'), $c->get('mailer'), $c->get('settings'));
};
-$container[App\Action\ConfirmInscriptionAction::class] = function ($c) {
- return new App\Action\ConfirmInscriptionAction($c->get('view'), $c->get('logger'), $c->get('em'), $c->get('mailer'));
-};
-
$container[App\Action\ConnexionAction::class] = function ($c) {
- return new App\Action\ConnexionAction($c->get('view'), $c->get('logger'), $c->get('em'));
+ return new App\Action\ConnexionAction($c->get('view'), $c->get('logger'), $c->get('em'), $c->get('settings'));
};
// =============================================================
diff --git a/app/dependencies.php b/app/dependencies.php
index 29a152b2b6712632bd024ddba8649334f1cef903..61c26b9132b731c299ff3a57b19d90b4e0da921c 100644
--- a/app/dependencies.php
+++ b/app/dependencies.php
@@ -13,16 +13,10 @@
// DIC configuration
$container = $app->getContainer();
-// Error Handler
-
-// $container['errorHandler'] = function ($c) {
-// return new App\Action\CustomHandler($c->get('view'), $c->get('logger'));
-// };
-
// Twig
$container['view'] = function ($c) {
$settings = $c->get('settings');
- $view = new Slim\Views\Twig($settings['view']['template_path'], $settings['view']['twig']);
+ $view = new Slim\Views\Twig(__DIR__ . '/templates', $settings['view']['twig']);
// Add extensions
$view->addExtension(new Slim\Views\TwigExtension($c->get('router'), $c->get('request')->getUri()));
$view->addExtension(new Twig_Extension_Debug());
@@ -34,17 +28,16 @@ $container['em'] = function ($c) {
$settings = $c->get('settings');
$metadata = $settings['database'];
$c = \Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration(
- $metadata['entity_path'],
+ array('app/src/Entity'),
$metadata['dev_mode']
);
- $c->setProxyDir(getcwd() . '/' . $metadata['path_proxy']);
+ $c->setProxyDir($metadata['path_proxy']);
if ($metadata['dev_mode']) {
$c->setAutoGenerateProxyClasses(true);
} else {
$c->setAutoGenerateProxyClasses(false);
}
- $em = \Doctrine\ORM\EntityManager::create($metadata['connection_options'], $c);
- return $em;
+ return \Doctrine\ORM\EntityManager::create($metadata['connection_options'], $c);
};
// monolog
@@ -60,8 +53,7 @@ $container['logger'] = function ($c) {
$container['mailer'] = function ($c) {
$settings = $c->get('settings');
$transport = \Swift_SmtpTransport::newInstance($settings['mailer']['host'], $settings['mailer']['port']);
- $mailer = \Swift_Mailer::newInstance($transport);
- return $mailer;
+ return \Swift_Mailer::newInstance($transport);
};
// -----------------------------------------------------------------------------
@@ -69,10 +61,9 @@ $container['mailer'] = function ($c) {
// -----------------------------------------------------------------------------
$container['App\Middleware\TokenMiddleware'] = function ($c) {
- return new App\Middleware\TokenMiddleware($c->get('logger'));
+ return new App\Middleware\TokenMiddleware($c->get('logger'), $c->get('settings'));
};
$container['App\Middleware\DatabaseAccessMiddleware'] = function ($c) {
return new App\Middleware\DatabaseAccessMiddleware($c->get('logger'), $c->get('em'));
};
-
diff --git a/app/middleware.php b/app/middleware.php
deleted file mode 100644
index 5ee1f77362123f19358c807cab6c7c08ad005035..0000000000000000000000000000000000000000
--- a/app/middleware.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-// Application middleware
-// e.g: $app->add(new \Slim\Csrf\Guard);
-//$app->add(App\Middleware\DatabaseAccessMiddleware::class);
diff --git a/app/settings.php b/app/settings.php
index 90f849a9bca471a89db219901326d93b8e201bb6..50a047a2efbbbccf4f9ec6378ce9ed366ee91424 100644
--- a/app/settings.php
+++ b/app/settings.php
@@ -14,50 +14,57 @@ return [
'settings' => [
// Slim Settings
'determineRouteBeforeAppMiddleware' => false,
- 'displayErrorDetails' => true,
+ 'displayErrorDetails' => getenv('SLIM_DISPLAY_ERROR_DETAILS'),
// View settings
'view' => [
- 'template_path' => __DIR__ . '/templates',
'twig' => [
- 'cache' => __DIR__ . '/../cache/twig',
- 'debug' => true,
- 'auto_reload' => true,
+ 'cache' => getenv('TWIG_CACHE'),
+ 'debug' => getenv('TWIG_DEBUG'),
+ 'auto_reload' => getenv('TWIG_AUTO_RELOAD'),
],
],
// monolog settings
'logger' => [
- 'name' => 'app',
- 'path' => __DIR__ . '/../log/app.log',
+ 'name' => getenv('LOGGER_NAME'),
+ 'path' => getenv('LOGGER_PATH'),
],
// database settings (doctrine 2)
- 'database' => [
- 'entity_path' => ['app/src/Entity'],
- 'path_proxy' => 'cache/doctrine_proxy',
- 'dev_mode' => true,
- 'connection_options' => [
- 'driver' => 'pdo_pgsql',
- 'host' => 'cesamsidb',
- 'user' => 'jdev',
- 'password' => 'jdev2017',
- 'dbname' => 'jdevdb' // jdevdb (dev), jdev2017 (prod)
- ]
- ],
+ 'database' => [
+ 'path_proxy' => getenv('DOCTRINE_PATH_PROXY'),
+ 'dev_mode' => getenv('DOCTRINE_DEV_MODE'),
+ 'connection_options' => [
+ 'driver' => getenv('DB_DRIVER'),
+ 'host' => getenv('DB_HOST'), // cesamsidb (@LAM), db (@local)
+ 'user' => getenv('DB_USER'),
+ 'password' => getenv('DB_PASSWORD'),
+ 'dbname' => getenv('DB_DBNAME') // jdevdb (dev), jdev2017 (prod)
+ ]
+ ],
'mailer' => [
- 'host' => 'smtp.osupytheas.fr', //localhost (dev), smtp.osupytheas.fr (prod)
- 'port' => 1025 // 1025 (dev), 25 (prod)
+ 'host' => getenv('MAILER_HOST'), //localhost (dev), smtp.osupytheas.fr (prod)
+ 'port' => getenv('MAILER_PORT') // 1025 (dev), 25 (prod)
],
// JDEV settings
'jdev' => [
'label' => 'JDEV2017',
'url' => 'jdev2017.fr',
'email' => 'chrystel.moreau@lam.fr', // jdev2017-inscription@univ-amu.fr (prod)
+ 'email_clo' => 'jdev2017-co@univ-amu.fr',
+ 'email_sponsor' => 'jdev2017-sponsor@univ-amu.fr',
+ 'email_programme' => 'jdev2017-programme@univ-amu.fr',
+ 'email_info' => 'jdev2017@univ-amu.fr',
'date_debut' => '2017-07-04', //'04/07/2017',
'date_fin' => '2017-07-07', //'07/07/2017',
- 'j1' => '2017-07-04',
- 'j2' => '2017-07-05',
- 'j3' => '2017-07-06',
+ 'j1' => '2017-07-04',
+ 'j2' => '2017-07-05',
+ 'j3' => '2017-07-06',
'j4' => '2017-07-07',
- 'version' => 3, // 1 version de base, 2 version avec le sondage actif, 3 version avec le parcours actif , 4 version durant les JDEVs, 5 apres les JDEVs
+ // 1 version de base
+ // 2 version avec le sondage actif
+ // 3 version avec le parcours actif
+ // 4 version durant les JDEVs
+ // 5 apres les JDEVs
+ 'version' => 3
]
]
];
diff --git a/app/src/Action/AdminValidPaiementAction.php b/app/src/Action/AdminValidPaiementAction.php
index 09e91728df7e5e915079865ebc70c97231521f92..e8d754290bc4759a7af92faa0bd2ffced5818f65 100644
--- a/app/src/Action/AdminValidPaiementAction.php
+++ b/app/src/Action/AdminValidPaiementAction.php
@@ -24,7 +24,7 @@ final class AdminValidPaiementAction
private $em;
private $mailer;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
{
$this->view = $view;
@@ -33,7 +33,7 @@ final class AdminValidPaiementAction
$this->mailer = $mailer;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("admin valid paiement page action dispatched");
@@ -44,7 +44,7 @@ final class AdminValidPaiementAction
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_admin') ) {
+ if (($roleSI != 'admin') && ($roleSI != 'clo_admin')) {
return $response->withStatus(401);
}
@@ -61,46 +61,40 @@ final class AdminValidPaiementAction
// Si invalidation d'une place pre-payée
if ($valid == 'false') {
$organisme = $this->getOrganisme($participant->getOrganisme()->getId());
-
$participant->setAccesValide(false);
$participant->setPassPrepaye(false);
$organisme->setNbLibres($organisme->getNbLibres() + 1);
$this->em->flush();
$this->sendEmailInvalidation($participant);
return $response;
- }
- // Si validation du paiment Azur-Colloque
- else {
+ } else {
+ // Si validation du paiment Azur-Colloque
$participant->setAccesValide(true);
$this->em->flush();
$this->sendEmailPaiement($participant);
return $response;
- }
-
-
+ }
}
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => strtolower($email)));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return true;
}
}
-
private function getOrganisme($orga_id)
{
$organisme = $this->em->getRepository('App\Entity\Organisme')->findOneBy(array('id' => $orga_id));
- if(isset($organisme)) {
+ if (isset($organisme)) {
return $organisme;
} else {
return true;
}
}
-
private function sendEmailInvalidation($participant)
{
@@ -114,7 +108,7 @@ final class AdminValidPaiementAction
$body .= 'Bien cordialement' . PHP_EOL;
$body .= 'Le comité d\'organisation des ' . $this->settings['jdev']['label'];
- $message = \Swift_Message::newInstance('Invalidation place pré-payée '. $this->settings['jdev']['label'])
+ $message = \Swift_Message::newInstance('Invalidation place pré-payée ' . $this->settings['jdev']['label'])
->setFrom(['noreply@' . $this->settings['jdev']['url'] => $this->settings['jdev']['url']])
->setTo([$participant->getEmail(), $this->settings['jdev']['email']])
->setBody($body);
diff --git a/app/src/Action/AdminValidRoleAction.php b/app/src/Action/AdminValidRoleAction.php
index ea25f71d034481358109511aeb79bbcdcf0c9864..bc7e831ab469bc5500fa4c53c0b6b8356eb106b4 100644
--- a/app/src/Action/AdminValidRoleAction.php
+++ b/app/src/Action/AdminValidRoleAction.php
@@ -19,54 +19,54 @@ use Psr\Http\Message\ResponseInterface as Response;
final class AdminValidRoleAction
{
- private $view;
- private $logger;
- private $em;
+ private $view;
+ private $logger;
+ private $em;
private $mailer;
private $settings;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
- $this->mailer = $mailer;
- $this->settings = $settings;
- }
-
- public function __invoke(Request $request, Response $response, $args)
- {
- $this->logger->info("admin valid role page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
+ $this->mailer = $mailer;
+ $this->settings = $settings;
+ }
- if ($roleSI != 'admin') {
- return $response->withStatus(401);
- }
+ public function __invoke(Request $request, Response $response, $args)
+ {
+ $this->logger->info("admin valid role page action dispatched");
- if (!array_key_exists('email', $params)) {
- return $response->withStatus(400);
- }
-
- $participant = $this->getParticipant($params['email']);
- if (!$participant) {
- return $response->withStatus(400);
- }
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
+
+ if ($roleSI != 'admin') {
+ return $response->withStatus(401);
+ }
+
+ if (!array_key_exists('email', $params)) {
+ return $response->withStatus(400);
+ }
+
+ $participant = $this->getParticipant($params['email']);
+ if (!$participant) {
+ return $response->withStatus(400);
+ }
- $participant->setCloValide(true);
- $participant->setAccesValide(true);
- $this->em->flush();
- $this->sendEmail($participant);
-
- return $response;
+ $participant->setCloValide(true);
+ $participant->setAccesValide(true);
+ $this->em->flush();
+ $this->sendEmail($participant);
+
+ return $response;
}
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => strtolower($email)));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
diff --git a/app/src/Action/ChangePasswdAction.php b/app/src/Action/ChangePasswdAction.php
index 534d27b9917a81215406bdd6d3d2f8095a555551..9a86c27035a07ec5712f5821527c111708dd60a4 100644
--- a/app/src/Action/ChangePasswdAction.php
+++ b/app/src/Action/ChangePasswdAction.php
@@ -19,59 +19,58 @@ use Psr\Http\Message\ResponseInterface as Response;
final class ChangePasswdAction
{
- private $view;
- private $logger;
+ private $view;
+ private $logger;
private $em;
private $mailer;
private $settings;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
- {
- $this->view = $view;
- $this->logger = $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->mailer = $mailer;
$this->em = $em;
$this->settings = $settings;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Change Password page action dispatched");
- if($request->isGet()) {
+ if ($request->isGet()) {
$this->view->render($response, 'change_passwd.twig', [
- 'page' => 'change-passwd'
- ]);
+ 'page' => 'change-passwd'
+ ]);
}
- if($request->isPost()) {
- $parsedBody = $request->getParsedBody();
+ if ($request->isPost()) {
+ $parsedBody = $request->getParsedBody();
$error = false;
$code = 200;
$messages = array();
- if ($this->isEmptyField('email', $parsedBody)) {
- $error = true;
- $code = 400;
- $messages[] = 'Champ email vide';
- }
+ if ($this->isEmptyField('email', $parsedBody)) {
+ $error = true;
+ $code = 400;
+ $messages[] = 'Champ email vide';
+ }
if ($this->isEmptyField('apassword', $parsedBody)) {
- $error = true;
- $code = 400;
- $messages[] = 'Champ ancien password vide';
- }
+ $error = true;
+ $code = 400;
+ $messages[] = 'Champ ancien password vide';
+ }
if ($this->isEmptyField('npassword', $parsedBody)) {
- $error = true;
- $code = 400;
- $messages[] = 'Champ nouveau password vide';
- }
+ $error = true;
+ $code = 400;
+ $messages[] = 'Champ nouveau password vide';
+ }
$participant = $this->getParticipant($parsedBody);
- if (!$participant)
- {
+ if (!$participant) {
$error = true;
$code = 400;
$messages[] = 'L\'adresse email ne correspond à aucun participant';
@@ -83,7 +82,7 @@ final class ChangePasswdAction
}
}
- if ($error) {
+ if ($error) {
$response = $response->write(implode('<br>', $messages))->withStatus($code);
} else {
$participant->setPassword(password_hash($parsedBody['npassword'], PASSWORD_DEFAULT));
@@ -93,14 +92,13 @@ final class ChangePasswdAction
$response = $response->write(json_encode(array('ok')))->withStatus($code);
}
- }
-
+ }
return $response;
}
- private function isEmptyField($field, $parsedBody)
+ private function isEmptyField($field, $parsedBody)
{
- if(!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
+ if (!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
return true;
} else {
return false;
@@ -109,21 +107,21 @@ final class ChangePasswdAction
private function getParticipant($parsedBody)
{
- if($this->isEmptyField('email', $parsedBody)) {
+ if ($this->isEmptyField('email', $parsedBody)) {
return false;
}
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => strtolower($parsedBody['email'])));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
}
}
- private function verifEmail($parsedBody)
+ private function verifEmail($parsedBody)
{
- if($this->isEmptyField('email', $parsedBody)) {
+ if ($this->isEmptyField('email', $parsedBody)) {
return true;
}
diff --git a/app/src/Action/ConnexionAction.php b/app/src/Action/ConnexionAction.php
index ef06b4abf72b7c755b713cb408bcae8f8bb06243..8e51ceab9e122e37aa5e845b66a260780e85c3ec 100644
--- a/app/src/Action/ConnexionAction.php
+++ b/app/src/Action/ConnexionAction.php
@@ -21,35 +21,37 @@ use Lcobucci\JWT\Signer\Hmac\Sha256;
final class ConnexionAction
{
- private $view;
- private $logger;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
+ private $view;
+ private $logger;
+ private $settings;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ $this->settings = $settings;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Connexion page action dispatched");
- if($request->isGet()) {
+ if ($request->isGet()) {
$this->view->render($response, 'connexion.twig', [
'page' => 'connexion'
]);
}
- if($request->isPost()) {
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$error = false;
$code = 200;
$messages = array();
- foreach(array('email', 'password') as $a) {
- if($this->isEmptyField($a, $parsedBody)) {
+ foreach (array('email', 'password') as $a) {
+ if ($this->isEmptyField($a, $parsedBody)) {
$error = true;
$code = 400;
$messages[] = 'Champ ' . $a . ' vide';
@@ -57,7 +59,7 @@ final class ConnexionAction
}
$participant = $this->getParticipant($parsedBody);
- if(!$participant) {
+ if (!$participant) {
$error = true;
$code = 400;
$messages[] = 'Mauvais couple email + password';
@@ -75,12 +77,12 @@ final class ConnexionAction
}
}
- if($error) {
+ if ($error) {
$response = $response->write(implode(PHP_EOL, $messages))->withStatus($code);
} else {
$token = $this->generateToken($participant->getEmail(), $participant->getRoleSI());
$a = array('token' => (string) $token, 'roleSI' => $participant->getRoleSI(), 'orga' => $participant->getOrganisme()->getId());
- $response = $response->write(json_encode($a))->withHeader('Content-type', 'application/json');;
+ $response = $response->write(json_encode($a))->withHeader('Content-type', 'application/json');
}
}
@@ -89,7 +91,7 @@ final class ConnexionAction
private function isEmptyField($field, $parsedBody)
{
- if(!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
+ if (!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
return true;
} else {
return false;
@@ -98,12 +100,12 @@ final class ConnexionAction
private function getParticipant($parsedBody)
{
- if($this->isEmptyField('email', $parsedBody)) {
+ if ($this->isEmptyField('email', $parsedBody)) {
return false;
}
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => strtolower($parsedBody['email'])));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
@@ -115,8 +117,8 @@ final class ConnexionAction
// TODO: Augmenter la force de la signature du jeton
$signer = new Sha256();
$token = (new Builder())
- ->setIssuer('http://jdev2017.fr') // Emetteur du jeton
- ->setAudience('http://jdev2017.fr') // Recepteur du jeton
+ ->setIssuer($this->settings['jdev']['url']) // Emetteur du jeton
+ ->setAudience($this->settings['jdev']['url']) // Recepteur du jeton
->setIssuedAt(time()) // Date à laquelle le jeton a été généré
->setNotBefore(time()) // Date à laquelle le jeton pourra être utilisé
->setExpiration(time() + 86400) // Date d'éxpiration du jeton
diff --git a/app/src/Action/ContactAction.php b/app/src/Action/ContactAction.php
index a9e6a2487c1f9964d97da88ced5177fb692ff0ba..d98902fd973cd0f5b08a31db622be22764416647 100644
--- a/app/src/Action/ContactAction.php
+++ b/app/src/Action/ContactAction.php
@@ -18,16 +18,16 @@ use Psr\Http\Message\ResponseInterface as Response;
final class ContactAction
{
- private $view;
- private $logger;
-
- public function __construct(Twig $view, LoggerInterface $logger)
- {
- $this->view = $view;
- $this->logger = $logger;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("contact page action dispatched");
diff --git a/app/src/Action/CustomHandler.php b/app/src/Action/CustomHandler.php
index c65257d3859373bcb77b8db2fde54fc6cf8f5659..a28bc378812d0b7ffea1b4d325affb3e383b3f8b 100644
--- a/app/src/Action/CustomHandler.php
+++ b/app/src/Action/CustomHandler.php
@@ -16,17 +16,19 @@ use Psr\Log\LoggerInterface;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Message\ResponseInterface as Response;
-class CustomHandler {
+class CustomHandler
+{
private $view;
- private $logger;
-
- public function __construct(Twig $view, LoggerInterface $logger)
- {
- $this->view = $view;
- $this->logger = $logger;
- }
+ private $logger;
- public function __invoke($request, $response, $args) {
+ public function __construct(Twig $view, LoggerInterface $logger)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ }
+
+ public function __invoke($request, $response, $args)
+ {
$this->logger->info("Connexion page action dispatched");
$this->view->render($response, 'error.twig', [
diff --git a/app/src/Action/DashboardAction.php b/app/src/Action/DashboardAction.php
index 918379371e060ab1201ed6e744b1f919c99bb764..557800f1f5e25e6ac8894a3adb5234b6661cfa1d 100644
--- a/app/src/Action/DashboardAction.php
+++ b/app/src/Action/DashboardAction.php
@@ -23,7 +23,7 @@ final class DashboardAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,43 +31,36 @@ final class DashboardAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard page action dispatched");
$params = $request->getQueryParams();
- $token = $params['token'];
- $email = $request->getAttribute('email');
- $participant = $this->getParticipant($email);
+ $token = $params['token'];
+ $email = $request->getAttribute('email');
+ $participant = $this->getParticipant($email);
$roleSI = $request->getAttribute('roleSI');
$a = [
'token' => $token,
'participant' => $participant,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'jdev' => $this->settings['jdev']
];
-// $this->view->render($response, 'dashboard_home.twig', [
-// 'page' => 'dashboard',
-// 'token' => $token,
-// 'participant' => $participant,
-// 'jdev' => $this->settings['jdev']
-// ]);
- if ( ($roleSI == 'admin') || ($roleSI == 'clo') || ($roleSI == 'clo_pgm') ){
- $this->view->render($response, 'dashboard_admin_profil.twig', $a);
- }
- else {
- $this->view->render($response, 'dashboard_home.twig', $a);
+ if (($roleSI == 'admin') || ($roleSI == 'clo') || ($roleSI == 'clo_pgm')) {
+ $this->view->render($response, 'dashboard_admin_profil.twig', $a);
+ } else {
+ $this->view->render($response, 'dashboard_home.twig', $a);
}
return $response;
}
- private function getParticipant($email)
+ private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
diff --git a/app/src/Action/DashboardAdminAction.php b/app/src/Action/DashboardAdminAction.php
index 51aedfb5b7642f076ec37464b440dde84a82a23a..b136e4ae8668d9b4605b9d639b7cbf2891593661 100644
--- a/app/src/Action/DashboardAdminAction.php
+++ b/app/src/Action/DashboardAdminAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,84 +31,82 @@ final class DashboardAdminAction
$this->em = $em;
$this->settings = $settings;
}
-
-
+
+
public function __invoke(Request $request, Response $response, $args)
- {
- $this->logger->info("dashboard admin page action dispatched");
+ {
+ $this->logger->info("dashboard admin page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_admin') && ($roleSI != 'clo') && ($roleSI != 'clo_pgm') ){
- return $response->withStatus(401);
- }
+ if (($roleSI != 'admin') && ($roleSI != 'clo_admin') && ($roleSI != 'clo') && ($roleSI != 'clo_pgm')) {
+ return $response->withStatus(401);
+ }
- $role_orga = $this->getRoles();
- $organisateurs = $this->getOrganisteurs();
- $invites = $this->getInvites();
- $sponsors = $this->getSponsors();
- $exposants = $this->getExposants();
- $accompagnants = $this->getAccompagnants();
-
- $this->view->render($response, 'dashboard_admin_home.twig', [
- 'page' => 'dashboard-admin',
- 'token' => $token,
- 'role_si'=> $roleSI,
- 'role_orga' => $role_orga,
- 'organisateurs' => $organisateurs,
- 'invites' => $invites,
- 'sponsors' => $sponsors,
- 'exposants' => $exposants,
- 'accompagnants' => $accompagnants,
- 'jdev' => $this->settings['jdev']
- ]);
-
- return $response;
+ $role_orga = $this->getRoles();
+ $organisateurs = $this->getOrganisteurs();
+ $invites = $this->getInvites();
+ $sponsors = $this->getSponsors();
+ $exposants = $this->getExposants();
+ $accompagnants = $this->getAccompagnants();
+
+ $this->view->render($response, 'dashboard_admin_home.twig', [
+ 'page' => 'dashboard-admin',
+ 'token' => $token,
+ 'role_si' => $roleSI,
+ 'role_orga' => $role_orga,
+ 'organisateurs' => $organisateurs,
+ 'invites' => $invites,
+ 'sponsors' => $sponsors,
+ 'exposants' => $exposants,
+ 'accompagnants' => $accompagnants,
+ 'jdev' => $this->settings['jdev']
+ ]);
+
+ return $response;
}
-
- public function getRoles() {
+ public function getRoles()
+ {
$dql = "SELECT a FROM App\Entity\Role a ORDER BY a.label DESC";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
private function getOrganisteurs()
{
- $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Organisateur' ORDER BY p.dateInscription DESC";
+ $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Organisateur' ORDER BY p.dateInscription DESC";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
private function getInvites()
{
- $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Invité' ORDER BY p.dateInscription DESC";
+ $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Invité' ORDER BY p.dateInscription DESC";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
private function getSponsors()
{
- $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Sponsor' ORDER BY p.dateInscription DESC";
+ $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Sponsor' ORDER BY p.dateInscription DESC";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
- private function getExposants()
+ private function getExposants()
{
- $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Exposant' ORDER BY p.dateInscription DESC";
+ $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Exposant' ORDER BY p.dateInscription DESC";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
private function getAccompagnants()
{
- $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Accompagnant' ORDER BY p.dateInscription DESC";
+ $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Accompagnant' ORDER BY p.dateInscription DESC";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardAdminAddEditSalleAction.php b/app/src/Action/DashboardAdminAddEditSalleAction.php
index 2aae307123e6bad43f15cee833eba71cdac2421f..e27d5b1882714b2834e946df77601ff8ba8f244b 100644
--- a/app/src/Action/DashboardAdminAddEditSalleAction.php
+++ b/app/src/Action/DashboardAdminAddEditSalleAction.php
@@ -23,86 +23,85 @@ final class DashboardAdminAddEditSalleAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
$this->settings = $settings;
- }
-
-
+ }
+
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin add edit salle page action dispatched");
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
-
- if ($roleSI != 'admin') {
- return $response->withStatus(401);
- }
+ if ($roleSI != 'admin') {
+ return $response->withStatus(401);
+ }
- if($request->isGet()) {
- $a = [
- 'page' => 'dashboard-admin-add-edit-salle',
- 'token' => $token,
- 'role_si'=> $roleSI,
- 'jdev' => $this->settings['jdev']
- ];
- if (array_key_exists('salle_id', $params)) {
- $salle = $this->em->find('App\Entity\Salle', $params['salle_id']);
- $a['salle'] = $salle;
- };
- $this->view->render($response, 'dashboard_admin_add_edit_salle.twig', $a);
- }
+ if ($request->isGet()) {
+ $a = [
+ 'page' => 'dashboard-admin-add-edit-salle',
+ 'token' => $token,
+ 'role_si' => $roleSI,
+ 'jdev' => $this->settings['jdev']
+ ];
+ if (array_key_exists('salle_id', $params)) {
+ $salle = $this->em->find('App\Entity\Salle', $params['salle_id']);
+ $a['salle'] = $salle;
+ };
+ $this->view->render($response, 'dashboard_admin_add_edit_salle.twig', $a);
+ }
- if($request->isPost()) {
- $parsedBody = $request->getParsedBody();
+ if ($request->isPost()) {
+ $parsedBody = $request->getParsedBody();
- $salle = new \App\Entity\Salle();
- $salle->setNom($parsedBody['nom']);
- $salle->setEtage($parsedBody['etage']);
- $salle->setAile($parsedBody['aile']);
- $salle->setWifi($parsedBody['wifi']);
- $salle->setReseau($parsedBody['reseau']);
- $salle->setVideoprojecteur($parsedBody['videoprojecteur']);
- $salle->setDescription($parsedBody['description']);
- $salle->setQuotaOfficiel($parsedBody['quota_officiel']);
- $salle->setQuotaPhysique($parsedBody['quota_physique']);
- $this->em->persist($salle);
- $this->em->flush();
+ $salle = new \App\Entity\Salle();
+ $salle->setNom($parsedBody['nom']);
+ $salle->setEtage($parsedBody['etage']);
+ $salle->setAile($parsedBody['aile']);
+ $salle->setWifi($parsedBody['wifi']);
+ $salle->setReseau($parsedBody['reseau']);
+ $salle->setVideoprojecteur($parsedBody['videoprojecteur']);
+ $salle->setDescription($parsedBody['description']);
+ $salle->setQuotaOfficiel($parsedBody['quota_officiel']);
+ $salle->setQuotaPhysique($parsedBody['quota_physique']);
+ $this->em->persist($salle);
+ $this->em->flush();
- $response = $response->write('Nouvelle salle enregistrée')->withStatus(201);
- }
+ $response = $response->write('Nouvelle salle enregistrée')->withStatus(201);
+ }
- if($request->isPut()) {
- $parsedBody = $request->getParsedBody();
+ if ($request->isPut()) {
+ $parsedBody = $request->getParsedBody();
- $salle = $this->em->find('App\Entity\Salle', $parsedBody['salle_id']);
- $salle->setNom($parsedBody['nom']);
- $salle->setEtage($parsedBody['etage']);
- $salle->setAile($parsedBody['aile']);
- $salle->setWifi($parsedBody['wifi']);
- $salle->setReseau($parsedBody['reseau']);
- $salle->setVideoprojecteur($parsedBody['videoprojecteur']);
- $salle->setDescription($parsedBody['description']);
- $salle->setQuotaOfficiel($parsedBody['quota_officiel']);
- $salle->setQuotaPhysique($parsedBody['quota_physique']);
- $this->em->flush();
+ $salle = $this->em->find('App\Entity\Salle', $parsedBody['salle_id']);
+ $salle->setNom($parsedBody['nom']);
+ $salle->setEtage($parsedBody['etage']);
+ $salle->setAile($parsedBody['aile']);
+ $salle->setWifi($parsedBody['wifi']);
+ $salle->setReseau($parsedBody['reseau']);
+ $salle->setVideoprojecteur($parsedBody['videoprojecteur']);
+ $salle->setDescription($parsedBody['description']);
+ $salle->setQuotaOfficiel($parsedBody['quota_officiel']);
+ $salle->setQuotaPhysique($parsedBody['quota_physique']);
+ $this->em->flush();
- $response = $response->write('Salle n°' . $salle->getId() . ' modifiée')->withStatus(201);
- }
+ $response = $response->write('Salle n°' . $salle->getId() . ' modifiée')->withStatus(201);
+ }
- if ($request->isDelete()) {
- $salle = $this->em->find('App\Entity\Salle', $params['salle_id']);
- $this->em->remove($salle);
- $this->em->flush();
- $response = $response->write('Salle id: ' . $params['salle_id'] . ' supprimée')->withStatus(200);
- }
-
+ if ($request->isDelete()) {
+ $salle = $this->em->find('App\Entity\Salle', $params['salle_id']);
+ $this->em->remove($salle);
+ $this->em->flush();
+ $response = $response->write('Salle id: ' . $params['salle_id'] . ' supprimée')->withStatus(200);
+ }
+
return $response;
}
}
diff --git a/app/src/Action/DashboardAdminAgendaAction.php b/app/src/Action/DashboardAdminAgendaAction.php
index 29a2ab239b1e43942838a98d8a9bb269b70f932f..4fc737a0750eb0f74b194925896879de93cf2d24 100644
--- a/app/src/Action/DashboardAdminAgendaAction.php
+++ b/app/src/Action/DashboardAdminAgendaAction.php
@@ -40,7 +40,7 @@ final class DashboardAdminAgendaAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo') ){
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo')) {
return $response->withStatus(401);
}
$salles = $this->getSalles();
@@ -49,44 +49,48 @@ final class DashboardAdminAgendaAction
$a = [
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'salles' => $salles,
'thematiques' => $thematiques,
'intervenants' => $intervenants,
'jdev' => $this->settings['jdev']
];
-
if (array_key_exists('jour', $params)) {
- $j=explode("-",$params['jour']);
+ $j = explode("-", $params['jour']);
$a['jour'] = $params['jour'];
- if ($params['debut'] == '08:00:00'){ $a['journee'] = ' - Matin';}
- if ($params['debut'] == '13:00:00'){ $a['journee'] = ' - Après-midi';}
+ if ($params['debut'] == '08:00:00') {
+ $a['journee'] = ' - Matin';
+ }
+ if ($params['debut'] == '13:00:00') {
+ $a['journee'] = ' - Après-midi';
+ }
- $agendas = $this->getAgendas($params['jour'],$params['debut'],$params['fin']);
- $a['agendas'] = $agendas;
- }
+ $agendas = $this->getAgendas($params['jour'], $params['debut'], $params['fin']);
+ $a['agendas'] = $agendas;
+ }
- $inscrits= $this->getInscrits();
+ $inscrits = $this->getInscrits();
$a['tot_inscrits'] = count($inscrits);
- $a['pa_am'][0] = $this->getAgendas($this->settings['jdev']['j1'],'08:00:00','13:00:00');
- $a['pa_pm'][0] = $this->getAgendas($this->settings['jdev']['j1'],'12:00:00','19:00:00');
- $a['pa_am'][1] = $this->getAgendas($this->settings['jdev']['j2'],'08:00:00','13:00:00');
- $a['pa_pm'][1] = $this->getAgendas($this->settings['jdev']['j2'],'12:00:00','19:00:00');
- $a['pa_am'][2] = $this->getAgendas($this->settings['jdev']['j3'],'08:00:00','13:00:00');
- $a['pa_pm'][2] = $this->getAgendas($this->settings['jdev']['j3'],'12:00:00','19:00:00');
- $a['pa_am'][3] = $this->getAgendas($this->settings['jdev']['j4'],'08:00:00','13:00:00');
- $a['pa_pm'][3] = $this->getAgendas($this->settings['jdev']['j4'],'12:00:00','19:00:00');
+ $a['pa_am'][0] = $this->getAgendas($this->settings['jdev']['j1'], '08:00:00', '13:00:00');
+ $a['pa_pm'][0] = $this->getAgendas($this->settings['jdev']['j1'], '12:00:00', '19:00:00');
+ $a['pa_am'][1] = $this->getAgendas($this->settings['jdev']['j2'], '08:00:00', '13:00:00');
+ $a['pa_pm'][1] = $this->getAgendas($this->settings['jdev']['j2'], '12:00:00', '19:00:00');
+ $a['pa_am'][2] = $this->getAgendas($this->settings['jdev']['j3'], '08:00:00', '13:00:00');
+ $a['pa_pm'][2] = $this->getAgendas($this->settings['jdev']['j3'], '12:00:00', '19:00:00');
+ $a['pa_am'][3] = $this->getAgendas($this->settings['jdev']['j4'], '08:00:00', '13:00:00');
+ $a['pa_pm'][3] = $this->getAgendas($this->settings['jdev']['j4'], '12:00:00', '19:00:00');
$this->view->render($response, 'dashboard_admin_agenda.twig', $a);
return $response;
}
- public function getAgendas($jour,$debut,$fin) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getAgendas($jour, $debut, $fin)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits ";
@@ -98,26 +102,25 @@ final class DashboardAdminAgendaAction
private function getThematiques()
{
- $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
+ $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
+ }
- public function getInscrits() {
+ public function getInscrits()
+ {
$dql = "SELECT distinct(pa.participant) from App\Entity\ParticipantAgenda pa";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
+ }
public function getSalles()
{
- $dql = "SELECT s FROM App\Entity\Salle s ORDER BY s.etage ASC";
- $query = $this->em->createQuery($dql);
- return $query->getResult();
- }
-
-
-
+ $dql = "SELECT s FROM App\Entity\Salle s ORDER BY s.etage ASC";
+ $query = $this->em->createQuery($dql);
+ return $query->getResult();
+ }
+
private function getIntervenants()
{
$dql = "SELECT distinct p.nom,p.id,p.prenom FROM App\Entity\ParticipantContribution pc LEFT JOIN pc.participant p where pc.contribution != 5 ORDER BY p.nom ASC";
diff --git a/app/src/Action/DashboardAdminAgendaFormAction.php b/app/src/Action/DashboardAdminAgendaFormAction.php
index 2b9a335a4acf58fe93ff0ff37ec96b14093f06d2..0c42699fe6c5ffa450d6ebdf17e4ac768cfb1a97 100644
--- a/app/src/Action/DashboardAdminAgendaFormAction.php
+++ b/app/src/Action/DashboardAdminAgendaFormAction.php
@@ -40,17 +40,17 @@ final class DashboardAdminAgendaFormAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') ){
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm')) {
return $response->withStatus(401);
}
- if($request->isGet()) {
+ if ($request->isGet()) {
$formations = $this->getFormations();
$a = [
'page' => 'dashboard',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'formations' => $formations,
'jdev' => $this->settings['jdev']
];
@@ -59,36 +59,32 @@ final class DashboardAdminAgendaFormAction
$agenda = $this->em->find('App\Entity\Agenda', $params['agenda_id']);
$a['agenda'] = $agenda;
$salle = $this->getSalleById(0);
- $salles = array_merge(array($salle), $this->getSalles($agenda->getDateDebut()->format('Y-m-d H:i:s'), $agenda->getDateFin()->format('Y-m-d H:i:s'),$agenda->getFormation()->getQuota()));
+ $salles = array_merge(array($salle), $this->getSalles($agenda->getDateDebut()->format('Y-m-d H:i:s'), $agenda->getDateFin()->format('Y-m-d H:i:s'), $agenda->getFormation()->getQuota()));
$a['salles'] = $salles;
}
- if (array_key_exists('quota', $params)) {
+ if (array_key_exists('quota', $params)) {
$parsedBody = $request->getParsedBody();
$debut = date_create_from_format('d/m/Y H:i', $params['jour'] . ' ' . $params['debut']);
$fin = date_create_from_format('d/m/Y H:i', $params['jour'] . ' ' . $params['fin']);
$quota = $params['quota'];
- if ($agenda){
+ if ($agenda) {
$id_salle = $agenda->getSalle()->getId();
$salle = $this->getSalleById($id_salle);
- $salles = array_merge(array($salle), $this->getSalles($debut->format('Y-m-d H:i:s'), $fin->format('Y-m-d H:i:s'),$quota));
- }
- else {
- $salles = $this->getSalles($debut->format('Y-m-d H:i:s'), $fin->format('Y-m-d H:i:s'),$quota);
+ $salles = array_merge(array($salle), $this->getSalles($debut->format('Y-m-d H:i:s'), $fin->format('Y-m-d H:i:s'), $quota));
+ } else {
+ $salles = $this->getSalles($debut->format('Y-m-d H:i:s'), $fin->format('Y-m-d H:i:s'), $quota);
}
//$salle = $this->getSalleById($id_salle);
//$salles = array_merge(array($salle), $this->getSalles($debut->format('Y-m-d H:i:s'), $fin->format('Y-m-d H:i:s'),$quota));
$response = $response->write(json_encode($salles))->withHeader('Content-type', 'application/json');
- return $response;
- }
- else {
+ return $response;
+ } else {
$this->view->render($response, 'dashboard_admin_agenda_form.twig', $a);
}
-
}
-
-
- if($request->isPost()) {
+
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$formation = $this->em->find('App\Entity\Formation', $parsedBody['formation']);
@@ -111,7 +107,7 @@ final class DashboardAdminAgendaFormAction
}
- if($request->isPut()) {
+ if ($request->isPut()) {
$parsedBody = $request->getParsedBody();
$formation = $this->em->find('App\Entity\Formation', $parsedBody['formation']);
@@ -156,21 +152,21 @@ final class DashboardAdminAgendaFormAction
}
- // select distinct salle.id,salle.nom,salle.quota_physique,agenda.date_debut,agenda.date_fin from salle
- // left join agenda on salle.id=agenda.id_salle
- // where salle.quota_physique >= 30 and
- // salle.id not in
- // (select salle.id from salle left join agenda on salle.id=agenda.id_salle
- // where (agenda.date_debut,agenda.date_fin) overlaps ('2017-07-04 14:00:00','2017-07-04 17:00:00'))
- // order by salle.quota_physique;
- private function getSalles($debut,$fin,$quota)
+ // select distinct salle.id,salle.nom,salle.quota_physique,agenda.date_debut,agenda.date_fin from salle
+ // left join agenda on salle.id=agenda.id_salle
+ // where salle.quota_physique >= 30 and
+ // salle.id not in
+ // (select salle.id from salle left join agenda on salle.id=agenda.id_salle
+ // where (agenda.date_debut,agenda.date_fin) overlaps ('2017-07-04 14:00:00','2017-07-04 17:00:00'))
+ // order by salle.quota_physique
+ private function getSalles($debut, $fin, $quota)
{
$dql = "SELECT distinct s FROM App\Entity\Salle s LEFT JOIN s.agendas a ";
$dql .= "WHERE s.quotaPhysique >= $quota AND s.id NOT IN ";
$dql .= " ( select s1.id FROM App\Entity\Salle s1 LEFT JOIN s1.agendas a1 where ";
$dql .= " ( a1.dateDebut > '$debut' and (a1.dateDebut < '$fin' or a1.dateFin < '$fin') ) OR ";
$dql .= " ( '$debut' > a1.dateDebut and ('$debut' < a1.dateFin or '$fin' < a1.dateFin) ) OR ";
- $dql .= " ( a1.dateDebut = '$debut' and (a1.dateFin is not null) ) ) ";
+ $dql .= " ( a1.dateDebut = '$debut' and (a1.dateFin is not null) ) ) ";
$dql .= " ORDER BY s.quotaPhysique";
$query = $this->em->createQuery($dql);
return $query->getArrayResult();
diff --git a/app/src/Action/DashboardAdminAgendaSalleChoixAction.php b/app/src/Action/DashboardAdminAgendaSalleChoixAction.php
index d5fba253709a48e12f167e079d4d8860bda10fde..77653de82c5eabd82ac66de0c691cdc5edc5010a 100644
--- a/app/src/Action/DashboardAdminAgendaSalleChoixAction.php
+++ b/app/src/Action/DashboardAdminAgendaSalleChoixAction.php
@@ -19,42 +19,41 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardAdminAgendaSalleChoixAction
{
- private $view;
- private $logger;
- private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
- {
- $this->logger->info("admin valid role page action dispatched");
-
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
-
- if ($roleSI != 'admin') {
- return $response->withStatus(401);
- }
-
- $agenda = $this->em->find('App\Entity\Agenda', $params['agenda_id']);
- if (!$agenda) {
- return $response->withStatus(400);
- }
- $salle = $this->em->find('App\Entity\Salle', $params['salle_id']);
- if (!$salle) {
- return $response->withStatus(400);
- }
- $agenda->setSalle($salle);
- $this->em->persist($agenda);
- $this->em->flush();
-
- return $response;
+ private $view;
+ private $logger;
+ private $em;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
+ {
+ $this->logger->info("admin valid role page action dispatched");
+
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
+
+ if ($roleSI != 'admin') {
+ return $response->withStatus(401);
+ }
+
+ $agenda = $this->em->find('App\Entity\Agenda', $params['agenda_id']);
+ if (!$agenda) {
+ return $response->withStatus(400);
+ }
+ $salle = $this->em->find('App\Entity\Salle', $params['salle_id']);
+ if (!$salle) {
+ return $response->withStatus(400);
+ }
+ $agenda->setSalle($salle);
+ $this->em->persist($agenda);
+ $this->em->flush();
+
+ return $response;
}
-
}
diff --git a/app/src/Action/DashboardAdminAnnulerSessionAction.php b/app/src/Action/DashboardAdminAnnulerSessionAction.php
index 89ee81e5f9d40a61807de66e87f8f0300d4e20ee..c139961bef9430829a707ff7d42850b405570b10 100644
--- a/app/src/Action/DashboardAdminAnnulerSessionAction.php
+++ b/app/src/Action/DashboardAdminAnnulerSessionAction.php
@@ -22,7 +22,7 @@ final class DashboardAdminAnnulerSessionAction
private $view;
private $logger;
private $em;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings, $mailer)
{
$this->view = $view;
@@ -31,15 +31,15 @@ final class DashboardAdminAnnulerSessionAction
$this->settings = $settings;
$this->mailer = $mailer;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin annuler session action dispatched");
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo') ){
- return $response->withStatus(401);
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo')) {
+ return $response->withStatus(401);
}
$params = $request->getQueryParams();
@@ -47,7 +47,7 @@ final class DashboardAdminAnnulerSessionAction
$agenda = $this->em->find('App\Entity\Agenda', $params['agenda_id']);
$participants = $agenda->getParticipants();
- foreach($participants as $participant) {
+ foreach ($participants as $participant) {
$this->sendMail($participant->getParticipant(), $agenda);
}
$this->sendMailToClo($agenda);
@@ -58,7 +58,7 @@ final class DashboardAdminAnnulerSessionAction
$a = [
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'formation' => $agenda->getFormation()
];
@@ -66,7 +66,7 @@ final class DashboardAdminAnnulerSessionAction
return $response;
}
- private function getAllParticipantAgenda($id)
+ private function getAllParticipantAgenda($id)
{
$dql = "SELECT pa from App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE a.formation=$id";
@@ -74,14 +74,14 @@ final class DashboardAdminAnnulerSessionAction
return $query->getResult();
}
- private function deleteAllParticipantAgenda($id)
+ private function deleteAllParticipantAgenda($id)
{
$dql = "DELETE FROM App\Entity\ParticipantAgenda pa WHERE pa.agenda = $id";
$query = $this->em->createQuery($dql);
return $query->execute();
}
- private function sendMail($participant, $agenda)
+ private function sendMail($participant, $agenda)
{
$body = 'Bonjour ' . $participant->getPrenom() . ' ' . $participant->getNom() . PHP_EOL;
$body .= PHP_EOL;
@@ -99,7 +99,7 @@ final class DashboardAdminAnnulerSessionAction
$this->mailer->send($message);
}
- private function sendMailToClo($agenda)
+ private function sendMailToClo($agenda)
{
$body = 'Bonjour ' . PHP_EOL;
$body .= PHP_EOL;
@@ -115,5 +115,4 @@ final class DashboardAdminAnnulerSessionAction
$this->mailer->send($message);
}
-
}
diff --git a/app/src/Action/DashboardAdminEmargementAction.php b/app/src/Action/DashboardAdminEmargementAction.php
index 514b2d81121d47b4b23c329c70007b5fa6ddbe7b..f0748318b02c43919a6aad7a3e8a996684232f66 100644
--- a/app/src/Action/DashboardAdminEmargementAction.php
+++ b/app/src/Action/DashboardAdminEmargementAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminEmargementAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,7 +31,7 @@ final class DashboardAdminEmargementAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin emargement action dispatched");
@@ -40,7 +40,7 @@ final class DashboardAdminEmargementAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if (($roleSI != 'clo') && ($roleSI != 'admin') ){
+ if (($roleSI != 'clo') && ($roleSI != 'admin')) {
return $response->withStatus(401);
}
@@ -50,29 +50,30 @@ final class DashboardAdminEmargementAction
$a = [
'page' => 'dashboard-admin-emargement-gestion',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'participants' => $participants,
'thematiques' => $thematiques,
'jdev' => $this->settings['jdev']
];
- $a['pa_4_am'] = $this->getAgendas($this->settings['jdev']['j1'],'08:00:00','13:00:00');
- $a['pa_4_pm'] = $this->getAgendas($this->settings['jdev']['j1'],'12:00:00','19:00:00');
- $a['pa_5_am'] = $this->getAgendas($this->settings['jdev']['j2'],'08:00:00','13:00:00');
- $a['pa_5_pm'] = $this->getAgendas($this->settings['jdev']['j2'],'12:00:00','19:00:00');
- $a['pa_6_am'] = $this->getAgendas($this->settings['jdev']['j3'],'08:00:00','13:00:00');
- $a['pa_6_pm'] = $this->getAgendas($this->settings['jdev']['j3'],'12:00:00','19:00:00');
- $a['pa_7_am'] = $this->getAgendas($this->settings['jdev']['j4'],'08:00:00','13:00:00');
- $a['pa_7_pm'] = $this->getAgendas($this->settings['jdev']['j4'],'12:00:00','19:00:00');
+ $a['pa_4_am'] = $this->getAgendas($this->settings['jdev']['j1'], '08:00:00', '13:00:00');
+ $a['pa_4_pm'] = $this->getAgendas($this->settings['jdev']['j1'], '12:00:00', '19:00:00');
+ $a['pa_5_am'] = $this->getAgendas($this->settings['jdev']['j2'], '08:00:00', '13:00:00');
+ $a['pa_5_pm'] = $this->getAgendas($this->settings['jdev']['j2'], '12:00:00', '19:00:00');
+ $a['pa_6_am'] = $this->getAgendas($this->settings['jdev']['j3'], '08:00:00', '13:00:00');
+ $a['pa_6_pm'] = $this->getAgendas($this->settings['jdev']['j3'], '12:00:00', '19:00:00');
+ $a['pa_7_am'] = $this->getAgendas($this->settings['jdev']['j4'], '08:00:00', '13:00:00');
+ $a['pa_7_pm'] = $this->getAgendas($this->settings['jdev']['j4'], '12:00:00', '19:00:00');
$this->view->render($response, 'dashboard_admin_emargement.twig', $a);
return $response;
}
- public function getAgendas($jour,$debut,$fin) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getAgendas($jour, $debut, $fin)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits ";
@@ -84,7 +85,7 @@ final class DashboardAdminEmargementAction
private function getParticipants()
{
- $dql = "SELECT p as participant, ";
+ $dql = "SELECT p as participant, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where p.id=pa.participant) as inscrit ";
$dql .= " FROM App\Entity\Participant p";
$dql .= " WHERE p.emailValide='t' ORDER BY p.nom";
@@ -97,6 +98,5 @@ final class DashboardAdminEmargementAction
$dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
-
+ }
}
diff --git a/app/src/Action/DashboardAdminEmargementAction.php_old.php b/app/src/Action/DashboardAdminEmargementAction.php_old.php
index 0a6501d87c2976a85ac2e026bcf8b439250f5565..3060679b0d4b66bbd1e2e03c480ca54e0666222e 100644
--- a/app/src/Action/DashboardAdminEmargementAction.php_old.php
+++ b/app/src/Action/DashboardAdminEmargementAction.php_old.php
@@ -22,14 +22,14 @@ final class DashboardAdminEmargementAction
private $view;
private $logger;
private $em;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin page action dispatched");
@@ -40,35 +40,31 @@ final class DashboardAdminEmargementAction
if ($roleSI != 'admin') {
- return $response->withStatus(401);
+ return $response->withStatus(401);
}
-
-
+
$thematiques = $this->getThematiques();
$a = [
'page' => 'dashboard-admin-emargement',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'thematiques' => $thematiques
];
- if (array_key_exists('thematique_id', $params)) {
+ if (array_key_exists('thematique_id', $params)) {
$formations = $this->getFormations($params['thematique_id']);
$response = $response->write(json_encode($formations))->withHeader('Content-type', 'application/json');
return $response;
- }
- else {
-
- if (array_key_exists('formation_id', $params)) {
+ } else {
+ if (array_key_exists('formation_id', $params)) {
$formation = $this->em->find('App\Entity\Formation', $params['formation_id']);
$a['formation'] = $formation;
- $participants=$this->getAllParticipantAgenda();
- $a['participants'] = $participants;
+ $participants = $this->getAllParticipantAgenda();
+ $a['participants'] = $participants;
}
- $this->view->render($response, 'dashboard_admin_emargement.twig',$a);
+ $this->view->render($response, 'dashboard_admin_emargement.twig', $a);
return $response;
}
-
}
private function getThematiques()
@@ -85,17 +81,12 @@ final class DashboardAdminEmargementAction
$query = $this->em->createQuery($dql);
return $query->getArrayResult();
}
-
-
- public function getAllParticipantAgenda() {
-
-
+ public function getAllParticipantAgenda()
+ {
$dql = "SELECT pa from App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE a.formation=18";
$query = $this->em->createQuery($dql);
return $query->getResult();
-
- }
-
+ }
}
diff --git a/app/src/Action/DashboardAdminEmargementListeAction.php b/app/src/Action/DashboardAdminEmargementListeAction.php
index 04507fe3084ff950f85b98334ee5f6420e93e9f7..44b122669316f330df80056190a503702e92dbd1 100644
--- a/app/src/Action/DashboardAdminEmargementListeAction.php
+++ b/app/src/Action/DashboardAdminEmargementListeAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminEmargementListeAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,7 +31,7 @@ final class DashboardAdminEmargementListeAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin page action dispatched");
@@ -42,35 +42,30 @@ final class DashboardAdminEmargementListeAction
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo') ){
- return $response->withStatus(401);
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo')) {
+ return $response->withStatus(401);
}
$a = [
'page' => 'dashboard-admin-emargement-liste',
'token' => $token,
- 'role_si'=> $roleSI,
- 'formation'=> $formation,
+ 'role_si' => $roleSI,
+ 'formation' => $formation,
'jdev' => $this->settings['jdev']
];
- $participants=$this->getAllParticipantAgenda($params['formation_id']);
- $a['participants'] = $participants;
+ $participants = $this->getAllParticipantAgenda($params['formation_id']);
+ $a['participants'] = $participants;
- $this->view->render($response, 'dashboard_admin_emargement_liste.twig',$a);
+ $this->view->render($response, 'dashboard_admin_emargement_liste.twig', $a);
return $response;
-
-
}
-
-
- public function getAllParticipantAgenda($id) {
+ public function getAllParticipantAgenda($id)
+ {
$dql = "SELECT pa from App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE a.formation=$id";
$query = $this->em->createQuery($dql);
return $query->getResult();
-
- }
-
+ }
}
diff --git a/app/src/Action/DashboardAdminEmargementPresenceAction.php b/app/src/Action/DashboardAdminEmargementPresenceAction.php
index 4f0f0cd4211c6358da1d0873e582323a01c05cda..71351e83a2e2e9a69cb5cb91ddad0cfc8ad7af55 100644
--- a/app/src/Action/DashboardAdminEmargementPresenceAction.php
+++ b/app/src/Action/DashboardAdminEmargementPresenceAction.php
@@ -30,7 +30,6 @@ final class DashboardAdminEmargementPresenceAction
$this->em = $em;
}
-
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard page action dispatched");
@@ -39,66 +38,62 @@ final class DashboardAdminEmargementPresenceAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo') && ($roleSI != 'clo_pgm') ) {
+ if (($roleSI != 'admin') && ($roleSI != 'clo') && ($roleSI != 'clo_pgm')) {
return $response->withStatus(401);
}
$a = [
'token' => $token,
- 'role_si'=> $roleSI
+ 'role_si' => $roleSI
];
- if ((array_key_exists('formation', $params)) && (array_key_exists('pa_id', $params)) && (array_key_exists('a_id', $params)) ){
+ if ((array_key_exists('formation', $params)) && (array_key_exists('pa_id', $params)) && (array_key_exists('a_id', $params))) {
$formation = $this->em->find('App\Entity\Formation', $params['formation']);
$a['formation'] = $formation;
- $inscription = $this->getInscriptionAgenda($params['pa_id'],$params['a_id']);
- }
- else if (array_key_exists('agenda', $params)){
+ $inscription = $this->getInscriptionAgenda($params['pa_id'], $params['a_id']);
+ } elseif (array_key_exists('agenda', $params)) {
$formation = $this->em->find('App\Entity\Formation', $params['formation']);
$a['formation'] = $formation;
- $participants=$params['participants'];
- $inscriptions = $this->getInscritsAgenda($params['agenda'],$participants);
- foreach($inscriptions as $inscription) {
- if ($params['valider'] == 'true') {
+ $participants = $params['participants'];
+ $inscriptions = $this->getInscritsAgenda($params['agenda'], $participants);
+ foreach ($inscriptions as $inscription) {
+ if ($params['valider'] == 'true') {
$inscription->setPresent(true);
}
if ($params['valider'] == 'false') {
$inscription->setPresent(false);
- }
+ }
$this->em->flush();
}
- }
- else {
+ } else {
return $response->withStatus(400);
}
if (array_key_exists('present', $params)) {
- if ($params['present'] == 'true') {
+ if ($params['present'] == 'true') {
$inscription[0]->setPresent(true);
}
- if ($params['present'] == 'false') {
+ if ($params['present'] == 'false') {
$inscription[0]->setPresent(false);
}
$this->em->flush();
- }
+ }
$this->view->render($response, 'dashboard_admin_emargement_liste.twig', $a);
return $response;
}
-
-
- public function getInscriptionAgenda($id_participant,$id_agenda) {
+ public function getInscriptionAgenda($id_participant, $id_agenda)
+ {
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa WHERE pa.participant=$id_participant AND pa.agenda=$id_agenda";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
- public function getInscritsAgenda($id_agenda,$participants) {
+ public function getInscritsAgenda($id_agenda, $participants)
+ {
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa WHERE pa.participant in ($participants) AND pa.agenda=$id_agenda";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
-
}
diff --git a/app/src/Action/DashboardAdminFormationAction.php b/app/src/Action/DashboardAdminFormationAction.php
index 0a8b746399c1da4375c484c00dfd46704dba8b81..c7d6a45e77c7fd056ccd02fa42c26d78c56b8009 100644
--- a/app/src/Action/DashboardAdminFormationAction.php
+++ b/app/src/Action/DashboardAdminFormationAction.php
@@ -23,14 +23,14 @@ final class DashboardAdminFormationAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
$this->settings = $settings;
- }
+ }
public function __invoke(Request $request, Response $response, $args)
{
@@ -40,7 +40,7 @@ final class DashboardAdminFormationAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') ){
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm')) {
return $response->withStatus(401);
}
@@ -50,17 +50,17 @@ final class DashboardAdminFormationAction
$this->view->render($response, 'dashboard_admin_formation.twig', [
'page' => 'dashboard-admin-formation',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'formations' => $formations,
'intervenants' => $intervenants,
'jdev' => $this->settings['jdev']
]);
-
return $response;
}
- public function getFormations() {
+ public function getFormations()
+ {
$dql = "SELECT a FROM App\Entity\Formation a ORDER BY a.nom DESC";
$query = $this->em->createQuery($dql);
return $query->getResult();
diff --git a/app/src/Action/DashboardAdminFormationFormAction.php b/app/src/Action/DashboardAdminFormationFormAction.php
index 3c462db436f2a66d8cbadfe948367f9f2b4d9260..89cf7b534ac4af21c13db9a75417525b2cededef 100644
--- a/app/src/Action/DashboardAdminFormationFormAction.php
+++ b/app/src/Action/DashboardAdminFormationFormAction.php
@@ -23,14 +23,14 @@ final class DashboardAdminFormationFormAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
$this->settings = $settings;
- }
+ }
public function __invoke(Request $request, Response $response, $args)
@@ -41,18 +41,18 @@ final class DashboardAdminFormationFormAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') ){
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm')) {
return $response->withStatus(401);
}
- if($request->isGet()) {
+ if ($request->isGet()) {
$thematiques = $this->getThematiques();
$intervenants = $this->getIntervenants();
$a = [
'page' => 'dashboard',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'thematiques' => $thematiques,
'intervenants' => $intervenants,
'jdev' => $this->settings['jdev']
@@ -64,17 +64,14 @@ final class DashboardAdminFormationFormAction
if (array_key_exists('duplicate', $params)) {
$a['duplicate'] = true;
};
-
-
if (array_key_exists('quota', $params)) {
- return ''.$formation->getQuota();
- }
- else {
+ return '' . $formation->getQuota();
+ } else {
$this->view->render($response, 'dashboard_admin_formation_form.twig', $a);
}
}
- if($request->isPost()) {
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$thematique = $this->em->find('App\Entity\Thematique', $parsedBody['thematique']);
@@ -93,7 +90,7 @@ final class DashboardAdminFormationFormAction
$response = $response->write('Nouvelle formation enregistrée')->withStatus(201);
}
- if($request->isPut()) {
+ if ($request->isPut()) {
// ajouter test sur existance du nom de la formation ?
$parsedBody = $request->getParsedBody();
$thematique = $this->em->find('App\Entity\Thematique', $parsedBody['thematique']);
@@ -137,5 +134,4 @@ final class DashboardAdminFormationFormAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardAdminGenCodeFormationAction.php b/app/src/Action/DashboardAdminGenCodeFormationAction.php
index e141f01b2015cee76dfbc568424a83a853418006..520c612d6638f877aa7fea657a1be3897e1a41d3 100644
--- a/app/src/Action/DashboardAdminGenCodeFormationAction.php
+++ b/app/src/Action/DashboardAdminGenCodeFormationAction.php
@@ -36,13 +36,13 @@ final class DashboardAdminGenCodeFormationAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') ){
+ if (($roleSI != 'admin')) {
return $response->withStatus(401);
}
$agendaRepository = $this->em->getRepository('App\Entity\Agenda');
$agendas = $agendaRepository->findAll();
- foreach($agendas as $agenda) {
+ foreach ($agendas as $agenda) {
if (empty($agenda->getCodeFormation())) {
$agenda->setCodeFormation(uniqid());
}
@@ -52,11 +52,11 @@ final class DashboardAdminGenCodeFormationAction
return $response->write('ok');
}
- public function getAgendas() {
+ public function getAgendas()
+ {
$dql = "SELECT agenda ";
$dql .= "FROM App\Entity\Agenda a ";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardAdminInscriptionAction.php b/app/src/Action/DashboardAdminInscriptionAction.php
index 1dd2acd31d2325f1d8c19dfb228308936a3f6d5b..6ea26ac1f4fc22fbf37f7974b80b3e1db7488bc9 100644
--- a/app/src/Action/DashboardAdminInscriptionAction.php
+++ b/app/src/Action/DashboardAdminInscriptionAction.php
@@ -19,34 +19,34 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardAdminInscriptionAction
{
- private $view;
- private $logger;
- private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+ private $em;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin inscription page action dispatched");
-
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
- if ($roleSI != 'admin') {
- return $response->withStatus(401);
- }
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
+
+ if ($roleSI != 'admin') {
+ return $response->withStatus(401);
+ }
$this->view->render($response, 'dashboard_admin_inscription.twig', [
'page' => 'dashboard_admin_inscription',
- 'token' => $token
+ 'token' => $token
]);
-
+
return $response;
}
}
diff --git a/app/src/Action/DashboardAdminOrganismeAction.php b/app/src/Action/DashboardAdminOrganismeAction.php
index 22dd6630bf1f634babfb305a454aa8763923cb46..57824cdeb57f2b4ac8c0ab1863186d65a0f93e6b 100644
--- a/app/src/Action/DashboardAdminOrganismeAction.php
+++ b/app/src/Action/DashboardAdminOrganismeAction.php
@@ -23,15 +23,15 @@ final class DashboardAdminOrganismeAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
$this->settings = $settings;
- }
-
+ }
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin page action dispatched");
@@ -41,7 +41,7 @@ final class DashboardAdminOrganismeAction
$roleSI = $request->getAttribute('roleSI');
if ($roleSI != 'admin') {
- return $response->withStatus(401);
+ return $response->withStatus(401);
}
$organismes = $this->getOrganismes();
@@ -49,11 +49,11 @@ final class DashboardAdminOrganismeAction
$this->view->render($response, 'dashboard_admin_organisme.twig', [
'page' => 'dashboard-admin-organisme',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'organismes' => $organismes,
'jdev' => $this->settings['jdev']
]);
-
+
return $response;
}
diff --git a/app/src/Action/DashboardAdminOrganismeFormAction.php b/app/src/Action/DashboardAdminOrganismeFormAction.php
index 311a3378ce4ab388d974c9fa5342b545d7824d38..ace9a2f0edf89b0af6ef7e4cd61d88c204d16309 100644
--- a/app/src/Action/DashboardAdminOrganismeFormAction.php
+++ b/app/src/Action/DashboardAdminOrganismeFormAction.php
@@ -44,17 +44,17 @@ final class DashboardAdminOrganismeFormAction
return $response->withStatus(401);
}
- if($request->isGet()) {
+ if ($request->isGet()) {
$a = [
'page' => 'dashboard',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'jdev' => $this->settings['jdev']
];
if (array_key_exists('organisme_id', $params)) {
$organisme = $this->em->find('App\Entity\Organisme', $params['organisme_id']);
$a['organisme'] = $organisme;
- };
+ };
$this->view->render($response, 'dashboard_admin_organisme_form.twig', $a);
}
diff --git a/app/src/Action/DashboardAdminPaiementAction.php b/app/src/Action/DashboardAdminPaiementAction.php
index fc94cc6290fd99982463f0cede91e4df6d0d9f11..58c23a968556f7479634d8f3fbaa56222ec68655 100644
--- a/app/src/Action/DashboardAdminPaiementAction.php
+++ b/app/src/Action/DashboardAdminPaiementAction.php
@@ -22,44 +22,43 @@ final class DashboardAdminPaiementAction
private $view;
private $logger;
private $em;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
- $this->logger->info("dashboard admin page action dispatched");
+ $this->logger->info("dashboard admin page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'clo_admin') && ($roleSI != 'admin') ){
- return $response->withStatus(401);
- }
+ if (($roleSI != 'clo_admin') && ($roleSI != 'admin')) {
+ return $response->withStatus(401);
+ }
- $participants = $this->getParticipants();
-
+ $participants = $this->getParticipants();
+
- $this->view->render($response, 'dashboard_admin_paiement.twig', [
- 'page' => 'dashboard-admin-paiement',
- 'token' => $token,
- 'role_si'=> $roleSI,
- 'participants' => $participants
- ]);
-
- return $response;
+ $this->view->render($response, 'dashboard_admin_paiement.twig', [
+ 'page' => 'dashboard-admin-paiement',
+ 'token' => $token,
+ 'role_si' => $roleSI,
+ 'participants' => $participants
+ ]);
+
+ return $response;
}
private function getParticipants()
{
- $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Participant' and p.emailValide='t' ORDER BY p.nom";
+ $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = 'Participant' and p.emailValide='t' ORDER BY p.nom";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardAdminParcoursAction.php b/app/src/Action/DashboardAdminParcoursAction.php
index 4881c46bf40767e0738bb7e0005ac78a663b90f9..957b579952e9af9f73692f64ff9f345d065e272d 100644
--- a/app/src/Action/DashboardAdminParcoursAction.php
+++ b/app/src/Action/DashboardAdminParcoursAction.php
@@ -53,7 +53,8 @@ final class DashboardAdminAgendaAction
return $response;
}
- public function getAgendas() {
+ public function getAgendas()
+ {
$dql = "SELECT a FROM App\Entity\Agenda a ORDER BY a.dateDebut ASC";
$query = $this->em->createQuery($dql);
return $query->getResult();
diff --git a/app/src/Action/DashboardAdminParcoursFormAction.php b/app/src/Action/DashboardAdminParcoursFormAction.php
index 2540f0a9eef534a18420ce83968ebe155899339c..228b96280c36567a5841001020898b9533574b95 100644
--- a/app/src/Action/DashboardAdminParcoursFormAction.php
+++ b/app/src/Action/DashboardAdminParcoursFormAction.php
@@ -42,7 +42,7 @@ final class DashboardAdminAgendaFormAction
return $response->withStatus(401);
}
- if($request->isGet()) {
+ if ($request->isGet()) {
$formations = $this->getFormations();
$a = [
@@ -55,26 +55,22 @@ final class DashboardAdminAgendaFormAction
$agenda = $this->em->find('App\Entity\Agenda', $params['agenda_id']);
$formations = $this->getOneFormation($params['agenda_id']);
$a['agenda'] = $agenda;
-
}
- if (array_key_exists('quota', $params)) {
+ if (array_key_exists('quota', $params)) {
$parsedBody = $request->getParsedBody();
$debut = date_create_from_format('d/m/Y H:i', $params['jour'] . ' ' . $params['debut']);
$fin = date_create_from_format('d/m/Y H:i', $params['jour'] . ' ' . $params['fin']);
$quota = $params['quota'];
- $salles = $this->getSalles($debut->format('Y-m-d H:i:s'),$fin->format('Y-m-d H:i:s'),$quota);
+ $salles = $this->getSalles($debut->format('Y-m-d H:i:s'), $fin->format('Y-m-d H:i:s'), $quota);
$response = $response->write(json_encode($salles))->withHeader('Content-type', 'application/json');
return $response;
- }
- else {
+ } else {
$this->view->render($response, 'dashboard_admin_agenda_form.twig', $a);
}
-
}
-
-
- if($request->isPost()) {
+
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$formation = $this->em->find('App\Entity\Formation', $parsedBody['formation']);
@@ -92,9 +88,8 @@ final class DashboardAdminAgendaFormAction
$response = $response->write('Nouvel agenda enregistré')->withStatus(201);
}
-
- if($request->isPut()) {
+ if ($request->isPut()) {
$parsedBody = $request->getParsedBody();
$formation = $this->em->find('App\Entity\Formation', $parsedBody['formation']);
@@ -138,14 +133,14 @@ final class DashboardAdminAgendaFormAction
}
- // select distinct salle.id,salle.nom,salle.quota_physique,agenda.date_debut,agenda.date_fin from salle
- // left join agenda on salle.id=agenda.id_salle
- // where salle.quota_physique >= 30 and
- // salle.id not in
- // (select salle.id from salle left join agenda on salle.id=agenda.id_salle
- // where (agenda.date_debut,agenda.date_fin) overlaps ('2017-07-04 14:00:00','2017-07-04 17:00:00'))
- // order by salle.quota_physique;
- private function getSalles($debut,$fin,$quota)
+ // select distinct salle.id,salle.nom,salle.quota_physique,agenda.date_debut,agenda.date_fin from salle
+ // left join agenda on salle.id=agenda.id_salle
+ // where salle.quota_physique >= 30 and
+ // salle.id not in
+ // (select salle.id from salle left join agenda on salle.id=agenda.id_salle
+ // where (agenda.date_debut,agenda.date_fin) overlaps ('2017-07-04 14:00:00','2017-07-04 17:00:00'))
+ // order by salle.quota_physique
+ private function getSalles($debut, $fin, $quota)
{
$dql = "SELECT s FROM App\Entity\Salle s LEFT JOIN s.agendas a ";
$dql .= "WHERE s.quotaPhysique >= $quota AND s.id NOT IN ";
diff --git a/app/src/Action/DashboardAdminParticipantFormAction.php b/app/src/Action/DashboardAdminParticipantFormAction.php
index 8226079a8b5b15b342d987f0d3b91fbc2296c7bb..580ec9d7c4a1e6ce18597bd772f607eb9358909c 100644
--- a/app/src/Action/DashboardAdminParticipantFormAction.php
+++ b/app/src/Action/DashboardAdminParticipantFormAction.php
@@ -23,15 +23,14 @@ final class DashboardAdminParticipantFormAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
$this->settings = $settings;
- }
-
+ }
public function __invoke(Request $request, Response $response, $args)
{
@@ -41,11 +40,11 @@ final class DashboardAdminParticipantFormAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo') ) {
+ if (($roleSI != 'admin') && ($roleSI != 'clo')) {
return $response->withStatus(401);
}
- if($request->isDelete()) {
+ if ($request->isDelete()) {
$participant = $this->em->find('App\Entity\Participant', $params['id']);
$this->deleteAllSondages($participant);
$this->deleteAllPreAgendas($participant);
@@ -57,7 +56,7 @@ final class DashboardAdminParticipantFormAction
$this->em->flush();
}
- if($request->isGet()) {
+ if ($request->isGet()) {
$organismesRepository = $this->em->getRepository('App\Entity\Organisme');
$organismes = $organismesRepository->findAll();
@@ -76,7 +75,7 @@ final class DashboardAdminParticipantFormAction
$a = [
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'jdev' => $this->settings['jdev'],
'organismes' => $organismes,
'reseaux1' => $reseaux1,
@@ -88,32 +87,29 @@ final class DashboardAdminParticipantFormAction
'contributions' => $contributions
];
- if (array_key_exists('id', $params)) {
+ if (array_key_exists('id', $params)) {
$participant = $this->em->find('App\Entity\Participant', $params['id']);
$a['participant'] = $participant;
- }
- else {
+ } else {
return $response->withStatus(400);
}
-
-
+
if (array_key_exists('present', $params)) {
- $valid=$params['present'];
- if ($valid == 'true') {
+ $valid = $params['present'];
+ if ($valid == 'true') {
$participant->setPresent(true);
}
- if ($valid == 'false') {
- $participant->setPresent(false);
+ if ($valid == 'false') {
+ $participant->setPresent(false);
}
$this->em->flush();
$this->view->render($response, 'dashboard_admin_participant_gestion.twig', $a);
- }
- else {
+ } else {
$this->view->render($response, 'dashboard_admin_participant_form.twig', $a);
}
}
- if($request->isPut()) {
+ if ($request->isPut()) {
$parsedBody = $request->getParsedBody();
$participant = $this->em->find('App\Entity\Participant', $parsedBody['participant_id']);
$participant->setNom($parsedBody['nom']);
@@ -159,7 +155,7 @@ final class DashboardAdminParticipantFormAction
$this->createReseaux($parsedBody, $participant);
$this->deleteAllCommunautes($participant);
$this->createCommunautes($parsedBody, $participant);
- $this->em->flush();
+ $this->em->flush();
$response = $response->write('Participant id=' . $participant->getId() . ' modifié')->withStatus(201);
}
@@ -195,40 +191,35 @@ final class DashboardAdminParticipantFormAction
$participant->setRole($parsedBody['role']);
}
}
-
-
-
-
-
-
- private function deleteAllSondages($participant)
+
+ private function deleteAllSondages($participant)
{
- foreach($participant->getSondages() as $sondage) {
+ foreach ($participant->getSondages() as $sondage) {
$this->em->remove($sondage);
}
$this->em->flush();
}
- private function deleteAllAgendas($participant)
+ private function deleteAllAgendas($participant)
{
- foreach($participant->getAgendas() as $agenda) {
+ foreach ($participant->getAgendas() as $agenda) {
$this->em->remove($agenda);
}
$this->em->flush();
}
- private function deleteAllPreAgendas($participant)
+ private function deleteAllPreAgendas($participant)
{
- foreach($participant->getPreAgendas() as $preagenda) {
+ foreach ($participant->getPreAgendas() as $preagenda) {
$this->em->remove($preagenda);
}
$this->em->flush();
}
- private function deleteAllContributions($participant)
+ private function deleteAllContributions($participant)
{
- foreach($participant->getContributions() as $contribution) {
+ foreach ($participant->getContributions() as $contribution) {
$this->em->remove($contribution);
}
$this->em->flush();
@@ -246,11 +237,10 @@ final class DashboardAdminParticipantFormAction
}
}
}
-
- private function deleteAllReseaux($participant)
+ private function deleteAllReseaux($participant)
{
- foreach($participant->getReseaux() as $reseau) {
+ foreach ($participant->getReseaux() as $reseau) {
$this->em->remove($reseau);
}
$this->em->flush();
@@ -269,9 +259,9 @@ final class DashboardAdminParticipantFormAction
}
}
- private function deleteAllCommunautes($participant)
+ private function deleteAllCommunautes($participant)
{
- foreach($participant->getCommunautes() as $communaute) {
+ foreach ($participant->getCommunautes() as $communaute) {
$this->em->remove($communaute);
}
$this->em->flush();
@@ -289,5 +279,4 @@ final class DashboardAdminParticipantFormAction
}
}
}
-
}
diff --git a/app/src/Action/DashboardAdminParticipantGestionAction.php b/app/src/Action/DashboardAdminParticipantGestionAction.php
index 659a6e7184b938a63f20e9238cb9a3a9b9889450..cf5ed7a3a471715cd3f7efc6238020148627b8e0 100644
--- a/app/src/Action/DashboardAdminParticipantGestionAction.php
+++ b/app/src/Action/DashboardAdminParticipantGestionAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminParticipantGestionAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,37 +31,37 @@ final class DashboardAdminParticipantGestionAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
- $this->logger->info("dashboard admin page action dispatched");
+ $this->logger->info("dashboard admin page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
- if (($roleSI != 'clo') && ($roleSI != 'admin') && ($roleSI != 'clo_admin') ){
- return $response->withStatus(401);
- }
+ if (($roleSI != 'clo') && ($roleSI != 'admin') && ($roleSI != 'clo_admin')) {
+ return $response->withStatus(401);
+ }
- $participants = $this->getParticipants();
- $invalides = $this->getInvalidParticipants();
-
- $this->view->render($response, 'dashboard_admin_participant_gestion.twig', [
- 'page' => 'dashboard-admin-participant-gestion',
- 'token' => $token,
- 'role_si'=> $roleSI,
- 'participants' => $participants,
- 'invalides' => $invalides,
- 'jdev' => $this->settings['jdev']
- ]);
-
- return $response;
+ $participants = $this->getParticipants();
+ $invalides = $this->getInvalidParticipants();
+
+ $this->view->render($response, 'dashboard_admin_participant_gestion.twig', [
+ 'page' => 'dashboard-admin-participant-gestion',
+ 'token' => $token,
+ 'role_si' => $roleSI,
+ 'participants' => $participants,
+ 'invalides' => $invalides,
+ 'jdev' => $this->settings['jdev']
+ ]);
+
+ return $response;
}
private function getParticipants()
{
- $dql = "SELECT p as participant, ";
+ $dql = "SELECT p as participant, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where p.id=pa.participant) as inscrit, ";
$dql .= "(select count(pc) from App\Entity\ParticipantContribution pc where p.id=pc.participant and pc.contribution != 5) as contribution, ";
$dql .= "(select count(pp) from App\Entity\ParticipantContribution pp where p.id=pp.participant and pp.contribution = 5) as poster ";
@@ -73,11 +73,10 @@ final class DashboardAdminParticipantGestionAction
private function getInvalidParticipants()
{
- $dql = "SELECT p";
+ $dql = "SELECT p";
$dql .= " FROM App\Entity\Participant p";
$dql .= " WHERE p.emailValide='f' ORDER BY p.nom";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardAdminParticipantListeAction.php b/app/src/Action/DashboardAdminParticipantListeAction.php
index 00a5041b3df4915006b19deb53dcbe14987b9b7a..f0c3be8702762563f336f71867eebbd875a27ff4 100644
--- a/app/src/Action/DashboardAdminParticipantListeAction.php
+++ b/app/src/Action/DashboardAdminParticipantListeAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminParticipantListeAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,43 +31,40 @@ final class DashboardAdminParticipantListeAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
- $this->logger->info("dashboard admin page action dispatched");
+ $this->logger->info("dashboard admin page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
- $role=$params['role'];
-
- if (($roleSI != 'clo') && ($roleSI != 'admin') && ($roleSI != 'clo_admin') ){
- return $response->withStatus(401);
- }
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
+ $role = $params['role'];
+
+ if (($roleSI != 'clo') && ($roleSI != 'admin') && ($roleSI != 'clo_admin')) {
+ return $response->withStatus(401);
+ }
- $participants = $this->getParticipants($role);
+ $participants = $this->getParticipants($role);
-
- $this->view->render($response, 'dashboard_admin_participant_liste.twig', [
- 'page' => 'dashboard-admin-participant-liste',
- 'token' => $token,
- 'role_si'=> $roleSI,
- 'role'=> $role,
- 'participants' => $participants,
- 'jdev' => $this->settings['jdev']
- ]);
-
- return $response;
+
+ $this->view->render($response, 'dashboard_admin_participant_liste.twig', [
+ 'page' => 'dashboard-admin-participant-liste',
+ 'token' => $token,
+ 'role_si' => $roleSI,
+ 'role' => $role,
+ 'participants' => $participants,
+ 'jdev' => $this->settings['jdev']
+ ]);
+
+ return $response;
}
private function getParticipants($type)
{
- $dql = "SELECT p as participant FROM App\Entity\Participant p";
+ $dql = "SELECT p as participant FROM App\Entity\Participant p";
$dql .= " WHERE p.emailValide='t' and p.role='$type' ORDER BY p.nom";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
-
-
}
diff --git a/app/src/Action/DashboardAdminParticipantParcoursAction.php b/app/src/Action/DashboardAdminParticipantParcoursAction.php
index cd1a63dbb9d9e6051c589ec57dd1db2bfd50bcab..0ccd147ece932fa3e7622ea3d8b341d09c09e8dc 100644
--- a/app/src/Action/DashboardAdminParticipantParcoursAction.php
+++ b/app/src/Action/DashboardAdminParticipantParcoursAction.php
@@ -42,42 +42,40 @@ final class DashboardAdminParticipantParcoursAction
$roleSI = $request->getAttribute('roleSI');
$intervenants = $this->getIntervenants();
- if ( ($roleSI != 'admin') && ($roleSI != 'clo') ) {
+ if (($roleSI != 'admin') && ($roleSI != 'clo')) {
return $response->withStatus(401);
}
$a = [
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'intervenants' => $intervenants,
'jdev' => $this->settings['jdev']
];
- if (array_key_exists('id', $params)) {
+ if (array_key_exists('id', $params)) {
$participant = $this->em->find('App\Entity\Participant', $params['id']);
$a['participant'] = $participant;
- }
- else {
+ } else {
return $response->withStatus(400);
}
-
- $a['pa_am'][0] = $this->getParcours($this->settings['jdev']['j1'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][0] = $this->getParcours($this->settings['jdev']['j1'],'12:00:00','19:00:00',$participant->getId());
- $a['pa_am'][1] = $this->getParcours($this->settings['jdev']['j2'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][1] = $this->getParcours($this->settings['jdev']['j2'],'12:00:00','19:00:00',$participant->getId());
- $a['pa_am'][2] = $this->getParcours($this->settings['jdev']['j3'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][2] = $this->getParcours($this->settings['jdev']['j3'],'12:00:00','19:00:00',$participant->getId());
- $a['pa_am'][3] = $this->getParcours($this->settings['jdev']['j4'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][3] = $this->getParcours($this->settings['jdev']['j4'],'12:00:00','19:00:00',$participant->getId());
+ $a['pa_am'][0] = $this->getParcours($this->settings['jdev']['j1'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][0] = $this->getParcours($this->settings['jdev']['j1'], '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_am'][1] = $this->getParcours($this->settings['jdev']['j2'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][1] = $this->getParcours($this->settings['jdev']['j2'], '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_am'][2] = $this->getParcours($this->settings['jdev']['j3'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][2] = $this->getParcours($this->settings['jdev']['j3'], '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_am'][3] = $this->getParcours($this->settings['jdev']['j4'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][3] = $this->getParcours($this->settings['jdev']['j4'], '12:00:00', '19:00:00', $participant->getId());
- if (array_key_exists('jour', $params)) {
- $agendas = $this->getAgendas($params['jour'],$params['debut'],$params['fin'],$participant->getId());
- $a['agendas'] = $agendas;
+ if (array_key_exists('jour', $params)) {
+ $agendas = $this->getAgendas($params['jour'], $params['debut'], $params['fin'], $participant->getId());
+ $a['agendas'] = $agendas;
$nbGt17 = $this->getGt($params['jour'], $participant->getId());
$a['nbgt17'] = count($nbGt17);
- $inscription = $this->getInscription($params['jour'],$params['debut'],$params['fin'],$participant->getId());
+ $inscription = $this->getInscription($params['jour'], $params['debut'], $params['fin'], $participant->getId());
$nbInscriptions = count($inscription);
if ($nbInscriptions > 0) {
$a['inscription'] = $inscription[0];
@@ -85,26 +83,29 @@ final class DashboardAdminParticipantParcoursAction
$a['nb_inscriptions'] = $nbInscriptions;
$a['jour'] = $params['jour'];
$a['debut'] = $params['debut'];
- $a['fin'] = $params['fin'];
- if ($params['debut'] == '08:00:00'){ $a['journee'] = ' - Matin';}
- if ($params['debut'] == '13:00:00'){ $a['journee'] = ' - Après-midi';}
- }
+ $a['fin'] = $params['fin'];
+ if ($params['debut'] == '08:00:00') {
+ $a['journee'] = ' - Matin';
+ }
+ if ($params['debut'] == '13:00:00') {
+ $a['journee'] = ' - Après-midi';
+ }
+ }
$this->view->render($response, 'dashboard_admin_participant_parcours.twig', $a);
-
return $response;
}
-
- //select *,
+ //select *,
// (select count(*) from participant_x_agenda pa where pa.id_agenda=a.id) as nb_inscrits,
// (select count(*) from participant_x_agenda p2 where p2.id_agenda=a.id and p2.id_participant=100) as check from agenda a;
- public function getAgendas($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getAgendas($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits, ";
- $dql .= "(select count(p2) from App\Entity\ParticipantAgenda p2 where p2.agenda=a.id and p2.participant=$id) as check, ";
+ $dql .= "(select count(p2) from App\Entity\ParticipantAgenda p2 where p2.agenda=a.id and p2.participant=$id) as check, ";
$dql .= "(select count(p3) from App\Entity\ParticipantAgenda p3 LEFT JOIN p3.agenda ag where p3.participant=$id and ag.dateDebut between '$date_debut' and '$date_fin' and ag.dateFin between '$date_debut' and '$date_fin' as inscrit ";
$dql .= "FROM App\Entity\Agenda a ";
$dql .= "WHERE a.dateDebut between '$date_debut' and '$date_fin' and a.dateFin between '$date_debut' and '$date_fin' ORDER BY a.display, a.dateDebut ASC";
@@ -112,9 +113,10 @@ final class DashboardAdminParticipantParcoursAction
return $query->getResult();
}
- public function getParcours($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getParcours($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -123,9 +125,10 @@ final class DashboardAdminParticipantParcoursAction
return $query->getResult();
}
- public function getGt($jour,$id) {
- $date_debut=$jour." 17:00:00";
- $date_fin=$jour." 20:00:00";
+ public function getGt($jour, $id)
+ {
+ $date_debut = $jour . " 17:00:00";
+ $date_fin = $jour . " 20:00:00";
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -134,10 +137,11 @@ final class DashboardAdminParticipantParcoursAction
return $query->getResult();
}
- public function getInscription($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
- $date_gtsoir=$jour." 17:00:00";
+ public function getInscription($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
+ $date_gtsoir = $jour . " 17:00:00";
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -145,8 +149,7 @@ final class DashboardAdminParticipantParcoursAction
$dql .= "AND a.dateDebut < '$date_gtsoir'";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
-
+ }
private function getIntervenants()
{
diff --git a/app/src/Action/DashboardAdminParticipantParcoursFormationAction.php b/app/src/Action/DashboardAdminParticipantParcoursFormationAction.php
index 6777d6c0aefd75e5e0873819d197bc7e1b4a3109..6a27f81320eecb870cf260d211c7ffe89f60ddc3 100644
--- a/app/src/Action/DashboardAdminParticipantParcoursFormationAction.php
+++ b/app/src/Action/DashboardAdminParticipantParcoursFormationAction.php
@@ -19,23 +19,23 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardAdminParticipantParcoursFormationAction
{
- private $view;
- private $logger;
- private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+ private $em;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard page action dispatched");
$params = $request->getQueryParams();
- $token = $params['token'];
+ $token = $params['token'];
$id_agenda = (int) $params['agenda'];
$valid = $params['valid'];
$roleSI = $request->getAttribute('roleSI');
@@ -46,7 +46,7 @@ final class DashboardAdminParticipantParcoursFormationAction
// Suppression de l'inscription à la formation
if ($valid == 'false') {
- $inscription = $this->getInscriptionAgenda($id_participant,$id_agenda);
+ $inscription = $this->getInscriptionAgenda($id_participant, $id_agenda);
$this->em->remove($inscription[0]);
$this->em->flush();
@@ -54,45 +54,43 @@ final class DashboardAdminParticipantParcoursFormationAction
// Inscription à la formation
if ($valid == 'true') {
$allParticipantAgenda = $this->getParcours($params['jour'], $params['debut'], $params['fin'], $id_participant);
- $agenda=$this->getAgenda($id_agenda);
- if(count($allParticipantAgenda) < 1 || $agenda[0]->getFormation()->getType() == 'Groupe de Travail') {
+ $agenda = $this->getAgenda($id_agenda);
+ if (count($allParticipantAgenda) < 1 || $agenda[0]->getFormation()->getType() == 'Groupe de Travail') {
$inscription = new \App\Entity\ParticipantAgenda();
$inscription->setParticipant($participant);
$inscription->setAgenda($agenda[0]);
date_default_timezone_set('UTC');
- $ladate=date_create_from_format('Y-m-d H:i:s', date("Y-m-d H:i:s"));
+ $ladate = date_create_from_format('Y-m-d H:i:s', date("Y-m-d H:i:s"));
$inscription->setDateInscription($ladate);
$this->em->persist($inscription);
$this->em->flush();
}
- }
+ }
$a = [
'page' => 'dashboard',
'token' => $token,
'participant' => $participant,
- ];
- $a['pa_4_am'] = $this->getParcours('2017-07-04','08:00:00','13:00:00',$participant->getId());
- $a['pa_4_pm'] = $this->getParcours('2017-07-04','12:00:00','19:00:00',$participant->getId());
- $a['pa_5_am'] = $this->getParcours('2017-07-05','08:00:00','13:00:00',$participant->getId());
- $a['pa_5_pm'] = $this->getParcours('2017-07-05','12:00:00','19:00:00',$participant->getId());
- $a['pa_6_am'] = $this->getParcours('2017-07-06','08:00:00','13:00:00',$participant->getId());
- $a['pa_6_pm'] = $this->getParcours('2017-07-06','12:00:00','19:00:00',$participant->getId());
- $a['pa_7_am'] = $this->getParcours('2017-07-07','08:00:00','13:00:00',$participant->getId());
- $a['pa_7_pm'] = $this->getParcours('2017-07-07','12:00:00','19:00:00',$participant->getId());
+ ];
+ $a['pa_4_am'] = $this->getParcours('2017-07-04', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_4_pm'] = $this->getParcours('2017-07-04', '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_5_am'] = $this->getParcours('2017-07-05', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_5_pm'] = $this->getParcours('2017-07-05', '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_6_am'] = $this->getParcours('2017-07-06', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_6_pm'] = $this->getParcours('2017-07-06', '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_7_am'] = $this->getParcours('2017-07-07', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_7_pm'] = $this->getParcours('2017-07-07', '12:00:00', '19:00:00', $participant->getId());
$this->view->render($response, 'dashboard_participant_parcours.twig', $a);
-
return $response;
}
-
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
@@ -100,8 +98,9 @@ final class DashboardAdminParticipantParcoursFormationAction
}
- public function getInscriptionAgenda($id_participant,$id_agenda) {
- $dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa WHERE pa.participant=$id_participant AND pa.agenda=$id_agenda";
+ public function getInscriptionAgenda($id_participant, $id_agenda)
+ {
+ $dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa WHERE pa.participant=$id_participant AND pa.agenda = $id_agenda";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
@@ -111,12 +110,12 @@ final class DashboardAdminParticipantParcoursFormationAction
$dql = "SELECT a FROM App\Entity\Agenda a WHERE a.id=$id_agenda";
$query = $this->em->createQuery($dql);
return $query->getResult();
-
}
- public function getParcours($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getParcours($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -124,7 +123,4 @@ final class DashboardAdminParticipantParcoursFormationAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
-
-
}
diff --git a/app/src/Action/DashboardAdminPreAgendaAction.php b/app/src/Action/DashboardAdminPreAgendaAction.php
index 8efcba5665cceda5d117af6095338cb473307c44..8665a04046a142b01aa8711b7f9ae7b693daf5c2 100644
--- a/app/src/Action/DashboardAdminPreAgendaAction.php
+++ b/app/src/Action/DashboardAdminPreAgendaAction.php
@@ -40,35 +40,38 @@ final class DashboardAdminPreAgendaAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo') ){
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo')) {
return $response->withStatus(401);
}
$a = [
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'jdev' => $this->settings['jdev']
];
-
if (array_key_exists('jour', $params)) {
- $j=explode("-",$params['jour']);
+ $j = explode("-", $params['jour']);
$a['jour'] = $params['jour'];
- if ($params['debut'] == '08:00:00'){ $a['journee'] = ' - Matin';}
- if ($params['debut'] == '13:00:00'){ $a['journee'] = ' - Après-midi';}
+ if ($params['debut'] == '08:00:00') {
+ $a['journee'] = ' - Matin';
+ }
+ if ($params['debut'] == '13:00:00') {
+ $a['journee'] = ' - Après-midi';
+ }
- $preagendas = $this->getPreAgendas($params['jour'],$params['debut'],$params['fin']);
- $a['preagendas'] = $preagendas;
- }
+ $preagendas = $this->getPreAgendas($params['jour'], $params['debut'], $params['fin']);
+ $a['preagendas'] = $preagendas;
+ }
- $a['pa_4_am'] = $this->getPreAgendas($this->settings['jdev']['j1'],'08:00:00','13:00:00');
- $a['pa_4_pm'] = $this->getPreAgendas($this->settings['jdev']['j1'],'12:00:00','19:00:00');
- $a['pa_5_am'] = $this->getPreAgendas($this->settings['jdev']['j2'],'08:00:00','13:00:00');
- $a['pa_5_pm'] = $this->getPreAgendas($this->settings['jdev']['j2'],'12:00:00','19:00:00');
- $a['pa_6_am'] = $this->getPreAgendas($this->settings['jdev']['j3'],'08:00:00','13:00:00');
- $a['pa_6_pm'] = $this->getPreAgendas($this->settings['jdev']['j3'],'12:00:00','19:00:00');
- $a['pa_7_am'] = $this->getPreAgendas($this->settings['jdev']['j4'],'08:00:00','13:00:00');
- $a['pa_7_pm'] = $this->getPreAgendas($this->settings['jdev']['j4'],'12:00:00','19:00:00');
+ $a['pa_4_am'] = $this->getPreAgendas($this->settings['jdev']['j1'], '08:00:00', '13:00:00');
+ $a['pa_4_pm'] = $this->getPreAgendas($this->settings['jdev']['j1'], '12:00:00', '19:00:00');
+ $a['pa_5_am'] = $this->getPreAgendas($this->settings['jdev']['j2'], '08:00:00', '13:00:00');
+ $a['pa_5_pm'] = $this->getPreAgendas($this->settings['jdev']['j2'], '12:00:00', '19:00:00');
+ $a['pa_6_am'] = $this->getPreAgendas($this->settings['jdev']['j3'], '08:00:00', '13:00:00');
+ $a['pa_6_pm'] = $this->getPreAgendas($this->settings['jdev']['j3'], '12:00:00', '19:00:00');
+ $a['pa_7_am'] = $this->getPreAgendas($this->settings['jdev']['j4'], '08:00:00', '13:00:00');
+ $a['pa_7_pm'] = $this->getPreAgendas($this->settings['jdev']['j4'], '12:00:00', '19:00:00');
$tot_nb_inscrits = $this->getNbInscriptions();
$a['tot_nb_inscrits'] = $tot_nb_inscrits[0]['nb_inscrits'];
@@ -84,9 +87,10 @@ final class DashboardAdminPreAgendaAction
return $query->getResult();
}
- public function getPreAgendas($jour,$debut,$fin) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getPreAgendas($jour, $debut, $fin)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantPreAgenda pa where pa.preagenda=a.id) as nb_inscrits ";
$dql .= "FROM App\Entity\PreAgenda a ";
@@ -94,6 +98,4 @@ final class DashboardAdminPreAgendaAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
-
}
diff --git a/app/src/Action/DashboardAdminPreAgendaFormAction.php b/app/src/Action/DashboardAdminPreAgendaFormAction.php
index 00a12536697373c106b4e9056cce349ca5ecd9d3..950ecc1e42d7e18c5947a08b285f552e40d91650 100644
--- a/app/src/Action/DashboardAdminPreAgendaFormAction.php
+++ b/app/src/Action/DashboardAdminPreAgendaFormAction.php
@@ -40,17 +40,17 @@ final class DashboardAdminPreAgendaFormAction
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') ){
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm')) {
return $response->withStatus(401);
}
- if($request->isGet()) {
+ if ($request->isGet()) {
$formations = $this->getFormations();
$a = [
'page' => 'dashboard',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'formations' => $formations,
'jdev' => $this->settings['jdev']
];
@@ -59,26 +59,22 @@ final class DashboardAdminPreAgendaFormAction
$preagenda = $this->em->find('App\Entity\PreAgenda', $params['preagenda_id']);
$formations = $this->getOneFormation($params['preagenda_id']);
$a['preagenda'] = $preagenda;
-
}
- if (array_key_exists('quota', $params)) {
+ if (array_key_exists('quota', $params)) {
$parsedBody = $request->getParsedBody();
$debut = date_create_from_format('d/m/Y H:i', $params['jour'] . ' ' . $params['debut']);
$fin = date_create_from_format('d/m/Y H:i', $params['jour'] . ' ' . $params['fin']);
$quota = $params['quota'];
- $salles = $this->getSalles($debut->format('Y-m-d H:i:s'),$fin->format('Y-m-d H:i:s'),$quota);
+ $salles = $this->getSalles($debut->format('Y-m-d H:i:s'), $fin->format('Y-m-d H:i:s'), $quota);
$response = $response->write(json_encode($salles))->withHeader('Content-type', 'application/json');
return $response;
- }
- else {
+ } else {
$this->view->render($response, 'dashboard_admin_preagenda_form.twig', $a);
}
-
}
-
- if($request->isPost()) {
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$formation = $this->em->find('App\Entity\Formation', $parsedBody['formation']);
@@ -97,9 +93,8 @@ final class DashboardAdminPreAgendaFormAction
$response = $response->write('Nouvel preagenda enregistré')->withStatus(201);
}
-
- if($request->isPut()) {
+ if ($request->isPut()) {
$parsedBody = $request->getParsedBody();
$formation = $this->em->find('App\Entity\Formation', $parsedBody['formation']);
@@ -131,7 +126,6 @@ final class DashboardAdminPreAgendaFormAction
private function getFormations()
{
- //$dql = "SELECT f FROM App\Entity\Formation f LEFT JOIN f.preagendas a where f.confirme='t' AND a.dateDebut IS NULL ORDER BY f.nom ASC";
$dql = "SELECT f FROM App\Entity\Formation f LEFT JOIN f.preagendas a where a.dateDebut IS NULL ORDER BY f.nom ASC";
$query = $this->em->createQuery($dql);
return $query->getResult();
@@ -143,16 +137,8 @@ final class DashboardAdminPreAgendaFormAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
-
- // select distinct salle.id,salle.nom,salle.quota_physique,preagenda.date_debut,preagenda.date_fin from salle
- // left join preagenda on salle.id=preagenda.id_salle
- // where salle.quota_physique >= 30 and
- // salle.id not in
- // (select salle.id from salle left join preagenda on salle.id=preagenda.id_salle
- // where (preagenda.date_debut,preagenda.date_fin) overlaps ('2017-07-04 14:00:00','2017-07-04 17:00:00'))
- // order by salle.quota_physique;
- private function getSalles($debut,$fin,$quota)
+
+ private function getSalles($debut, $fin, $quota)
{
$dql = "SELECT distinct s FROM App\Entity\Salle s LEFT JOIN s.preagendas a ";
$dql .= "WHERE s.quotaPhysique >= $quota AND s.id NOT IN ";
diff --git a/app/src/Action/DashboardAdminRoleChoixAction.php b/app/src/Action/DashboardAdminRoleChoixAction.php
index 547a6e987d4fa19562961f965b0c7a7aa00e4098..a84c4f9a0968c19507d0a21292b7b580bbf271e2 100644
--- a/app/src/Action/DashboardAdminRoleChoixAction.php
+++ b/app/src/Action/DashboardAdminRoleChoixAction.php
@@ -19,56 +19,55 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardAdminRoleChoixAction
{
- private $view;
- private $logger;
- private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
- {
- $this->logger->info("admin valid role page action dispatched");
+ private $view;
+ private $logger;
+ private $em;
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
+ }
- if ($roleSI != 'admin') {
- return $response->withStatus(401);
- }
+ public function __invoke(Request $request, Response $response, $args)
+ {
+ $this->logger->info("admin valid role page action dispatched");
- $participant = $this->getParticipant($params['email']);
- if (!$participant) {
- return $response->withStatus(400);
- }
- $roleId = $params['role_orga'];
- if($roleId) {
- $role = $this->em->find('App\Entity\Role', $params['role_orga']);
- $participant->setRoleOrga($role->getId());
- } else {
- $participant->setRoleOrga(null);
- }
- $participant->setRoleSI($params['role_si']);
-
- $this->em->persist($participant);
- $this->em->flush();
-
- return $response;
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
+
+ if ($roleSI != 'admin') {
+ return $response->withStatus(401);
+ }
+
+ $participant = $this->getParticipant($params['email']);
+ if (!$participant) {
+ return $response->withStatus(400);
+ }
+ $roleId = $params['role_orga'];
+ if ($roleId) {
+ $role = $this->em->find('App\Entity\Role', $params['role_orga']);
+ $participant->setRoleOrga($role->getId());
+ } else {
+ $participant->setRoleOrga(null);
+ }
+ $participant->setRoleSI($params['role_si']);
+
+ $this->em->persist($participant);
+ $this->em->flush();
+
+ return $response;
}
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => strtolower($email)));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return true;
}
}
-
}
diff --git a/app/src/Action/DashboardAdminRoleFormAction.php b/app/src/Action/DashboardAdminRoleFormAction.php
index 154813cf5ab7cd531392110a7b8d4eb9b82c2739..dfd58f6113646c62a44e5481696cb3da68e37f30 100644
--- a/app/src/Action/DashboardAdminRoleFormAction.php
+++ b/app/src/Action/DashboardAdminRoleFormAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminRoleFormAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -44,22 +44,22 @@ final class DashboardAdminRoleFormAction
return $response->withStatus(401);
}
- if($request->isGet()) {
+ if ($request->isGet()) {
$a = [
'page' => 'dashboard',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'jdev' => $this->settings['jdev']
];
if (array_key_exists('role_id', $params)) {
$role = $this->em->find('App\Entity\Role', $params['role_id']);
$a['role'] = $role;
- };
+ }
$this->view->render($response, 'dashboard_admin_role_form.twig', $a);
}
- if($request->isPost()) {
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$role = new \App\Entity\Role();
$role->setLabel($parsedBody['label']);
@@ -68,7 +68,7 @@ final class DashboardAdminRoleFormAction
$response = $response->write('Nouveau role enregistré')->withStatus(201);
}
- if($request->isPut()) {
+ if ($request->isPut()) {
$parsedBody = $request->getParsedBody();
$role = $this->em->find('App\Entity\Role', $parsedBody['role_id']);
$role->setLabel($parsedBody['label']);
@@ -85,7 +85,4 @@ final class DashboardAdminRoleFormAction
return $response;
}
-
-
-
}
diff --git a/app/src/Action/DashboardAdminSalleAction.php b/app/src/Action/DashboardAdminSalleAction.php
index f5c9c8f2474861e5eb20b8798f6826c62dca1f75..7a794d7a87ba0ef68fd40208d8e45a5899e8cc39 100644
--- a/app/src/Action/DashboardAdminSalleAction.php
+++ b/app/src/Action/DashboardAdminSalleAction.php
@@ -23,44 +23,44 @@ final class DashboardAdminSalleAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
$this->settings = $settings;
- }
+ }
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin salle page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
- if ($roleSI != 'admin') {
- return $response->withStatus(401);
- }
+ if ($roleSI != 'admin') {
+ return $response->withStatus(401);
+ }
- $salles = $this->getSalles();
+ $salles = $this->getSalles();
$this->view->render($response, 'dashboard_admin_salle.twig', [
'page' => 'dashboard-admin-salle',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'salles' => $salles,
'jdev' => $this->settings['jdev']
]);
-
+
return $response;
}
- private function getSalles()
+ private function getSalles()
{
- $dql = "SELECT s FROM App\Entity\Salle s ORDER BY s.etage ASC";
- $query = $this->em->createQuery($dql);
- return $query->getResult();
+ $dql = "SELECT s FROM App\Entity\Salle s ORDER BY s.etage ASC";
+ $query = $this->em->createQuery($dql);
+ return $query->getResult();
}
}
diff --git a/app/src/Action/DashboardAdminSessionAgendaAction.php b/app/src/Action/DashboardAdminSessionAgendaAction.php
index a7941d7bb144fe5c9ce687a5878388eedcf599ab..6aa65bbd2f494258620da7e38521aa381c385710 100644
--- a/app/src/Action/DashboardAdminSessionAgendaAction.php
+++ b/app/src/Action/DashboardAdminSessionAgendaAction.php
@@ -17,12 +17,13 @@ use Doctrine\ORM\EntityManagerInterface;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Message\ResponseInterface as Response;
-final class DashboardAdminSessionAgendaAction {
+final class DashboardAdminSessionAgendaAction
+{
private $view;
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -30,7 +31,7 @@ final class DashboardAdminSessionAgendaAction {
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin session agenda action dispatched");
@@ -39,8 +40,8 @@ final class DashboardAdminSessionAgendaAction {
$token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo') ){
- return $response->withStatus(401);
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo')) {
+ return $response->withStatus(401);
}
$agenda = $this->em->find('App\Entity\Agenda', $params['agenda_id']);
@@ -51,13 +52,13 @@ final class DashboardAdminSessionAgendaAction {
$a = [
'page' => 'dashboard-admin-session-agenda',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'agenda' => $agenda,
- 'formation'=> $formation,
+ 'formation' => $formation,
'participants' => $participants,
'intervenants' => $intervenants,
'jdev' => $this->settings['jdev']
- ];
+ ];
$this->view->render($response, 'dashboard_admin_session_agenda.twig', $a);
return $response;
@@ -69,5 +70,5 @@ final class DashboardAdminSessionAgendaAction {
$dql = "SELECT distinct p.nom,p.id,p.prenom FROM App\Entity\ParticipantContribution pc LEFT JOIN pc.participant p where pc.contribution != 5 ORDER BY p.nom ASC";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
+ }
}
diff --git a/app/src/Action/DashboardAdminSessionPreAgendaAction.php b/app/src/Action/DashboardAdminSessionPreAgendaAction.php
index a67dcb8513cbfdd539c03f7351e7977128129864..70e11f23eef230714f79053599cb7c8490eea993 100644
--- a/app/src/Action/DashboardAdminSessionPreAgendaAction.php
+++ b/app/src/Action/DashboardAdminSessionPreAgendaAction.php
@@ -17,12 +17,13 @@ use Doctrine\ORM\EntityManagerInterface;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Message\ResponseInterface as Response;
-final class DashboardAdminSessionPreAgendaAction {
+final class DashboardAdminSessionPreAgendaAction
+{
private $view;
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -30,7 +31,7 @@ final class DashboardAdminSessionPreAgendaAction {
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin session pre-agenda action dispatched");
@@ -41,35 +42,30 @@ final class DashboardAdminSessionPreAgendaAction {
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo') ){
- return $response->withStatus(401);
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm') && ($roleSI != 'clo')) {
+ return $response->withStatus(401);
}
$a = [
'page' => 'dashboard-admin-emargement-liste',
'token' => $token,
- 'role_si'=> $roleSI,
- 'formation'=> $formation,
+ 'role_si' => $roleSI,
+ 'formation' => $formation,
'jdev' => $this->settings['jdev']
];
-
- $participants=$this->getAllParticipantAgenda($params['formation_id']);
- $a['participants'] = $participants;
+
+ $participants = $this->getAllParticipantAgenda($params['formation_id']);
+ $a['participants'] = $participants;
$this->view->render($response, 'dashboard_admin_session_pre_agenda.twig', $a);
return $response;
-
-
}
-
-
- public function getAllParticipantAgenda($id) {
+ public function getAllParticipantAgenda($id)
+ {
$dql = "SELECT pa from App\Entity\ParticipantPreAgenda pa LEFT JOIN pa.preagenda a ";
$dql .= "WHERE a.formation=$id";
$query = $this->em->createQuery($dql);
return $query->getResult();
-
- }
-
+ }
}
diff --git a/app/src/Action/DashboardAdminSondageStatAction.php b/app/src/Action/DashboardAdminSondageStatAction.php
index 2e5e2d9f5debc281e657d0290064bd3a7a603333..011254f5afe0224d8b947fa4bd1a71f1880627fc 100644
--- a/app/src/Action/DashboardAdminSondageStatAction.php
+++ b/app/src/Action/DashboardAdminSondageStatAction.php
@@ -26,30 +26,30 @@ final class DashboardAdminSondageStatAction
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard-participant-sondage page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
+ $params = $request->getQueryParams();
+ $token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- $email = $request->getAttribute('email');
- $participant = $this->getParticipant($email);
+ $email = $request->getAttribute('email');
+ $participant = $this->getParticipant($email);
$thematiques = $this->getThematiques();
$formations = $this->getFormations();
$inscriptions = $this->getSondage();
- $inscrits= $this->getInscrits();
+ $inscrits = $this->getInscrits();
$a = [
'page' => 'dashboard-participant-sondage',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'participant' => $participant,
'thematiques' => $thematiques,
'formations' => $formations,
@@ -57,22 +57,18 @@ final class DashboardAdminSondageStatAction
'tot_inscrits' => count($inscrits),
'jdev' => $this->settings['jdev']
];
-
- if (($roleSI === 'admin') || ($roleSI === 'clo')|| ($roleSI === 'clo_pgm')){
+ if (($roleSI === 'admin') || ($roleSI === 'clo') || ($roleSI === 'clo_pgm')) {
$this->view->render($response, 'dashboard_admin_sondage_stat.twig', $a);
}
return $response;
-
}
-
-
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
@@ -81,27 +77,29 @@ final class DashboardAdminSondageStatAction
private function getThematiques()
{
- $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.id";
+ $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.id";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
private function getFormations()
{
- $dql = "SELECT f FROM App\Entity\Formation f ORDER BY f.thematique,f.nom";
+ $dql = "SELECT f FROM App\Entity\Formation f ORDER BY f.thematique,f.nom";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
- public function getSondage() {
+ public function getSondage()
+ {
$dql = "SELECT ps from App\Entity\ParticipantSondage ps ";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
- public function getInscrits() {
+ public function getInscrits()
+ {
$dql = "SELECT distinct(ps.participant) from App\Entity\ParticipantSondage ps";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
+ }
}
diff --git a/app/src/Action/DashboardAdminThematiqueAction.php b/app/src/Action/DashboardAdminThematiqueAction.php
index 480b743d4325dbf508439a95fe5589f559ce449a..bae819e37cfd41346d70c0673b575249dbcc9826 100644
--- a/app/src/Action/DashboardAdminThematiqueAction.php
+++ b/app/src/Action/DashboardAdminThematiqueAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminThematiqueAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,35 +31,35 @@ final class DashboardAdminThematiqueAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
- $this->logger->info("dashboard admin page action dispatched");
+ $this->logger->info("dashboard admin page action dispatched");
+
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
+
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm')) {
+ return $response->withStatus(401);
+ }
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ $thematiques = $this->getThematiques();
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') ){
- return $response->withStatus(401);
- }
+ $this->view->render($response, 'dashboard_admin_thematique.twig', [
+ 'page' => 'dashboard-admin-thematique',
+ 'token' => $token,
+ 'role_si' => $roleSI,
+ 'thematiques' => $thematiques,
+ 'jdev' => $this->settings['jdev']
+ ]);
- $thematiques = $this->getThematiques();
-
- $this->view->render($response, 'dashboard_admin_thematique.twig', [
- 'page' => 'dashboard-admin-thematique',
- 'token' => $token,
- 'role_si'=> $roleSI,
- 'thematiques' => $thematiques,
- 'jdev' => $this->settings['jdev']
- ]);
-
- return $response;
+ return $response;
}
private function getThematiques()
{
- $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
+ $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
diff --git a/app/src/Action/DashboardAdminThematiqueAgendaAction.php b/app/src/Action/DashboardAdminThematiqueAgendaAction.php
index 42e50d70806162c8746c2b8d40543043dfdb90a1..77d029abe708679bfa7029ac960fb39f0eb2be27 100644
--- a/app/src/Action/DashboardAdminThematiqueAgendaAction.php
+++ b/app/src/Action/DashboardAdminThematiqueAgendaAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminThematiqueAgendaAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,7 +31,7 @@ final class DashboardAdminThematiqueAgendaAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin page action dispatched");
@@ -41,39 +41,36 @@ final class DashboardAdminThematiqueAgendaAction
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') ){
- return $response->withStatus(401);
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm')) {
+ return $response->withStatus(401);
}
$a = [
'page' => 'dashboard-admin-thematique-agenda',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'jdev' => $this->settings['jdev']
];
$a['thematique'] = $this->em->find('App\Entity\Thematique', $params['them_id']);
-
- $a['pa_am'][0] = $this->getAgendas($this->settings['jdev']['j1'],'08:00:00','13:00:00');
- $a['pa_pm'][0] = $this->getAgendas($this->settings['jdev']['j1'],'12:00:00','19:00:00');
- $a['pa_am'][1] = $this->getAgendas($this->settings['jdev']['j2'],'08:00:00','13:00:00');
- $a['pa_pm'][1] = $this->getAgendas($this->settings['jdev']['j2'],'12:00:00','19:00:00');
- $a['pa_am'][2] = $this->getAgendas($this->settings['jdev']['j3'],'08:00:00','13:00:00');
- $a['pa_pm'][2] = $this->getAgendas($this->settings['jdev']['j3'],'12:00:00','19:00:00');
- $a['pa_am'][3] = $this->getAgendas($this->settings['jdev']['j4'],'08:00:00','13:00:00');
- $a['pa_pm'][3] = $this->getAgendas($this->settings['jdev']['j4'],'12:00:00','19:00:00');
+ $a['pa_am'][0] = $this->getAgendas($this->settings['jdev']['j1'], '08:00:00', '13:00:00');
+ $a['pa_pm'][0] = $this->getAgendas($this->settings['jdev']['j1'], '12:00:00', '19:00:00');
+ $a['pa_am'][1] = $this->getAgendas($this->settings['jdev']['j2'], '08:00:00', '13:00:00');
+ $a['pa_pm'][1] = $this->getAgendas($this->settings['jdev']['j2'], '12:00:00', '19:00:00');
+ $a['pa_am'][2] = $this->getAgendas($this->settings['jdev']['j3'], '08:00:00', '13:00:00');
+ $a['pa_pm'][2] = $this->getAgendas($this->settings['jdev']['j3'], '12:00:00', '19:00:00');
+ $a['pa_am'][3] = $this->getAgendas($this->settings['jdev']['j4'], '08:00:00', '13:00:00');
+ $a['pa_pm'][3] = $this->getAgendas($this->settings['jdev']['j4'], '12:00:00', '19:00:00');
- $this->view->render($response, 'dashboard_admin_thematique_agenda.twig',$a);
+ $this->view->render($response, 'dashboard_admin_thematique_agenda.twig', $a);
return $response;
-
-
}
- private function getAgendas($jour,$debut,$fin)
+ private function getAgendas($jour, $debut, $fin)
{
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits ";
$dql .= "FROM App\Entity\Agenda a ";
@@ -82,6 +79,4 @@ final class DashboardAdminThematiqueAgendaAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
-
}
diff --git a/app/src/Action/DashboardAdminThematiqueFormAction.php b/app/src/Action/DashboardAdminThematiqueFormAction.php
index 76eeb64cc1f165c90b6c31f923293d78c080906b..c2f81d78a211d2f16d46706edd4ff82012c7002f 100644
--- a/app/src/Action/DashboardAdminThematiqueFormAction.php
+++ b/app/src/Action/DashboardAdminThematiqueFormAction.php
@@ -23,68 +23,66 @@ final class DashboardAdminThematiqueFormAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
$this->logger = $logger;
$this->em = $em;
$this->settings = $settings;
- }
-
-
+ }
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin thematique page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $roleSI = $request->getAttribute('roleSI');
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $roleSI = $request->getAttribute('roleSI');
- if ($roleSI != 'admin') {
- return $response->withStatus(401);
- }
+ if ($roleSI != 'admin') {
+ return $response->withStatus(401);
+ }
- if($request->isGet()) {
- $a = [
- 'page' => 'dashboard-admin-thematique-form',
- 'token' => $token,
- 'role_si'=> $roleSI,
- 'jdev' => $this->settings['jdev']
- ];
- if (array_key_exists('thematique_id', $params)) {
- $thematique = $this->em->find('App\Entity\Thematique', $params['thematique_id']);
- $a['thematique'] = $thematique;
- };
- $this->view->render($response, 'dashboard_admin_thematique_form.twig', $a);
- }
+ if ($request->isGet()) {
+ $a = [
+ 'page' => 'dashboard-admin-thematique-form',
+ 'token' => $token,
+ 'role_si' => $roleSI,
+ 'jdev' => $this->settings['jdev']
+ ];
+ if (array_key_exists('thematique_id', $params)) {
+ $thematique = $this->em->find('App\Entity\Thematique', $params['thematique_id']);
+ $a['thematique'] = $thematique;
+ }
+ $this->view->render($response, 'dashboard_admin_thematique_form.twig', $a);
+ }
- if($request->isPost()) {
- $parsedBody = $request->getParsedBody();
- $thematique = new \App\Entity\Thematique();
- $thematique->setNom($parsedBody['nom']);
- $thematique->setLabel($parsedBody['label']);
- $this->em->persist($thematique);
- $this->em->flush();
- $response = $response->write('Nouvelle thematique enregistrée')->withStatus(201);
- }
+ if ($request->isPost()) {
+ $parsedBody = $request->getParsedBody();
+ $thematique = new \App\Entity\Thematique();
+ $thematique->setNom($parsedBody['nom']);
+ $thematique->setLabel($parsedBody['label']);
+ $this->em->persist($thematique);
+ $this->em->flush();
+ $response = $response->write('Nouvelle thematique enregistrée')->withStatus(201);
+ }
- if($request->isPut()) {
- $parsedBody = $request->getParsedBody();
- $thematique = $this->em->find('App\Entity\Thematique', $parsedBody['thematique_id']);
- $thematique->setNom($parsedBody['nom']);
- $thematique->setLabel($parsedBody['label']);
- $this->em->flush();
- $response = $response->write('Thematique n°' . $thematique->getId() . ' modifiée')->withStatus(201);
- }
+ if ($request->isPut()) {
+ $parsedBody = $request->getParsedBody();
+ $thematique = $this->em->find('App\Entity\Thematique', $parsedBody['thematique_id']);
+ $thematique->setNom($parsedBody['nom']);
+ $thematique->setLabel($parsedBody['label']);
+ $this->em->flush();
+ $response = $response->write('Thematique n°' . $thematique->getId() . ' modifiée')->withStatus(201);
+ }
- if ($request->isDelete()) {
- $thematique = $this->em->find('App\Entity\Thematique', $params['thematique_id']);
- $this->em->remove($thematique);
- $this->em->flush();
- $response = $response->write('Thematique id: ' . $params['thematique_id'] . ' supprimée')->withStatus(200);
- }
-
+ if ($request->isDelete()) {
+ $thematique = $this->em->find('App\Entity\Thematique', $params['thematique_id']);
+ $this->em->remove($thematique);
+ $this->em->flush();
+ $response = $response->write('Thematique id: ' . $params['thematique_id'] . ' supprimée')->withStatus(200);
+ }
return $response;
}
}
diff --git a/app/src/Action/DashboardAdminThematiquePreAgendaAction.php b/app/src/Action/DashboardAdminThematiquePreAgendaAction.php
index 872ad70c560e4bb5ce71787fc0df96b0fd47d37d..bfcaf12d8c0753d4c5176c34cbda66de20bc2fd0 100644
--- a/app/src/Action/DashboardAdminThematiquePreAgendaAction.php
+++ b/app/src/Action/DashboardAdminThematiquePreAgendaAction.php
@@ -23,7 +23,7 @@ final class DashboardAdminThematiquePreAgendaAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,7 +31,7 @@ final class DashboardAdminThematiquePreAgendaAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard admin page action dispatched");
@@ -41,43 +41,39 @@ final class DashboardAdminThematiquePreAgendaAction
$roleSI = $request->getAttribute('roleSI');
- if ( ($roleSI != 'admin') && ($roleSI != 'clo_pgm') ){
- return $response->withStatus(401);
+ if (($roleSI != 'admin') && ($roleSI != 'clo_pgm')) {
+ return $response->withStatus(401);
}
$a = [
'page' => 'dashboard-admin-thematique-agenda',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'jdev' => $this->settings['jdev']
];
$a['thematique'] = $this->em->find('App\Entity\Thematique', $params['them_id']);
- //$formations = $this->getFormations($params['them_id']);
- $a['pa_4_am'] = $this->getPreAgendas($this->settings['jdev']['j1'],'08:00:00','13:00:00');
- $a['pa_4_pm'] = $this->getPreAgendas($this->settings['jdev']['j1'],'12:00:00','19:00:00');
- $a['pa_5_am'] = $this->getPreAgendas($this->settings['jdev']['j2'],'08:00:00','13:00:00');
- $a['pa_5_pm'] = $this->getPreAgendas($this->settings['jdev']['j2'],'12:00:00','19:00:00');
- $a['pa_6_am'] = $this->getPreAgendas($this->settings['jdev']['j3'],'08:00:00','13:00:00');
- $a['pa_6_pm'] = $this->getPreAgendas($this->settings['jdev']['j3'],'12:00:00','19:00:00');
- $a['pa_7_am'] = $this->getPreAgendas($this->settings['jdev']['j4'],'08:00:00','13:00:00');
- $a['pa_7_pm'] = $this->getPreAgendas($this->settings['jdev']['j4'],'12:00:00','19:00:00');
+ $a['pa_4_am'] = $this->getPreAgendas($this->settings['jdev']['j1'], '08:00:00', '13:00:00');
+ $a['pa_4_pm'] = $this->getPreAgendas($this->settings['jdev']['j1'], '12:00:00', '19:00:00');
+ $a['pa_5_am'] = $this->getPreAgendas($this->settings['jdev']['j2'], '08:00:00', '13:00:00');
+ $a['pa_5_pm'] = $this->getPreAgendas($this->settings['jdev']['j2'], '12:00:00', '19:00:00');
+ $a['pa_6_am'] = $this->getPreAgendas($this->settings['jdev']['j3'], '08:00:00', '13:00:00');
+ $a['pa_6_pm'] = $this->getPreAgendas($this->settings['jdev']['j3'], '12:00:00', '19:00:00');
+ $a['pa_7_am'] = $this->getPreAgendas($this->settings['jdev']['j4'], '08:00:00', '13:00:00');
+ $a['pa_7_pm'] = $this->getPreAgendas($this->settings['jdev']['j4'], '12:00:00', '19:00:00');
- $this->view->render($response, 'dashboard_admin_thematique_preagenda.twig',$a);
+ $this->view->render($response, 'dashboard_admin_thematique_preagenda.twig', $a);
return $response;
-
-
}
- private function getPreAgendas($jour,$debut,$fin)
+ private function getPreAgendas($jour, $debut, $fin)
{
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantPreAgenda pa where pa.preagenda=a.id) as nb_inscrits ";
$dql .= "FROM App\Entity\PreAgenda a ";
- //$dql = "SELECT a FROM App\Entity\PreAgenda a";
$dql .= " WHERE a.dateDebut between '$date_debut' and '$date_fin' and a.dateFin between '$date_debut' and '$date_fin'";
$query = $this->em->createQuery($dql);
@@ -90,6 +86,4 @@ final class DashboardAdminThematiquePreAgendaAction
$query = $this->em->createQuery($dql);
return $query->getArrayResult();
}
-
-
}
diff --git a/app/src/Action/DashboardGenerateBadgeAction.php b/app/src/Action/DashboardGenerateBadgeAction.php
index d0a165490214b6c8a59596d1564a447046a47ef7..97be0c60b916e8aef7b34af0645465f03f03b73c 100644
--- a/app/src/Action/DashboardGenerateBadgeAction.php
+++ b/app/src/Action/DashboardGenerateBadgeAction.php
@@ -19,24 +19,24 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardGenerateBadgeAction
{
- private $view;
- private $logger;
+ private $view;
+ private $logger;
private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Dashboard generate action dispatched");
$params = $request->getQueryParams();
$email = $params['email'];
- $participant = $this->getParticipant($email);
+ $participant = $this->getParticipant($email);
if (!$participant) {
return $response->write('Email invalide')->withStatus(400);
@@ -51,7 +51,7 @@ final class DashboardGenerateBadgeAction
$width = 890;
$height = 600;
$pwd = getcwd();
- if(!strpos($pwd, 'public')) {
+ if (!strpos($pwd, 'public')) {
$imagefile = './public/images/badge_' . $role . '.png';
$fontroboto = './config/Roboto-Black.ttf';
$fontrobotolight = './config/Roboto-Light.ttf';
@@ -77,28 +77,26 @@ final class DashboardGenerateBadgeAction
}
imagettftext($image, 40, 0, 255, 100, $black, $fontroboto, ucfirst(strtolower($participant->getPrenom())));
imagettftext($image, 40, 0, 255, 160, $black, $fontroboto, strtoupper($participant->getNom()));
- //imagettftext($image, 29, 0, 255, 250, $black, $fontrobotolight, $participant->getOrganisme()->getLabel());
$roleString = $participant->getRole();
- if (($roleString == 'Sponsor') || ($roleString == 'Exposant')){
+ if (($roleString == 'Sponsor') || ($roleString == 'Exposant')) {
imagettftext($image, 29, 0, 255, 250, $black, $fontrobotolight, $participant->getUnite());
- }
- else {
+ } else {
imagettftext($image, 29, 0, 255, 250, $black, $fontrobotolight, $participant->getOrganisme()->getLabel());
- }
+ }
if ($roleString == 'Invité') {
$roleString = 'Invite';
}
$roleLabel = '';
$idRoleOrga = $participant->getRoleOrga();
- if($idRoleOrga) {
+ if ($idRoleOrga) {
$role = $this->em->find('App\Entity\Role', $idRoleOrga);
$roleLabel = $role->getLabel();
$roleString .= ' - ' . $roleLabel;
}
- if($roleString == 'Participant' || $roleString == 'Accompagnant') {
+ if ($roleString == 'Participant' || $roleString == 'Accompagnant') {
imagettftext($image, 35, 0, 400, 380, $black, $fontroboto, $roleString);
} else {
- if($roleLabel == 'Contributeur') {
+ if ($roleLabel == 'Contributeur') {
imagettftext($image, 33, 0, 210, 380, $red, $fontroboto, strtoupper($roleString));
} else {
imagettftext($image, 35, 0, 350, 380, $red, $fontroboto, strtoupper($roleString));
@@ -110,12 +108,8 @@ final class DashboardGenerateBadgeAction
imagepng($image, '/tmp/' . $badgeFileName);
// Génére le PDF avec l'image à l'intérieur
- $pdf = new \FPDF('P','mm','A4');
+ $pdf = new \FPDF('P', 'mm', 'A4');
$pdf->AddPage();
- //$pdf->SetFont('Arial', 'B', 16);
- //$pdf->Cell(40, 10, 'Badge utilisateur');
- //$pdf->Ln();
- //$pdf->Ln();
$pdf->Image('/tmp/' . $badgeFileName, null, null, 89);
// Stockage du pdf en mémoire
@@ -134,7 +128,7 @@ final class DashboardGenerateBadgeAction
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
diff --git a/app/src/Action/DashboardGenerateBadgeListAction.php b/app/src/Action/DashboardGenerateBadgeListAction.php
index 97fa9fc0e9aee05e11250378980e204ca32e992f..3fce85a724a7e08a6369a1573db5e646d510c934 100644
--- a/app/src/Action/DashboardGenerateBadgeListAction.php
+++ b/app/src/Action/DashboardGenerateBadgeListAction.php
@@ -19,23 +19,23 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardGenerateBadgeListAction
{
- private $view;
- private $logger;
+ private $view;
+ private $logger;
private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Dashboard generate action dispatched");
$params = $request->getQueryParams();
- if ($params['role'] != 'contributeur'){
+ if ($params['role'] != 'contributeur') {
$role = $this->verifRole($params['role']);
if (!$role) {
@@ -46,13 +46,12 @@ final class DashboardGenerateBadgeListAction
} else {
$participants = $this->getParticipants($role);
}
- }
- else {
+ } else {
$participants = $this->getContributeurs();
- }
+ }
// Génére le PDF
- $pdf = new \FPDF('P','mm','A4');
+ $pdf = new \FPDF('P', 'mm', 'A4');
$pdf->AddPage();
$nbParticipants = count($participants);
@@ -70,8 +69,8 @@ final class DashboardGenerateBadgeListAction
$pdf->Ln(60);
$cntForPage += 2;
if ($cntForPage == 8) {
- $pdf->AddPage();
- $cntForPage = 0;
+ $pdf->AddPage();
+ $cntForPage = 0;
}
}
$z += 2;
@@ -98,7 +97,7 @@ final class DashboardGenerateBadgeListAction
$width = 890;
$height = 600;
$pwd = getcwd();
- if(!strpos($pwd, 'public')) {
+ if (!strpos($pwd, 'public')) {
$imagefile = './public/images/badge_' . $role . '.png';
$fontroboto = './config/Roboto-Black.ttf';
$fontrobotolight = './config/Roboto-Light.ttf';
@@ -126,10 +125,9 @@ final class DashboardGenerateBadgeListAction
imagettftext($image, 40, 0, 255, 160, $black, $fontroboto, strtoupper($participant->getNom()));
$roleString = $participant->getRole();
- if (($roleString == 'Sponsor') || ($roleString == 'Exposant')){
+ if (($roleString == 'Sponsor') || ($roleString == 'Exposant')) {
imagettftext($image, 29, 0, 255, 250, $black, $fontrobotolight, $participant->getUnite());
- }
- else {
+ } else {
imagettftext($image, 29, 0, 255, 250, $black, $fontrobotolight, $participant->getOrganisme()->getLabel());
}
if ($roleString == 'Invité') {
@@ -137,15 +135,15 @@ final class DashboardGenerateBadgeListAction
}
$roleLabel = '';
$idRoleOrga = $participant->getRoleOrga();
- if($idRoleOrga) {
+ if ($idRoleOrga) {
$role = $this->em->find('App\Entity\Role', $idRoleOrga);
$roleLabel = $role->getLabel();
$roleString .= ' - ' . $roleLabel;
}
- if($roleString == 'Participant' || $roleString == 'Accompagnant') {
+ if ($roleString == 'Participant' || $roleString == 'Accompagnant') {
imagettftext($image, 35, 0, 400, 380, $black, $fontroboto, $roleString);
} else {
- if($roleLabel == 'Contributeur') {
+ if ($roleLabel == 'Contributeur') {
imagettftext($image, 33, 0, 210, 380, $red, $fontroboto, strtoupper($roleString));
} else {
imagettftext($image, 35, 0, 350, 380, $red, $fontroboto, strtoupper($roleString));
@@ -177,9 +175,9 @@ final class DashboardGenerateBadgeListAction
}
}
- private function getParticipants($role, $date = null)
+ private function getParticipants($role, $date = null)
{
- $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = '" . $role . "' and p.emailValide='t' ";
+ $dql = "SELECT p FROM App\Entity\Participant p WHERE p.role = '" . $role . "' and p.emailValide='t' ";
if ($date) {
$dql .= "and p.dateInscription >= '" . $date . " 00:00:00' ";
}
@@ -188,7 +186,7 @@ final class DashboardGenerateBadgeListAction
return $query->getResult();
}
- private function getContributeurs()
+ private function getContributeurs()
{
$dql = "SELECT p FROM App\Entity\Participant p WHERE p.roleOrga = '3' and p.emailValide='t' ORDER BY p.nom";
$query = $this->em->createQuery($dql);
diff --git a/app/src/Action/DashboardParticipantAgendaAction.php b/app/src/Action/DashboardParticipantAgendaAction.php
index 4e50651f730904a7dd945f5de99359d770807972..5da73655c57e312c1dd9abc1d5f7f501727e1917 100644
--- a/app/src/Action/DashboardParticipantAgendaAction.php
+++ b/app/src/Action/DashboardParticipantAgendaAction.php
@@ -45,39 +45,42 @@ final class DashboardParticipantAgendaAction
$a = [
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'thematiques' => $thematiques,
'intervenants' => $intervenants,
'jdev' => $this->settings['jdev']
];
-
if (array_key_exists('jour', $params)) {
$a['jour'] = $params['jour'];
- if ($params['debut'] == '08:00:00'){ $a['journee'] = ' - Matin';}
- if ($params['debut'] == '13:00:00'){ $a['journee'] = ' - Après-midi';}
+ if ($params['debut'] == '08:00:00') {
+ $a['journee'] = ' - Matin';
+ }
+ if ($params['debut'] == '13:00:00') {
+ $a['journee'] = ' - Après-midi';
+ }
- $agendas = $this->getAgendas($params['jour'],$params['debut'],$params['fin']);
- $a['agendas'] = $agendas;
- }
+ $agendas = $this->getAgendas($params['jour'], $params['debut'], $params['fin']);
+ $a['agendas'] = $agendas;
+ }
- $a['pa_am'][0] = $this->getAgendas($this->settings['jdev']['j1'],'08:00:00','13:00:00');
- $a['pa_pm'][0] = $this->getAgendas($this->settings['jdev']['j1'],'12:00:00','19:00:00');
- $a['pa_am'][1] = $this->getAgendas($this->settings['jdev']['j2'],'08:00:00','13:00:00');
- $a['pa_pm'][1] = $this->getAgendas($this->settings['jdev']['j2'],'12:00:00','19:00:00');
- $a['pa_am'][2] = $this->getAgendas($this->settings['jdev']['j3'],'08:00:00','13:00:00');
- $a['pa_pm'][2] = $this->getAgendas($this->settings['jdev']['j3'],'12:00:00','19:00:00');
- $a['pa_am'][3] = $this->getAgendas($this->settings['jdev']['j4'],'08:00:00','13:00:00');
- $a['pa_pm'][3] = $this->getAgendas($this->settings['jdev']['j4'],'12:00:00','19:00:00');
+ $a['pa_am'][0] = $this->getAgendas($this->settings['jdev']['j1'], '08:00:00', '13:00:00');
+ $a['pa_pm'][0] = $this->getAgendas($this->settings['jdev']['j1'], '12:00:00', '19:00:00');
+ $a['pa_am'][1] = $this->getAgendas($this->settings['jdev']['j2'], '08:00:00', '13:00:00');
+ $a['pa_pm'][1] = $this->getAgendas($this->settings['jdev']['j2'], '12:00:00', '19:00:00');
+ $a['pa_am'][2] = $this->getAgendas($this->settings['jdev']['j3'], '08:00:00', '13:00:00');
+ $a['pa_pm'][2] = $this->getAgendas($this->settings['jdev']['j3'], '12:00:00', '19:00:00');
+ $a['pa_am'][3] = $this->getAgendas($this->settings['jdev']['j4'], '08:00:00', '13:00:00');
+ $a['pa_pm'][3] = $this->getAgendas($this->settings['jdev']['j4'], '12:00:00', '19:00:00');
$this->view->render($response, 'dashboard_participant_agenda.twig', $a);
-
return $response;
}
- public function getAgendas($jour,$debut,$fin) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getAgendas($jour, $debut, $fin)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits ";
@@ -89,11 +92,10 @@ final class DashboardParticipantAgendaAction
private function getThematiques()
{
- $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
+ $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
-
+ }
private function getIntervenants()
{
diff --git a/app/src/Action/DashboardParticipantEditFormAction.php b/app/src/Action/DashboardParticipantEditFormAction.php
index 475b1b112cde40925a39c1b45804d1fbe66ac600..a740ac4bacd8883b69a5e4671ec61d6b2dd9157e 100644
--- a/app/src/Action/DashboardParticipantEditFormAction.php
+++ b/app/src/Action/DashboardParticipantEditFormAction.php
@@ -23,7 +23,7 @@ final class DashboardParticipantEditFormAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,7 +31,7 @@ final class DashboardParticipantEditFormAction
$this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard edit profil form action dispatched");
@@ -40,7 +40,7 @@ final class DashboardParticipantEditFormAction
$email = $request->getAttribute('email');
$participant = $this->getParticipant($email);
- if($request->isGet()) {
+ if ($request->isGet()) {
$organismesRepository = $this->em->getRepository('App\Entity\Organisme');
$organismes = $organismesRepository->findAll();
@@ -68,12 +68,12 @@ final class DashboardParticipantEditFormAction
'communaute1' => $communaute1,
'communaute2' => $communaute2,
'communaute3' => $communaute3,
- 'contributions' => $contributions,
+ 'contributions' => $contributions,
'jdev' => $this->settings['jdev']
]);
}
- if($request->isPost()) {
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$error = false;
@@ -81,14 +81,14 @@ final class DashboardParticipantEditFormAction
$messages = array();
$mandatoryFields = array(
- 'nom',
+ 'nom',
'prenom',
'emploi',
'unite',
'region'
);
- foreach ($mandatoryFields as $a) {
+ foreach ($mandatoryFields as $a) {
if ($this->isEmptyField($a, $parsedBody)) {
$error = true;
$code = 400;
@@ -115,13 +115,12 @@ final class DashboardParticipantEditFormAction
$response = $response->write('Edition du participant ok')->withStatus(200);
}
}
-
return $response;
}
private function isEmptyField($field, $parsedBody)
{
- if(!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
+ if (!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
return true;
} else {
return false;
@@ -130,7 +129,7 @@ final class DashboardParticipantEditFormAction
private function verifEmploi($parsedBody)
{
- switch($parsedBody['emploi']) {
+ switch ($parsedBody['emploi']) {
case 'Doctorant':
case 'Technicien':
case 'Ingénieur':
@@ -149,16 +148,16 @@ final class DashboardParticipantEditFormAction
private function verifRegion($parsedBody)
{
- switch($parsedBody['region']) {
+ switch ($parsedBody['region']) {
case 'Auvergne-Rhône-Alpes':
case 'Bourgogne-Franche-Comté':
case 'Bretagne':
- case 'Centre-Val-de-Loire':
+ case 'Centre-Val-de-Loire':
case 'Corse':
case 'Grand-Est':
- case 'Hauts-de-France':
+ case 'Hauts-de-France':
case 'Ile-de-France':
- case 'Nouvelle-Aquitaine':
+ case 'Nouvelle-Aquitaine':
case 'Normandie':
case 'Occitanie':
case 'Outre-Mer':
@@ -175,7 +174,7 @@ final class DashboardParticipantEditFormAction
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
@@ -225,13 +224,10 @@ final class DashboardParticipantEditFormAction
return $participant;
}
-
-
-
- private function deleteAllContributions($participant)
+ private function deleteAllContributions($participant)
{
- foreach($participant->getContributions() as $contribution) {
+ foreach ($participant->getContributions() as $contribution) {
$this->em->remove($contribution);
}
$this->em->flush();
@@ -249,11 +245,10 @@ final class DashboardParticipantEditFormAction
}
}
}
-
- private function deleteAllReseaux($participant)
+ private function deleteAllReseaux($participant)
{
- foreach($participant->getReseaux() as $reseau) {
+ foreach ($participant->getReseaux() as $reseau) {
$this->em->remove($reseau);
}
$this->em->flush();
@@ -272,9 +267,9 @@ final class DashboardParticipantEditFormAction
}
}
- private function deleteAllCommunautes($participant)
+ private function deleteAllCommunautes($participant)
{
- foreach($participant->getCommunautes() as $communaute) {
+ foreach ($participant->getCommunautes() as $communaute) {
$this->em->remove($communaute);
}
$this->em->flush();
diff --git a/app/src/Action/DashboardParticipantParcoursAction.php b/app/src/Action/DashboardParticipantParcoursAction.php
index e2c7a4b63f763aeeedb8eea4bbc6d4eeb91547c4..e8453cc9b8ca760857b0cea7837397273bd85adc 100644
--- a/app/src/Action/DashboardParticipantParcoursAction.php
+++ b/app/src/Action/DashboardParticipantParcoursAction.php
@@ -26,47 +26,46 @@ final class DashboardParticipantParcoursAction
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard-participant-parcours page action dispatched");
-
- $params = $request->getQueryParams();
- $token = $params['token'];
+ $params = $request->getQueryParams();
+ $token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- $email = $request->getAttribute('email');
- $participant = $this->getParticipant($email);
+ $email = $request->getAttribute('email');
+ $participant = $this->getParticipant($email);
$intervenants = $this->getIntervenants();
$a = [
'page' => 'dashboard-participant-parcours',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'participant' => $participant,
'intervenants' => $intervenants,
'jdev' => $this->settings['jdev']
- ];
+ ];
- $a['pa_am'][0] = $this->getParcours($this->settings['jdev']['j1'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][0] = $this->getParcours($this->settings['jdev']['j1'],'12:00:00','19:00:00',$participant->getId());
- $a['pa_am'][1] = $this->getParcours($this->settings['jdev']['j2'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][1] = $this->getParcours($this->settings['jdev']['j2'],'12:00:00','19:00:00',$participant->getId());
- $a['pa_am'][2] = $this->getParcours($this->settings['jdev']['j3'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][2] = $this->getParcours($this->settings['jdev']['j3'],'12:00:00','19:00:00',$participant->getId());
- $a['pa_am'][3] = $this->getParcours($this->settings['jdev']['j4'],'08:00:00','13:00:00',$participant->getId());
- $a['pa_pm'][3] = $this->getParcours($this->settings['jdev']['j4'],'12:00:00','19:00:00',$participant->getId());
+ $a['pa_am'][0] = $this->getParcours($this->settings['jdev']['j1'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][0] = $this->getParcours($this->settings['jdev']['j1'], '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_am'][1] = $this->getParcours($this->settings['jdev']['j2'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][1] = $this->getParcours($this->settings['jdev']['j2'], '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_am'][2] = $this->getParcours($this->settings['jdev']['j3'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][2] = $this->getParcours($this->settings['jdev']['j3'], '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_am'][3] = $this->getParcours($this->settings['jdev']['j4'], '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_pm'][3] = $this->getParcours($this->settings['jdev']['j4'], '12:00:00', '19:00:00', $participant->getId());
- if (array_key_exists('jour', $params)) {
- $agendas = $this->getAgendas($params['jour'],$params['debut'],$params['fin'],$participant->getId());
- $a['agendas'] = $agendas;
+ if (array_key_exists('jour', $params)) {
+ $agendas = $this->getAgendas($params['jour'], $params['debut'], $params['fin'], $participant->getId());
+ $a['agendas'] = $agendas;
$nbGt17 = $this->getGt($params['jour'], $participant->getId());
$a['nbgt17'] = count($nbGt17);
- $inscription = $this->getInscription($params['jour'],$params['debut'],$params['fin'],$participant->getId());
+ $inscription = $this->getInscription($params['jour'], $params['debut'], $params['fin'], $participant->getId());
$nbInscriptions = count($inscription);
if ($nbInscriptions > 0) {
$a['inscription'] = $inscription[0];
@@ -74,52 +73,48 @@ final class DashboardParticipantParcoursAction
$a['nb_inscriptions'] = $nbInscriptions;
$a['jour'] = $params['jour'];
$a['debut'] = $params['debut'];
- $a['fin'] = $params['fin'];
- if ($params['debut'] == '08:00:00'){ $a['journee'] = ' - Matin';}
- if ($params['debut'] == '13:00:00'){ $a['journee'] = ' - Après-midi';}
- }
- if (($roleSI === 'admin') || ($roleSI === 'clo')|| ($roleSI === 'clo_pgm')) {
- if (array_key_exists('jour', $params)) {
+ $a['fin'] = $params['fin'];
+ if ($params['debut'] == '08:00:00') {
+ $a['journee'] = ' - Matin';
+ }
+ if ($params['debut'] == '13:00:00') {
+ $a['journee'] = ' - Après-midi';
+ }
+ }
+ if (($roleSI === 'admin') || ($roleSI === 'clo') || ($roleSI === 'clo_pgm')) {
+ if (array_key_exists('jour', $params)) {
$this->view->render($response, 'dashboard_admin_parcours_agenda.twig', $a);
} else {
$this->view->render($response, 'dashboard_admin_parcours.twig', $a);
}
-
- }
- else {
- if (array_key_exists('jour', $params)) {
+ } else {
+ if (array_key_exists('jour', $params)) {
$this->view->render($response, 'dashboard_participant_parcours_agenda.twig', $a);
} else {
$this->view->render($response, 'dashboard_participant_parcours.twig', $a);
}
-
}
return $response;
-
}
-
-
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
}
}
- //select *,
- // (select count(*) from participant_x_agenda pa where pa.id_agenda=a.id) as nb_inscrits,
- // (select count(*) from participant_x_agenda p2 where p2.id_agenda=a.id and p2.id_participant=100) as check from agenda a;
- public function getAgendas($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getAgendas($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits, ";
- $dql .= "(select count(p2) from App\Entity\ParticipantAgenda p2 where p2.agenda=a.id and p2.participant=$id) as check, ";
+ $dql .= "(select count(p2) from App\Entity\ParticipantAgenda p2 where p2.agenda=a.id and p2.participant=$id) as check, ";
$dql .= "(select count(p3) from App\Entity\ParticipantAgenda p3 LEFT JOIN p3.agenda ag where p3.participant=$id and ag.dateDebut between '$date_debut' and '$date_fin' and ag.dateFin between '$date_debut' and '$date_fin' as inscrit ";
$dql .= "FROM App\Entity\Agenda a ";
$dql .= "WHERE a.dateDebut between '$date_debut' and '$date_fin' and a.dateFin between '$date_debut' and '$date_fin' ORDER BY a.display, a.dateDebut ASC";
@@ -127,9 +122,10 @@ final class DashboardParticipantParcoursAction
return $query->getResult();
}
- public function getParcours($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getParcours($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -138,9 +134,10 @@ final class DashboardParticipantParcoursAction
return $query->getResult();
}
- public function getGt($jour,$id) {
- $date_debut=$jour." 17:00:00";
- $date_fin=$jour." 20:00:00";
+ public function getGt($jour, $id)
+ {
+ $date_debut = $jour . " 17:00:00";
+ $date_fin = $jour . " 20:00:00";
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -149,10 +146,11 @@ final class DashboardParticipantParcoursAction
return $query->getResult();
}
- public function getInscription($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
- $date_gtsoir=$jour." 17:00:00";
+ public function getInscription($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
+ $date_gtsoir = $jour . " 17:00:00";
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -161,7 +159,6 @@ final class DashboardParticipantParcoursAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
private function getIntervenants()
{
@@ -169,5 +166,4 @@ final class DashboardParticipantParcoursAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardParticipantParcoursFormationAction.php b/app/src/Action/DashboardParticipantParcoursFormationAction.php
index 90f4254d348a74615fb1b807b06c70070cb5d99d..b57f8086380917688088b555caa6611e3c09fd1c 100644
--- a/app/src/Action/DashboardParticipantParcoursFormationAction.php
+++ b/app/src/Action/DashboardParticipantParcoursFormationAction.php
@@ -19,23 +19,23 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardParticipantParcoursFormationAction
{
- private $view;
- private $logger;
- private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+ private $em;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard page action dispatched");
$params = $request->getQueryParams();
- $token = $params['token'];
+ $token = $params['token'];
$id_agenda = (int) $params['agenda'];
$valid = $params['valid'];
$roleSI = $request->getAttribute('roleSI');
@@ -43,12 +43,12 @@ final class DashboardParticipantParcoursFormationAction
// Recuperation du participant
$email = $request->getAttribute('email');
$participant = $this->getParticipant($email);
- $id_participant=(int)$participant->getId();
+ $id_participant = (int)$participant->getId();
// Suppression de l'inscription à la formation
if ($valid == 'false') {
- $inscription = $this->getInscriptionAgenda($id_participant,$id_agenda);
+ $inscription = $this->getInscriptionAgenda($id_participant, $id_agenda);
$this->em->remove($inscription[0]);
$this->em->flush();
@@ -57,62 +57,60 @@ final class DashboardParticipantParcoursFormationAction
// Inscription à la formation
if ($valid == 'true') {
$allParticipantAgenda = $this->getInscription($params['jour'], $params['debut'], $params['fin'], $id_participant);
- $agenda=$this->getAgenda($id_agenda);
+ $agenda = $this->getAgenda($id_agenda);
- $quota=(int)$agenda[0]->getFormation()->getQuota();
- $nb_inscrits=count($this->getInscritsAgenda($id_agenda));
+ $quota = (int)$agenda[0]->getFormation()->getQuota();
+ $nb_inscrits = count($this->getInscritsAgenda($id_agenda));
// verification du nb inscrits par rapport au quota
if ($nb_inscrits != $quota) {
// verification du nb d'inscription par 1/2 journée
- if(count($allParticipantAgenda) < 1 || $agenda[0]->getFormation()->getType() == 'Groupe de Travail') {
+ if (count($allParticipantAgenda) < 1 || $agenda[0]->getFormation()->getType() == 'Groupe de Travail') {
$inscription = new \App\Entity\ParticipantAgenda();
$inscription->setParticipant($participant);
$inscription->setAgenda($agenda[0]);
date_default_timezone_set('UTC');
- $ladate=date_create_from_format('Y-m-d H:i:s', date("Y-m-d H:i:s"));
+ $ladate = date_create_from_format('Y-m-d H:i:s', date("Y-m-d H:i:s"));
$inscription->setDateInscription($ladate);
$this->em->persist($inscription);
$this->em->flush();
}
}
- }
+ }
$a = [
'page' => 'dashboard',
'token' => $token,
'participant' => $participant,
- ];
- $a['pa_4_am'] = $this->getParcours('2017-07-04','08:00:00','13:00:00',$participant->getId());
- $a['pa_4_pm'] = $this->getParcours('2017-07-04','12:00:00','19:00:00',$participant->getId());
- $a['pa_5_am'] = $this->getParcours('2017-07-05','08:00:00','13:00:00',$participant->getId());
- $a['pa_5_pm'] = $this->getParcours('2017-07-05','12:00:00','19:00:00',$participant->getId());
- $a['pa_6_am'] = $this->getParcours('2017-07-06','08:00:00','13:00:00',$participant->getId());
- $a['pa_6_pm'] = $this->getParcours('2017-07-06','12:00:00','19:00:00',$participant->getId());
- $a['pa_7_am'] = $this->getParcours('2017-07-07','08:00:00','13:00:00',$participant->getId());
- $a['pa_7_pm'] = $this->getParcours('2017-07-07','12:00:00','19:00:00',$participant->getId());
+ ];
+ $a['pa_4_am'] = $this->getParcours('2017-07-04', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_4_pm'] = $this->getParcours('2017-07-04', '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_5_am'] = $this->getParcours('2017-07-05', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_5_pm'] = $this->getParcours('2017-07-05', '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_6_am'] = $this->getParcours('2017-07-06', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_6_pm'] = $this->getParcours('2017-07-06', '12:00:00', '19:00:00', $participant->getId());
+ $a['pa_7_am'] = $this->getParcours('2017-07-07', '08:00:00', '13:00:00', $participant->getId());
+ $a['pa_7_pm'] = $this->getParcours('2017-07-07', '12:00:00', '19:00:00', $participant->getId());
$this->view->render($response, 'dashboard_participant_parcours.twig', $a);
-
return $response;
}
-
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
}
}
-
- public function getInscriptionAgenda($id_participant,$id_agenda) {
- $dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa WHERE pa.participant=$id_participant AND pa.agenda=$id_agenda";
+ public function getInscriptionAgenda($id_participant, $id_agenda)
+ {
+ $dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa WHERE pa.participant=$id_participant AND pa.agenda = $id_agenda";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
@@ -122,12 +120,12 @@ final class DashboardParticipantParcoursFormationAction
$dql = "SELECT a FROM App\Entity\Agenda a WHERE a.id=$id_agenda";
$query = $this->em->createQuery($dql);
return $query->getResult();
-
}
- public function getParcours($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getParcours($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -136,10 +134,11 @@ final class DashboardParticipantParcoursFormationAction
return $query->getResult();
}
- public function getInscription($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
- $date_gtsoir=$jour." 17:00:00";
+ public function getInscription($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
+ $date_gtsoir = $jour . " 17:00:00";
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -149,10 +148,10 @@ final class DashboardParticipantParcoursFormationAction
return $query->getResult();
}
- public function getInscritsAgenda($id_agenda) {
+ public function getInscritsAgenda($id_agenda)
+ {
$dql = "select pa from App\Entity\ParticipantAgenda pa where pa.agenda=$id_agenda";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
-
+ }
}
diff --git a/app/src/Action/DashboardParticipantPresenceAction.php b/app/src/Action/DashboardParticipantPresenceAction.php
index 90721218c65f97bff36046e2e65105522f24fb8b..1a94ed058b8da05c1ca0cd974e5b617f6d80f55d 100644
--- a/app/src/Action/DashboardParticipantPresenceAction.php
+++ b/app/src/Action/DashboardParticipantPresenceAction.php
@@ -23,7 +23,7 @@ final class DashboardParticipantPresenceAction
private $logger;
private $em;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
$this->view = $view;
@@ -31,15 +31,15 @@ final class DashboardParticipantPresenceAction
$this->em = $em;
$this->settings = $settings;
}
-
- public function __invoke(Request $request, Response $response, $args)
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard participant presence action dispatched");
$params = $request->getQueryParams();
- $token = $params['token'];
+ $token = $params['token'];
$email = $request->getAttribute('email');
- $participant = $this->getParticipant($email);
+ $participant = $this->getParticipant($email);
$agenda = $this->getAgenda($participant->getId());
@@ -50,10 +50,10 @@ final class DashboardParticipantPresenceAction
'jdev' => $this->settings['jdev']
];
- if($request->isPost()) {
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
- if(!empty($parsedBody['session']) && !empty($parsedBody['code_formation'])) {
+ if (!empty($parsedBody['session']) && !empty($parsedBody['code_formation'])) {
$idAgenda = $parsedBody['session'];
$codeFormation = $parsedBody['code_formation'];
$pa = $this->getParticipantAgenda($participant->getId(), $idAgenda);
@@ -74,21 +74,20 @@ final class DashboardParticipantPresenceAction
}
$this->view->render($response, 'dashboard_participant_presence.twig', $a);
-
return $response;
}
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
}
}
- public function getAgenda($id)
+ public function getAgenda($id)
{
$dql = "SELECT pa FROM App\Entity\ParticipantAgenda pa ";
$dql .= "WHERE pa.participant = $id";
@@ -103,4 +102,4 @@ final class DashboardParticipantPresenceAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-}
\ No newline at end of file
+}
diff --git a/app/src/Action/DashboardParticipantSessionsRefreshAction.php b/app/src/Action/DashboardParticipantSessionsRefreshAction.php
index 7c22373d603e8016fc7e734f294b667cd5674753..45c563ba475d1d6185d1bee48eed4c43678ba5bf 100644
--- a/app/src/Action/DashboardParticipantSessionsRefreshAction.php
+++ b/app/src/Action/DashboardParticipantSessionsRefreshAction.php
@@ -24,10 +24,10 @@ final class DashboardParticipantSessionsRefreshAction
public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
{
- $this->logger = $logger;
- $this->em = $em;
+ $this->logger = $logger;
+ $this->em = $em;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard-participant-sessions-refresh page action dispatched");
@@ -35,15 +35,15 @@ final class DashboardParticipantSessionsRefreshAction
$params = $request->getQueryParams();
$data = array();
- if(!array_key_exists('jour', $params) || !array_key_exists('debut', $params) || !array_key_exists('fin', $params)) {
+ if (!array_key_exists('jour', $params) || !array_key_exists('debut', $params) || !array_key_exists('fin', $params)) {
$agendas = $this->getAllAgendas();
- $inscrits= $this->getInscrits();
+ $inscrits = $this->getInscrits();
$data['tot_inscrits'] = count($inscrits);
} else {
$agendas = $this->getAgendas($params['jour'], $params['debut'], $params['fin']);
}
$aAgendas = array();
- foreach($agendas as $agenda) {
+ foreach ($agendas as $agenda) {
$aAgendas[] = array(
'id' => $agenda['agenda']->getId(),
'nb_inscrits' => $agenda['nb_inscrits'],
@@ -55,7 +55,8 @@ final class DashboardParticipantSessionsRefreshAction
return $response->withJson($data);
}
- private function getAgendas($jour, $debut, $fin) {
+ private function getAgendas($jour, $debut, $fin)
+ {
$date_debut = $jour . " " . $debut;
$date_fin = $jour . " " . $fin;
@@ -67,19 +68,19 @@ final class DashboardParticipantSessionsRefreshAction
return $query->getResult();
}
- private function getAllAgendas() {
+ private function getAllAgendas()
+ {
$dql = "SELECT a as agenda, ";
$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits ";
$dql .= "FROM App\Entity\Agenda a ";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
- public function getInscrits() {
+ public function getInscrits()
+ {
$dql = "SELECT distinct(pa.participant) from App\Entity\ParticipantAgenda pa";
$query = $this->em->createQuery($dql);
return $query->getResult();
- }
-
+ }
}
diff --git a/app/src/Action/DashboardParticipantSondageAction.php b/app/src/Action/DashboardParticipantSondageAction.php
index 0254f0d3d1b3419c852aa050c1b2604204aa6d82..71243d77f6fe59c19cb85a10537f2e8f15a67d99 100644
--- a/app/src/Action/DashboardParticipantSondageAction.php
+++ b/app/src/Action/DashboardParticipantSondageAction.php
@@ -26,21 +26,21 @@ final class DashboardParticipantSondageAction
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $settings)
{
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard-participant-sondage page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
+ $params = $request->getQueryParams();
+ $token = $params['token'];
$roleSI = $request->getAttribute('roleSI');
- $email = $request->getAttribute('email');
- $participant = $this->getParticipant($email);
+ $email = $request->getAttribute('email');
+ $participant = $this->getParticipant($email);
$thematiques = $this->getThematiques();
$formations = $this->getFormations();
$inscriptions = $this->getInscriptionSondage($participant->getId());
@@ -48,32 +48,27 @@ final class DashboardParticipantSondageAction
$a = [
'page' => 'dashboard-participant-sondage',
'token' => $token,
- 'role_si'=> $roleSI,
+ 'role_si' => $roleSI,
'participant' => $participant,
'thematiques' => $thematiques,
'formations' => $formations,
'inscriptions' => $inscriptions,
'jdev' => $this->settings['jdev']
];
-
- if (($roleSI === 'admin') || ($roleSI === 'clo')|| ($roleSI === 'clo_pgm')){
+ if (($roleSI === 'admin') || ($roleSI === 'clo') || ($roleSI === 'clo_pgm')) {
$this->view->render($response, 'dashboard_admin_sondage.twig', $a);
- }
- else {
+ } else {
$this->view->render($response, 'dashboard_participant_sondage.twig', $a);
}
return $response;
-
}
-
-
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
@@ -82,23 +77,23 @@ final class DashboardParticipantSondageAction
private function getThematiques()
{
- $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
+ $dql = "SELECT t FROM App\Entity\Thematique t ORDER BY t.label";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
private function getFormations()
{
- $dql = "SELECT f FROM App\Entity\Formation f ORDER BY f.thematique,f.nom";
+ $dql = "SELECT f FROM App\Entity\Formation f ORDER BY f.thematique,f.nom";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
- public function getInscriptionSondage($id) {
+ public function getInscriptionSondage($id)
+ {
$dql = "SELECT ps from App\Entity\ParticipantSondage ps ";
$dql .= "WHERE ps.participant=$id ";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardParticipantSondageFormationAction.php b/app/src/Action/DashboardParticipantSondageFormationAction.php
index e1b67f739160d19a8679b7e79cd936d873abbe23..cc46d7c18ddccff0431d3efb76aee0c68e71ad53 100644
--- a/app/src/Action/DashboardParticipantSondageFormationAction.php
+++ b/app/src/Action/DashboardParticipantSondageFormationAction.php
@@ -19,29 +19,27 @@ use Psr\Http\Message\ResponseInterface as Response;
final class DashboardParticipantSondageFormationAction
{
- private $view;
- private $logger;
- private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+ private $em;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
{
- $this->logger->info("dashboard page action dispatched");
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
+ }
+ public function __invoke(Request $request, Response $response, $args)
+ {
+ $this->logger->info("dashboard page action dispatched");
$params = $request->getQueryParams();
- $token = $params['token'];
+ $token = $params['token'];
$id_formation = (int) $params['formation'];
$valid = $params['valid'];
- $email = $request->getAttribute('email');
+ $email = $request->getAttribute('email');
$participant = $this->getParticipant($email);
- $id_participant=(int)$participant->getId();
-
+ $id_participant = (int)$participant->getId();
// Suppression de la sélection à la formation
if ($valid == 'false') {
@@ -55,44 +53,39 @@ final class DashboardParticipantSondageFormationAction
$formation = $this->em->find('App\Entity\Formation', $id_formation);
$inscription = new \App\Entity\ParticipantSondage();
$inscription->setParticipant($participant);
- $inscription->setFormation($formation);
+ $inscription->setFormation($formation);
date_default_timezone_set('UTC');
- $ladate=date_create_from_format('Y-m-d H:i:s', date("Y-m-d H:i:s"));
+ $ladate = date_create_from_format('Y-m-d H:i:s', date("Y-m-d H:i:s"));
$inscription->setDateInscription($ladate);
$this->em->persist($inscription);
$this->em->flush();
-
- }
-
+ }
$this->view->render($response, 'dashboard_participant_sondage.twig', [
'page' => 'dashboard',
'token' => $token,
'participant' => $participant
]);
-
return $response;
}
-
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
}
}
-
- public function getInscriptionSondage($id_participant, $id_formation) {
+ public function getInscriptionSondage($id_participant, $id_formation)
+ {
$dql = "SELECT ps from App\Entity\ParticipantSondage ps ";
$dql .= "WHERE ps.participant=$id_participant ";
$dql .= "AND ps.formation=$id_formation";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/DashboardSondageAction.php b/app/src/Action/DashboardSondageAction.php
index 7b23763cd4fd84041f10da7949dbf4d58d70aaa8..17f457fd0914ffd49f5fe8de0cfa775457cbf5bb 100644
--- a/app/src/Action/DashboardSondageAction.php
+++ b/app/src/Action/DashboardSondageAction.php
@@ -25,19 +25,19 @@ final class DashboardSondageAction
public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
{
- $this->view = $view;
- $this->logger = $logger;
- $this->em = $em;
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->em = $em;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("dashboard-sondage page action dispatched");
- $params = $request->getQueryParams();
- $token = $params['token'];
- $email = $request->getAttribute('email');
- $participant = $this->getParticipant($email);
+ $params = $request->getQueryParams();
+ $token = $params['token'];
+ $email = $request->getAttribute('email');
+ $participant = $this->getParticipant($email);
$a = [
'page' => 'dashboard-sondage',
@@ -47,43 +47,41 @@ final class DashboardSondageAction
if (array_key_exists('jour', $params)) {
- $j=explode("-",$params['jour']);
- if ($params['debut'] == '08:00:00'){ $a['jour'] = $j[2].' Juillet 2017 - Matin';}
- if ($params['debut'] == '13:00:00'){ $a['jour'] = $j[2].' Juillet 2017 - Après-midi';}
+ $j = explode("-", $params['jour']);
+ if ($params['debut'] == '08:00:00') {
+ $a['jour'] = $j[2] . ' Juillet 2017 - Matin';
+ }
+ if ($params['debut'] == '13:00:00') {
+ $a['jour'] = $j[2] . ' Juillet 2017 - Après-midi';
+ }
- $agendas = $this->getAgendas($params['jour'],$params['debut'],$params['fin'],$participant->getId());
- $a['agendas'] = $agendas;
+ $agendas = $this->getAgendas($params['jour'], $params['debut'], $params['fin'], $participant->getId());
+ $a['agendas'] = $agendas;
- $inscription = $this->getInscriptionAgenda($params['jour'],$params['debut'],$params['fin'],$participant->getId());
- $a['inscription'] = $inscription;
- }
+ $inscription = $this->getInscriptionAgenda($params['jour'], $params['debut'], $params['fin'], $participant->getId());
+ $a['inscription'] = $inscription;
+ }
$this->view->render($response, 'dashboard_sondage.twig', $a);
return $response;
-
}
-
-
private function getParticipant($email)
{
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => $email));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
}
}
- //select *,
- // (select count(*) from participant_x_agenda pa where pa.id_agenda=a.id) as nb_inscrits,
- // (select count(*) from participant_x_agenda p2 where p2.id_agenda=a.id and p2.id_participant=100) as check from agenda a;
- public function getAgendas($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getAgendas($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT a,";
- //$dql .= "(select count(pa) from App\Entity\ParticipantAgenda pa where pa.agenda=a.id) as nb_inscrits, ";
$dql .= "(select count(p2) from App\Entity\ParticipantAgenda p2 where p2.agenda=a.id and p2.participant=$id) as check ";
$dql .= "FROM App\Entity\Agenda a ";
$dql .= "WHERE a.dateDebut between '$date_debut' and '$date_fin' and a.dateFin between '$date_debut' and '$date_fin'";
@@ -92,9 +90,10 @@ final class DashboardSondageAction
}
- public function getInscriptionAgenda($jour,$debut,$fin,$id) {
- $date_debut=$jour." ".$debut;
- $date_fin=$jour." ".$fin;
+ public function getInscriptionAgenda($jour, $debut, $fin, $id)
+ {
+ $date_debut = $jour . " " . $debut;
+ $date_fin = $jour . " " . $fin;
$dql = "SELECT pa from App\Entity\ParticipantAgenda pa LEFT JOIN pa.agenda a ";
$dql .= "WHERE pa.participant=$id ";
@@ -102,5 +101,4 @@ final class DashboardSondageAction
$query = $this->em->createQuery($dql);
return $query->getResult();
}
-
}
diff --git a/app/src/Action/HomeAction.php b/app/src/Action/HomeAction.php
index 7c3bcc78bf7080b1868ef3fd7a1f103fc5d02d87..035a52f9ea407e27013f6f05b4a87275b48a6e6b 100644
--- a/app/src/Action/HomeAction.php
+++ b/app/src/Action/HomeAction.php
@@ -18,18 +18,18 @@ use Psr\Http\Message\ResponseInterface as Response;
final class HomeAction
{
- private $view;
- private $logger;
- private $settings;
-
- public function __construct(Twig $view, LoggerInterface $logger, $settings)
- {
- $this->view = $view;
- $this->logger = $logger;
- $this->settings = $settings;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+ private $settings;
+
+ public function __construct(Twig $view, LoggerInterface $logger, $settings)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ $this->settings = $settings;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Home page action dispatched");
diff --git a/app/src/Action/InfoAccesAction.php b/app/src/Action/InfoAccesAction.php
index fd74d335da236feb1906c1a8ff34c7568d622d65..eca2596add985ceb2ce72958ef411b2cbe3f2f5f 100644
--- a/app/src/Action/InfoAccesAction.php
+++ b/app/src/Action/InfoAccesAction.php
@@ -18,16 +18,16 @@ use Psr\Http\Message\ResponseInterface as Response;
final class InfoAccesAction
{
- private $view;
- private $logger;
-
- public function __construct(Twig $view, LoggerInterface $logger)
- {
- $this->view = $view;
- $this->logger = $logger;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Info acces page action dispatched");
diff --git a/app/src/Action/InfoGeneralesAction.php b/app/src/Action/InfoGeneralesAction.php
index 7139d9f0e235df436391225fbbb3d32d715f17e1..3c4d99ed37e701e2572801d0966ecfc0601fc5ae 100644
--- a/app/src/Action/InfoGeneralesAction.php
+++ b/app/src/Action/InfoGeneralesAction.php
@@ -18,16 +18,16 @@ use Psr\Http\Message\ResponseInterface as Response;
final class InfoGeneralesAction
{
- private $view;
- private $logger;
-
- public function __construct(Twig $view, LoggerInterface $logger)
- {
- $this->view = $view;
- $this->logger = $logger;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Info generales page action dispatched");
diff --git a/app/src/Action/InfoHebergementAction.php b/app/src/Action/InfoHebergementAction.php
index 59cd8560e347b3ae7b8fd71a98cb5f14a489daea..aae02f86cca1becfd2ea4eb07284c5acca4bd8d0 100644
--- a/app/src/Action/InfoHebergementAction.php
+++ b/app/src/Action/InfoHebergementAction.php
@@ -18,16 +18,16 @@ use Psr\Http\Message\ResponseInterface as Response;
final class InfoHebergementAction
{
- private $view;
- private $logger;
-
- public function __construct(Twig $view, LoggerInterface $logger)
- {
- $this->view = $view;
- $this->logger = $logger;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ private $view;
+ private $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Info hebergement page action dispatched");
diff --git a/app/src/Action/InscriptionAction.php b/app/src/Action/InscriptionAction.php
index 6573e8472a09074dd613e688ece546e1656a45e6..2b1c19249712f3047fcca8528bfe01d83e4ec3bf 100644
--- a/app/src/Action/InscriptionAction.php
+++ b/app/src/Action/InscriptionAction.php
@@ -19,26 +19,26 @@ use Psr\Http\Message\ResponseInterface as Response;
final class InscriptionAction
{
- private $view;
- private $logger;
+ private $view;
+ private $logger;
private $em;
private $mailer;
private $settings;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
- {
- $this->view = $view;
- $this->logger = $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->em = $em;
$this->mailer = $mailer;
$this->settings = $settings;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Inscription action dispatched");
- if($request->isGet()) {
+ if ($request->isGet()) {
$organismesRepository = $this->em->getRepository('App\Entity\Organisme');
$organismes = $organismesRepository->findAll();
@@ -70,7 +70,7 @@ final class InscriptionAction
]);
}
- if($request->isPost()) {
+ if ($request->isPost()) {
$parsedBody = $request->getParsedBody();
$error = false;
@@ -78,20 +78,20 @@ final class InscriptionAction
$messages = array();
$mandatoryFields = array(
- 'nom',
- 'prenom',
- 'email',
- 'password',
- 'statut',
- 'emploi',
- 'organisme',
- 'unite',
- 'role',
- 'region',
+ 'nom',
+ 'prenom',
+ 'email',
+ 'password',
+ 'statut',
+ 'emploi',
+ 'organisme',
+ 'unite',
+ 'role',
+ 'region',
'type_inscription'
);
- foreach ($mandatoryFields as $a) {
+ foreach ($mandatoryFields as $a) {
if ($this->isEmptyField($a, $parsedBody)) {
$error = true;
$code = 400;
@@ -111,7 +111,7 @@ final class InscriptionAction
$messages[] = 'L\'adresse email . ' . $parsedBody['email'] . ' est déjà utilisée';
}
- if(!$this->verifStatut($parsedBody)) {
+ if (!$this->verifStatut($parsedBody)) {
$error = true;
$code = 400;
$messages[] = 'Le statut ' . $parsedBody['statut'] . ' selectionné n\'est pas valide';
@@ -161,7 +161,7 @@ final class InscriptionAction
private function isEmptyField($field, $parsedBody)
{
- if(!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
+ if (!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
return true;
} else {
return false;
@@ -170,7 +170,7 @@ final class InscriptionAction
private function verifEmail($parsedBody)
{
- if($this->isEmptyField('email', $parsedBody)) {
+ if ($this->isEmptyField('email', $parsedBody)) {
return true;
}
@@ -183,12 +183,12 @@ final class InscriptionAction
private function verifExistParticipant($parsedBody)
{
- if($this->isEmptyField('email', $parsedBody)) {
+ if ($this->isEmptyField('email', $parsedBody)) {
return false;
}
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => strtolower($parsedBody['email'])));
- if(isset($participant)) {
+ if (isset($participant)) {
return false;
} else {
return true;
@@ -197,7 +197,7 @@ final class InscriptionAction
private function verifStatut($parsedBody)
{
- switch($parsedBody['statut']) {
+ switch ($parsedBody['statut']) {
case 'ETUDIANT':
case 'ACADEMIQUE':
case 'INDUSTRIEL':
@@ -211,7 +211,7 @@ final class InscriptionAction
private function verifEmploi($parsedBody)
{
- switch($parsedBody['emploi']) {
+ switch ($parsedBody['emploi']) {
case 'Doctorant':
case 'Technicien':
case 'Ingénieur':
@@ -230,12 +230,12 @@ final class InscriptionAction
private function verifOrganisme($parsedBody)
{
- if($this->isEmptyField('organisme', $parsedBody)) {
+ if ($this->isEmptyField('organisme', $parsedBody)) {
return false;
}
$organisme = $this->em->find('App\Entity\Organisme', $parsedBody['organisme']);
- if(!isset($organisme)) {
+ if (!isset($organisme)) {
return false;
} else {
return $organisme;
@@ -244,7 +244,7 @@ final class InscriptionAction
private function verifRole($parsedBody)
{
- switch($parsedBody['role']) {
+ switch ($parsedBody['role']) {
case 'Participant':
case 'Accompagnant':
case 'Organisateur':
@@ -261,16 +261,16 @@ final class InscriptionAction
private function verifRegion($parsedBody)
{
- switch($parsedBody['region']) {
+ switch ($parsedBody['region']) {
case 'Auvergne-Rhône-Alpes':
case 'Bourgogne-Franche-Comté':
case 'Bretagne':
- case 'Centre-Val-de-Loire':
+ case 'Centre-Val-de-Loire':
case 'Corse':
case 'Grand-Est':
- case 'Hauts-de-France':
+ case 'Hauts-de-France':
case 'Ile-de-France':
- case 'Nouvelle-Aquitaine':
+ case 'Nouvelle-Aquitaine':
case 'Normandie':
case 'Occitanie':
case 'Outre-Mer':
@@ -286,14 +286,14 @@ final class InscriptionAction
private function verifTypeInscription($parsedBody)
{
- switch($parsedBody['type_inscription']) {
+ switch ($parsedBody['type_inscription']) {
case 'PASS COMPLET':
case 'PASS LIBRE':
case 'PASS ACCOMPAGNANT':
case 'PASS ORGA':
case 'PASS INVITE':
case 'PASS SPONSOR':
- case 'PASS EXPOSANT':
+ case 'PASS EXPOSANT':
$bool = true;
break;
default:
@@ -344,7 +344,7 @@ final class InscriptionAction
}
$participant->setDateInscription(new \DateTime("now"));
$participant->setCleEmail(uniqid('', true)); // Clé activation pour verification email
- $participant->setEmailValide(false); // Attente URL activation
+ $participant->setEmailValide(false); // Attente URL activation
if ($parsedBody['role'] == 'Participant' || $parsedBody['role'] == 'Accompagnant') {
$participant->setCloValide(true); // True si participant ou accompagnant
} else {
@@ -407,7 +407,7 @@ final class InscriptionAction
if ($request->getUri()->getPort() != 80) {
$url .= ':' . $request->getUri()->getPort();
}
- $url .= '/valid-email?email=' . $participant->getEmail() . '&key=' . $participant->getCleEmail();
+ $url .= '/valid-email?email=' . $participant->getEmail() . '&key=' . $participant->getCleEmail();
$body = 'Bonjour ' . $participant->getPrenom() . ' ' . $participant->getNom() . PHP_EOL;
$body .= PHP_EOL;
@@ -418,7 +418,7 @@ final class InscriptionAction
$body .= 'Bien cordialement' . PHP_EOL;
$body .= 'Le comité d\'organisation des ' . $this->settings['jdev']['label'];
- $message = \Swift_Message::newInstance('Confirmation inscription aux '. $this->settings['jdev']['label'] )
+ $message = \Swift_Message::newInstance('Confirmation inscription aux ' . $this->settings['jdev']['label'])
->setFrom(['noreply@' . $this->settings['jdev']['url'] => $this->settings['jdev']['url']])
->setTo([$participant->getEmail()])
->setBody($body);
diff --git a/app/src/Action/NewPasswdAction.php b/app/src/Action/NewPasswdAction.php
index 22f783177e1f29842f0a5bb5532001aa648118a4..84f07b6aab51dbeabc6bc4ea475cbb69d7b03304 100644
--- a/app/src/Action/NewPasswdAction.php
+++ b/app/src/Action/NewPasswdAction.php
@@ -19,53 +19,52 @@ use Psr\Http\Message\ResponseInterface as Response;
final class NewPasswdAction
{
- private $view;
- private $logger;
+ private $view;
+ private $logger;
private $em;
private $mailer;
private $settings;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
- {
- $this->view = $view;
- $this->logger = $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->mailer = $mailer;
$this->em = $em;
$this->settings = $settings;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("New Password page action dispatched");
- if($request->isGet()) {
+ if ($request->isGet()) {
$this->view->render($response, 'new_passwd.twig', [
- 'page' => 'new-passwd'
- ]);
+ 'page' => 'new-passwd'
+ ]);
}
-
- if($request->isPost()) {
- $parsedBody = $request->getParsedBody();
+
+ if ($request->isPost()) {
+ $parsedBody = $request->getParsedBody();
$error = false;
$code = 200;
$messages = array();
- if ($this->isEmptyField('email', $parsedBody)) {
- $error = true;
- $code = 400;
- $messages[] = 'Champ vide';
- }
+ if ($this->isEmptyField('email', $parsedBody)) {
+ $error = true;
+ $code = 400;
+ $messages[] = 'Champ vide';
+ }
- if (!$this->verifEmail($parsedBody)) {
+ if (!$this->verifEmail($parsedBody)) {
$error = true;
$code = 400;
$messages[] = 'L\'adresse email renseignée est incorrect';
}
$participant = $this->getParticipant($parsedBody);
- if (!$participant)
- {
+ if (!$participant) {
$error = true;
$code = 400;
$messages[] = 'L\'adresse email ne correspond à aucun participant';
@@ -77,7 +76,7 @@ final class NewPasswdAction
$messages[] = 'Votre compte n\'est pas actif';
}
- if ($error) {
+ if ($error) {
$response = $response->write(implode('<br>', $messages))->withStatus($code);
} else {
$pwd = uniqid();
@@ -89,14 +88,14 @@ final class NewPasswdAction
$response = $response->write(json_encode(array('ok')))->withStatus($code);
}
- }
+ }
return $response;
}
- private function isEmptyField($field, $parsedBody)
+ private function isEmptyField($field, $parsedBody)
{
- if(!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
+ if (!isset($parsedBody[$field]) || empty($parsedBody[$field])) {
return true;
} else {
return false;
@@ -105,21 +104,21 @@ final class NewPasswdAction
private function getParticipant($parsedBody)
{
- if($this->isEmptyField('email', $parsedBody)) {
+ if ($this->isEmptyField('email', $parsedBody)) {
return false;
}
$participant = $this->em->getRepository('App\Entity\Participant')->findOneBy(array('email' => strtolower($parsedBody['email'])));
- if(isset($participant)) {
+ if (isset($participant)) {
return $participant;
} else {
return false;
}
}
- private function verifEmail($parsedBody)
+ private function verifEmail($parsedBody)
{
- if($this->isEmptyField('email', $parsedBody)) {
+ if ($this->isEmptyField('email', $parsedBody)) {
return true;
}
diff --git a/app/src/Action/ProgrammeAction.php b/app/src/Action/ProgrammeAction.php
index f2d1c8e4233d3de3a97261e5301e8bed8b27d101..ce73fb362746a4807a4eab5c2f0039767656b69c 100644
--- a/app/src/Action/ProgrammeAction.php
+++ b/app/src/Action/ProgrammeAction.php
@@ -21,14 +21,14 @@ final class ProgrammeAction
private $view;
private $logger;
private $settings;
-
+
public function __construct(Twig $view, LoggerInterface $logger, $settings)
{
- $this->view = $view;
- $this->logger = $logger;
+ $this->view = $view;
+ $this->logger = $logger;
$this->settings = $settings;
}
-
+
public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Programme page action dispatched");
diff --git a/app/src/Action/ValidEmailAction.php b/app/src/Action/ValidEmailAction.php
index b453110ea5c25d1482c2bd57a217976b8395d580..939bc89a4d6d1499f388a13e7bb0dfaa13824952 100644
--- a/app/src/Action/ValidEmailAction.php
+++ b/app/src/Action/ValidEmailAction.php
@@ -19,22 +19,22 @@ use Psr\Http\Message\ResponseInterface as Response;
final class ValidEmailAction
{
- private $view;
- private $logger;
+ private $view;
+ private $logger;
private $em;
private $mailer;
private $settings;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
- {
- $this->view = $view;
- $this->logger = $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em, $mailer, $settings)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->em = $em;
$this->mailer = $mailer;
$this->settings = $settings;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Valid email action dispatched");
@@ -47,8 +47,7 @@ final class ValidEmailAction
'page' => 'connexion',
'info' => 'Votre compte ' . $this->settings['label'] . ' est déjà actif'
]);
- }
- else if (isset($participant) && $participant->getCleEmail() == $params['key']) {
+ } else if (isset($participant) && $participant->getCleEmail() == $params['key']) {
// Gestion place pré-payée
$organisme = $participant->getOrganisme();
if ($organisme->getNbLibres() > 0 && $participant->getRole() == 'Participant') {
@@ -62,13 +61,12 @@ final class ValidEmailAction
if (!$participant->getCloValide()) {
$this->sendEmailValidClo($participant);
- } else if ($participant->getPassPrepaye()) {
+ } elseif ($participant->getPassPrepaye()) {
$this->sendEmailPassPrepaye($participant);
} else {
- if ($participant->getRole()=='Accompagnant') {
+ if ($participant->getRole() == 'Accompagnant') {
$this->sendEmailAccompagnant($participant);
- }
- else {
+ } else {
$this->sendEmailAzurColloque($participant);
}
}
@@ -167,7 +165,7 @@ final class ValidEmailAction
$body .= 'http://www.' . $this->settings['jdev']['url'] . ', merci de nous contacter par email (' . $this->settings['jdev']['email'] . '). ';
$body .= 'Votre espace personnel vous permettra de sélectionner vos sessions ultérieurement.' . PHP_EOL;
$body .= PHP_EOL;
- $body .= 'Les frais d\'inscription couvrent les prestations suivantes : ' . PHP_EOL;
+ $body .= 'Les frais d\'inscription couvrent les prestations suivantes : ' . PHP_EOL;
$body .= ' - la participation aux journées (présentations, ateliers, groupes de travail, posters)' . PHP_EOL;
$body .= ' - les documents fournis et les goodies' . PHP_EOL;
$body .= ' - les pauses-café, les buffets du midi' . PHP_EOL;
@@ -196,7 +194,7 @@ final class ValidEmailAction
$body .= 'Nous vous prions de privilégier ';
$body .= 'le paiement par carte bancaire avant le 30 mai 2017. Votre inscription sera validée à l\'issue de votre paiement.' . PHP_EOL;
$body .= PHP_EOL;
- $body .= 'Les frais d\'inscription couvrent les prestations suivantes : ' . PHP_EOL;
+ $body .= 'Les frais d\'inscription couvrent les prestations suivantes : ' . PHP_EOL;
$body .= ' - le buffet dînatoire et le spectacle de l\'événement social du mercredi soir.' . PHP_EOL;
$body .= PHP_EOL;
$body .= 'Bien cordialement' . PHP_EOL;
@@ -208,5 +206,5 @@ final class ValidEmailAction
->setBody($body);
$this->mailer->send($message);
- }
+ }
}
diff --git a/app/src/Action/VerifEmailAction.php b/app/src/Action/VerifEmailAction.php
index f4101a0ff8a3c0115230f8387069011d2bfa1eb3..cc2b32e334679486463be597d2208a51836dce35 100644
--- a/app/src/Action/VerifEmailAction.php
+++ b/app/src/Action/VerifEmailAction.php
@@ -19,22 +19,22 @@ use Psr\Http\Message\ResponseInterface as Response;
final class VerifEmailAction
{
- private $view;
- private $logger;
+ private $view;
+ private $logger;
private $em;
-
- public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
- {
- $this->view = $view;
- $this->logger = $logger;
+
+ public function __construct(Twig $view, LoggerInterface $logger, EntityManagerInterface $em)
+ {
+ $this->view = $view;
+ $this->logger = $logger;
$this->em = $em;
- }
-
- public function __invoke(Request $request, Response $response, $args)
+ }
+
+ public function __invoke(Request $request, Response $response, $args)
{
$this->logger->info("Verif email action dispatched");
- if($request->isGet()) {
+ if ($request->isGet()) {
$bool = 'false';
$params = $request->getQueryParams();
diff --git a/app/src/Entity/Agenda.php b/app/src/Entity/Agenda.php
index a60d383873acb6b39bc130acd83bc2754a485801..7265b4306840c64c5607a0a87c1da348b98eee51 100644
--- a/app/src/Entity/Agenda.php
+++ b/app/src/Entity/Agenda.php
@@ -127,12 +127,12 @@ class Agenda implements \JsonSerializable
return $this->salle = $salle;
}
- public function getParticipants()
+ public function getParticipants()
{
return $this->participants;
}
- public function jsonSerialize()
+ public function jsonSerialize()
{
return array(
'id' => $this->id,
@@ -144,5 +144,4 @@ class Agenda implements \JsonSerializable
'salle' => $this->salle->getNom()
);
}
-
}
diff --git a/app/src/Entity/Contribution.php b/app/src/Entity/Contribution.php
index ffa5c08c5c9670f5d3f9ff33cbe53a4b917b2d8a..4b4a1489782d31de654fb15d619f5aba1f9fc865 100644
--- a/app/src/Entity/Contribution.php
+++ b/app/src/Entity/Contribution.php
@@ -57,5 +57,5 @@ class Contribution
public function setDisplay($display)
{
$this->display = $display;
- }
+ }
}
diff --git a/app/src/Entity/Formation.php b/app/src/Entity/Formation.php
index 681b640dc7ebfb83c59dbcdac7bdab6818abd0df..c01999e9f62fad2f387deca0a3b191bdf29f2f6b 100644
--- a/app/src/Entity/Formation.php
+++ b/app/src/Entity/Formation.php
@@ -15,7 +15,7 @@ namespace App\Entity;
* @Entity
* @Table(name="formation")
*/
-class Formation
+class Formation
{
/**
* @Id
@@ -53,7 +53,7 @@ class Formation
/**
* @Column(type="string")
**/
- private $intervenant;
+ private $intervenant;
/**
* @Column(type="integer")
@@ -68,21 +68,17 @@ class Formation
/**
* @OneToMany(targetEntity="Agenda", mappedBy="formation")
*/
- private $agendas;
+ private $agendas;
/**
* @OneToMany(targetEntity="PreAgenda", mappedBy="formation")
*/
- private $preagendas;
+ private $preagendas;
/**
* @OneToMany(targetEntity="ParticipantSondage", mappedBy="formation")
*/
- private $participants;
-
-
-
-
+ private $participants;
public function getId()
{
@@ -125,7 +121,7 @@ class Formation
public function setTitre($titre)
{
$this->titre = $titre;
- }
+ }
public function getNbIntervenant()
{
@@ -167,17 +163,17 @@ class Formation
$this->confirme = $confirme;
}
- public function getAgendas()
+ public function getAgendas()
{
return $this->agendas;
}
- public function getPreAgendas()
+ public function getPreAgendas()
{
return $this->preagendas;
}
- public function getParticipants()
+ public function getParticipants()
{
return $this->participants;
}
diff --git a/app/src/Entity/Participant.php b/app/src/Entity/Participant.php
index 2f9ec3f5128cf62af8a4f69c5b962739a916024f..c6adb703ae39a71287f6026f7582683b30b39c82 100644
--- a/app/src/Entity/Participant.php
+++ b/app/src/Entity/Participant.php
@@ -180,15 +180,12 @@ class Participant
/**
* @OneToMany(targetEntity="ParticipantAgenda", mappedBy="participant")
*/
- private $agendas;
+ private $agendas;
/**
* @OneToMany(targetEntity="ParticipantSondage", mappedBy="participant")
*/
- private $sondages;
-
-
-
+ private $sondages;
public function getId()
{
@@ -476,18 +473,18 @@ class Participant
return $this->roles;
}
- public function getPreAgendas()
+ public function getPreAgendas()
{
return $this->preagendas;
}
- public function getAgendas()
+ public function getAgendas()
{
return $this->agendas;
}
- public function getSondages()
+ public function getSondages()
{
return $this->sondages;
- }
+ }
}
diff --git a/app/src/Entity/ParticipantAgenda.php b/app/src/Entity/ParticipantAgenda.php
index f335de06c52804fda01657a607257b0badfa9809..d2e98435b60bb7aa80bfe5b62f6c31fcc07f0c11 100644
--- a/app/src/Entity/ParticipantAgenda.php
+++ b/app/src/Entity/ParticipantAgenda.php
@@ -90,5 +90,5 @@ class ParticipantAgenda
public function setPresent($present)
{
$this->present = $present;
- }
+ }
}
diff --git a/app/src/Entity/ParticipantCommunaute.php b/app/src/Entity/ParticipantCommunaute.php
index e0e24377ff85981d9af873223935ae084359ae25..fe1bdb8c95bffbf69f6cda8e26f9756c148c321d 100644
--- a/app/src/Entity/ParticipantCommunaute.php
+++ b/app/src/Entity/ParticipantCommunaute.php
@@ -60,5 +60,4 @@ class ParticipantCommunaute
{
$this->communaute = $communaute;
}
-
}
diff --git a/app/src/Entity/ParticipantContribution.php b/app/src/Entity/ParticipantContribution.php
index e6d870a9903616578feafe76169bb07794181840..2249dd6c6ab3ed6387325e3f44b5803502f77344 100644
--- a/app/src/Entity/ParticipantContribution.php
+++ b/app/src/Entity/ParticipantContribution.php
@@ -60,5 +60,4 @@ class ParticipantContribution
{
$this->contribution = $contribution;
}
-
}
diff --git a/app/src/Entity/ParticipantReseau.php b/app/src/Entity/ParticipantReseau.php
index 24463040a2bd582c72fe6d225ce86ff1ce4a8ea9..93d361e26c2717a519e5a74e4a3038e6149b3a88 100644
--- a/app/src/Entity/ParticipantReseau.php
+++ b/app/src/Entity/ParticipantReseau.php
@@ -60,5 +60,4 @@ class ParticipantReseau
{
$this->reseau = $reseau;
}
-
}
diff --git a/app/src/Entity/ParticipantSondage.php b/app/src/Entity/ParticipantSondage.php
index 5e273ef5fa7d68fc512d0fe016264813df02de45..a308289ff8658a6bfe885b0053bf6a83c3eb66cb 100644
--- a/app/src/Entity/ParticipantSondage.php
+++ b/app/src/Entity/ParticipantSondage.php
@@ -41,8 +41,6 @@ class ParticipantSondage
**/
private $dateInscription;
-
-
public function getId()
{
return $this->id;
diff --git a/app/src/Entity/PreAgenda.php b/app/src/Entity/PreAgenda.php
index b79d41a929dc1024eca1aa3a9027a550d28ac51f..0e945876ec27b60a2aa9ed13a6b3feeeb939b0ff 100644
--- a/app/src/Entity/PreAgenda.php
+++ b/app/src/Entity/PreAgenda.php
@@ -51,13 +51,10 @@ class PreAgenda
*/
private $salle;
-
/**
* @OneToMany(targetEntity="ParticipantPreAgenda", mappedBy="preagenda")
*/
- private $participants;
-
-
+ private $participants;
public function getId()
{
@@ -114,7 +111,7 @@ class PreAgenda
return $this->salle = $salle;
}
- public function getParticipants()
+ public function getParticipants()
{
return $this->participants;
}
diff --git a/app/src/Entity/Role.php b/app/src/Entity/Role.php
index f1409e406882a4f8c09a95dc556f9b835704951b..14222399884e727cb6331f3629bd8a3a1e93b473 100644
--- a/app/src/Entity/Role.php
+++ b/app/src/Entity/Role.php
@@ -28,8 +28,6 @@ class Role
* @Column(type="string")
**/
private $label;
-
-
public function getId()
{
diff --git a/app/src/Entity/Salle.php b/app/src/Entity/Salle.php
index 935abb7dea78fb522ca744fc71bec4a5a70fda3f..08940c0d73f1f2bd3c7fe0c32473e5f5c9aad21a 100644
--- a/app/src/Entity/Salle.php
+++ b/app/src/Entity/Salle.php
@@ -52,7 +52,7 @@ class Salle
/**
* @Column(type="boolean")
**/
- private $videoprojecteur;
+ private $videoprojecteur;
/**
* @Column(type="string")
**/
@@ -72,13 +72,12 @@ class Salle
/**
* @OneToMany(targetEntity="Agenda", mappedBy="salle")
*/
- private $agendas;
-
+ private $agendas;
/**
* @OneToMany(targetEntity="PreAgenda", mappedBy="salle")
*/
- private $preagendas;
+ private $preagendas;
public function getId()
@@ -115,7 +114,6 @@ class Salle
{
$this->aile = $aile;
}
-
public function getWifi()
{
@@ -126,7 +124,6 @@ class Salle
{
$this->wifi = $wifi;
}
-
public function getReseau()
{
@@ -148,7 +145,6 @@ class Salle
$this->videoprojecteur = $videoprojecteur;
}
-
public function getDescription()
{
return $this->description;
@@ -179,14 +175,13 @@ class Salle
return $this->quotaPhysique = $quotaPhysique;
}
- public function getAgendas()
+ public function getAgendas()
{
return $this->agendas;
}
- public function getPreAgendas()
+ public function getPreAgendas()
{
return $this->preagendas;
}
-
}
diff --git a/app/src/Entity/Thematique.php b/app/src/Entity/Thematique.php
index 756428bbaa9c1581ab6cb5f41403b09047092e38..0eb0bb105e601537b63bc155e921e4c977f8e0a3 100644
--- a/app/src/Entity/Thematique.php
+++ b/app/src/Entity/Thematique.php
@@ -34,7 +34,6 @@ class Thematique
**/
private $label;
-
public function getId()
{
return $this->id;
diff --git a/app/src/Middleware/DatabaseAccessMiddleware.php b/app/src/Middleware/DatabaseAccessMiddleware.php
index bfadde4f0f3906403107b3e2050ad3e2e40aec5a..72bddb54a3f638d176f4bb5d9d0bddc6e58e5c9d 100644
--- a/app/src/Middleware/DatabaseAccessMiddleware.php
+++ b/app/src/Middleware/DatabaseAccessMiddleware.php
@@ -42,4 +42,4 @@ class DatabaseAccessMiddleware
$response = $next($request, $response);
return $response;
}
-}
\ No newline at end of file
+}
diff --git a/app/src/Middleware/TokenMiddleware.php b/app/src/Middleware/TokenMiddleware.php
index b1cd247f696058ea356539918a20cc8f39a0be2a..0a14993667764e5185b59ff6264b3a479271f1c8 100644
--- a/app/src/Middleware/TokenMiddleware.php
+++ b/app/src/Middleware/TokenMiddleware.php
@@ -21,9 +21,12 @@ use Lcobucci\JWT\Signer\Hmac\Sha256;
class TokenMiddleware
{
private $logger;
- public function __construct(LoggerInterface $logger)
+ private $settings;
+
+ public function __construct(LoggerInterface $logger, $settings)
{
$this->logger = $logger;
+ $this->settings = $settings;
}
public function __invoke(Request $request, Response $response, $next)
{
@@ -40,8 +43,8 @@ class TokenMiddleware
// Validation du token
$data = new ValidationData();
- $data->setIssuer('http://jdev2017.fr');
- $data->setAudience('http://jdev2017.fr');
+ $data->setIssuer($this->settings['jdev']['url']);
+ $data->setAudience($this->settings['jdev']['url']);
if (!$token->validate($data)) {
return $response->withStatus(401);
}
@@ -52,7 +55,11 @@ class TokenMiddleware
return $response->withStatus(401);
}
- $response = $next($request->withAttribute('email', $token->getClaim('email'))->withAttribute('roleSI', $token->getClaim('roleSI')), $response);
+ $response = $next(
+ $request->withAttribute('email', $token->getClaim('email'))
+ ->withAttribute('roleSI', $token->getClaim('roleSI')),
+ $response
+ );
return $response;
}
-}
\ No newline at end of file
+}
diff --git a/app/templates/base.twig b/app/templates/base.twig
index 1dbcc6141b88a87572a32ed62fdfb9e95af6a584..4cc7fa548c4dbfd47495a66448d61b2e014c82de 100644
--- a/app/templates/base.twig
+++ b/app/templates/base.twig
@@ -97,13 +97,13 @@
<img src="images/Isis_min.png" alt="">
<img src="images/french_tech_min.jpg" alt="">
<br>
- <a href="http://devlog.cnrs.fr/jdev2017/sponsors" target="_blank"><img src="images/logo-aws.jpg" alt=""></a>
- <a href="http://devlog.cnrs.fr/jdev2017/sponsors" target="_blank"><img src="images/logo-dellemc.png" alt=""></a>
- <a href="http://devlog.cnrs.fr/jdev2017/sponsors" target="_blank"><img src="images/genci_min.jpg" alt=""></a>
- <a href="http://devlog.cnrs.fr/jdev2017/sponsors" target="_blank"><img src="images/logo-linagora.png" alt=""></a>
- <a href="http://devlog.cnrs.fr/jdev2017/sponsors" target="_blank"><img src="images/logo-bordercloud.png" alt=""></a>
- <a href="http://devlog.cnrs.fr/jdev2017/sponsors" target="_blank"><img src="images/open-edition_min.png" alt=""></a>
- <a href="http://devlog.cnrs.fr/jdev2017/sponsors" target="_blank"><img src="images/logo-treeptik.png" alt=""></a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/sponsors" target="_blank"><img src="images/logo-aws.jpg" alt=""></a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/sponsors" target="_blank"><img src="images/logo-dellemc.png" alt=""></a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/sponsors" target="_blank"><img src="images/genci_min.jpg" alt=""></a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/sponsors" target="_blank"><img src="images/logo-linagora.png" alt=""></a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/sponsors" target="_blank"><img src="images/logo-bordercloud.png" alt=""></a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/sponsors" target="_blank"><img src="images/open-edition_min.png" alt=""></a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/sponsors" target="_blank"><img src="images/logo-treeptik.png" alt=""></a>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
diff --git a/app/templates/contact.twig b/app/templates/contact.twig
index 509148c7967f68cbc2551769909681f97ff59da3..f919fa9cb08b115c39e6719868a7f18198e72713 100644
--- a/app/templates/contact.twig
+++ b/app/templates/contact.twig
@@ -16,33 +16,33 @@
<h2><i class="fa fa-envelope-square"></i> Contacts</h2>
<hr>
<p>
- <a href="mailto:jdev2017-co@univ-amu.fr">
+ <a href="mailto:{{jdev.email_clo}}">
<i class="fa fa-envelope"></i> Contact du Comité d'Organisation
</a>
</p>
<p>
- <a href="mailto:jdev2017-sponsor@univ-amu.fr">
+ <a href="mailto:{{jdev.email_sponsor}}">
<i class="fa fa-envelope"></i> Contact Sponsors et Stands
</a>
</p>
<p>
- <a href="mailto:jdev2017-programme@univ-amu.fr">
+ <a href="mailto:{{jdev.email_programme}}">
<i class="fa fa-envelope"></i> Contact Comité de Programme
</a>
</p>
<p>
- <a href="mailto:jdev2017-inscription@univ-amu.fr">
+ <a href="mailto:{{jdev.email}}">
<i class="fa fa-envelope"></i> Contact Inscription
</a>
</p>
<p>
- <a href="mailto:jdev2017-inscription@univ-amu.fr?subject=JDEV2017-web">
+ <a href="mailto:{{jdev.email}}?subject={{jdev.label}}-web">
<i class="fa fa-envelope"></i> Contact Webmaster
</a>
</p>
<hr>
<p>
- <a href="mailto:jdev2017@univ-amu.fr">
+ <a href="mailto:{{jdev.email_info}}">
<i class="fa fa-envelope"></i> Inscrivez-vous à la liste d'information
</p>
</div>
diff --git a/app/templates/dashboard_admin_profil.twig b/app/templates/dashboard_admin_profil.twig
index 7135ba24cd43fb5ec71a51fe77ed0aa2ad911efe..210e1e2d3034071d9e2b68c2c789167ac6a685c4 100644
--- a/app/templates/dashboard_admin_profil.twig
+++ b/app/templates/dashboard_admin_profil.twig
@@ -137,7 +137,7 @@
{% endif %}
<p>
- <a href="mailto:jdev2017-inscription@univ-amu.fr">
+ <a href="mailto:{{jdev.email}}">
<i class="fa fa-envelope"></i> Contact Inscription
</a>
</p>
diff --git a/app/templates/dashboard_home.twig b/app/templates/dashboard_home.twig
index bd51a4911d521810ffe51096370ab8c90c2b0f84..85a32f397bd1822adcbe7995724a45d8371d1fa5 100644
--- a/app/templates/dashboard_home.twig
+++ b/app/templates/dashboard_home.twig
@@ -137,7 +137,7 @@
{% endif %}
<p>
- <a href="mailto:jdev2017-inscription@univ-amu.fr">
+ <a href="mailto:{{jdev.email}}">
<i class="fa fa-envelope"></i> Contact Inscription
</a>
</p>
diff --git a/app/templates/dashboard_pgm.twig b/app/templates/dashboard_pgm.twig
index 3bf985fad06bb54376d664cb3f671e7b1c07977e..9bb495b85fd9368864a9916ca87071e72725f71a 100644
--- a/app/templates/dashboard_pgm.twig
+++ b/app/templates/dashboard_pgm.twig
@@ -13,7 +13,7 @@
{% block content_dashboard %}
<div class="content-dashboard">
<div class="title-main">
- <div class="title-main-content">JDEV2017 - Programme</div>
+ <div class="title-main-content">{{jdev.label}} - Programme</div>
</div>
<div id="pgm">
diff --git a/app/templates/error.twig b/app/templates/error.twig
index d56603392f6325e241148b2fe7c6c5ae2f40ef66..8fdcd1d0d59e2ff6afecf2ef478ab638484b0d84 100644
--- a/app/templates/error.twig
+++ b/app/templates/error.twig
@@ -24,8 +24,8 @@
<div class="row">
<div class="col-md-12">
<p>
- Nous rencontrons actuellement un probleme serveur. Veuillez nous contacter par email : jdev2017-inscription@services.cnrs.fr<br />
- Le comité d'ogranisation des JDEV2017
+ Nous rencontrons actuellement un probleme serveur. Veuillez nous contacter par email : {{jdev.email}}<br />
+ Le comité d'ogranisation des {{jdev.label}}
</p>
</div>
</div>
diff --git a/app/templates/home.twig b/app/templates/home.twig
index 538b1e08fb836eedd5dc9c5354726ceee451dca1..d6c09546001acea7ea5b1978d69ed1cb4b1cf4e7 100644
--- a/app/templates/home.twig
+++ b/app/templates/home.twig
@@ -22,7 +22,7 @@
<a href="inscription" class="btn-treehouse btn-inscription">Inscription</a>
{% endif %}
{% if jdev.version == 5 %}
- <a href="http://devlog.cnrs.fr/jdev2017" class="btn-treehouse btn-inscription"><i class="fa fa-external-link" aria-hidden="true"></i> Les vidéos</a>
+ <a href="http://devlog.cnrs.fr/{{jdev.label | lower}}" class="btn-treehouse btn-inscription"><i class="fa fa-external-link" aria-hidden="true"></i> Les vidéos</a>
{% endif %}
</div>
</div>
diff --git a/app/templates/programme.twig b/app/templates/programme.twig
index e8188da7282465f8265dbe6a1d9b04ae60374584..49a49e2847454dbb7ac3d495dcf37642a04e3c22 100644
--- a/app/templates/programme.twig
+++ b/app/templates/programme.twig
@@ -91,7 +91,7 @@
rayon d'action et la diversité des objets de l'internet
contribuant au déluge de données de toutes sortes.
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t1" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t1" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
@@ -108,7 +108,7 @@
<p>
La modélisation du logiciel est d'un apport méthodologique incontestable et nécessaire pour l'ingénierie de système de plus en plus complexe. Nous nous intéresserons plus particulièrement au prototypage rapide apporté par la modélisation des IHM par exemple comme moyen agile de définir les contours d'un système. Nous nous intéresserons également à la modélisation des données dans le cadre des bases de données relationnelles, semi-structurées, non-structurées et du big data. Nous étudierons les profils SysML, les profils UML et les ontologies ainsi que l'opportunité qu'ils représentent pour expliciter, représenter, construire et capitaliser les connaissances pour différentes communautés scientifiques et techniques (chimie, santé, électroniciens, mécaniciens…). Nous serons attentifs à la génération de code, à la rétro-ingénierie et à la capitalisation de l'existant.
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t2" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t2" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
@@ -138,7 +138,7 @@
poudre…), à développement, leur configuration et leur
adaptation.
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t3" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t3" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
@@ -166,7 +166,7 @@
d'intégration continue, etc. Leur plugin/intégration
dans les IDE sera à l'ordre du jour.
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t4" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t4" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
@@ -213,7 +213,7 @@
l'utilisation des ressources dans les systèmes
d'information scientifique.
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t5" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t5" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
@@ -245,7 +245,7 @@
peut-il mettre en place un « bac à sable » pour assurer
la sécurité ? Quelle approche DevOps ?
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t6" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t6" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
@@ -288,7 +288,7 @@
de données relationnelles, semi-structurées, distribuées.
Ce sera l'objet des débats de cette thématique.
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t7" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t7" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
@@ -307,7 +307,7 @@
Etudier les technologies permettant l'itinérance des applications parallèles, leurs déploiements, leurs portages et la
reproductibilité des calculs. La convergence HPC-Cloud et la convergence calcul-données seront traitées.
</p>
- <p><a href="http://devlog.cnrs.fr/jdev2017/t8" target="_blank">en savoir plus</a></p>
+ <p><a href="http://devlog.cnrs.fr/{{jdev.label | lower}}/t8" target="_blank">en savoir plus</a></p>
</div>
</div>
</div>
diff --git a/app/templates/valid_email.twig b/app/templates/valid_email.twig
index af1138a428b2a07ff1ddd6996221b3f6e70b397c..ee63aa4afda6383970d7d34f7049e5733b06bf12 100644
--- a/app/templates/valid_email.twig
+++ b/app/templates/valid_email.twig
@@ -18,16 +18,16 @@
<p class="text-center" style="color: red;">{{ info }}</p>
<div class="row">
<div class="col-md-12">
- <p>Féliciations, vous venez de vous enregistrer aux JDEV2017 !</p>
+ <p>Féliciations, vous venez de vous enregistrer aux {{jdev.label}} !</p>
<p>
Pour pouvoir vous connecter à l'espace participant et recevoir les e-mails d'informations, vous devez
tout d'abord valider votre adresse e-mail en cliquant sur le lien contenu dans le mail de confirmation d'inscription.
</p>
<p>
- Dans le cas où vous ne recevez pas le mail de confirmation d'inscription, veuillez contacter jdev2017-inscription@devlog.cnrs.fr en
+ Dans le cas où vous ne recevez pas le mail de confirmation d'inscription, veuillez contacter {{jdev.email}} en
indiquant votre nom, prénom et adresse email pour que nous puissions valider avec vous les informations et ainsi activer votre compte participant.
</p>
- <p>Le comité d'orgranisation des JDEV2017</p>
+ <p>Le comité d'orgranisation des {{jdev.label}}</p>
</div>
</div>
diff --git a/bower.json b/bower.json
index 74941fa596c259333d2db94be6007816363ad99e..bb5666613e54f98344798d78e83ea9cb0ae97301 100644
--- a/bower.json
+++ b/bower.json
@@ -22,8 +22,8 @@
"bootstrap3-ie10-viewport-bug-workaround": "^1.0.0",
"font-awesome": "fontawesome#^4.7.0",
"bootstrap-validator": "^0.11.9",
- "datatables.net": "^2.1.1",
- "datatables.net-bs": "^2.1.1",
+ "datatables.net": "^1.10",
+ "datatables.net-bs": "^1.10",
"jquery-ui": "^1.12.1",
"jt.timepicker": "jquery-timepicker-jt#^1.11.10",
"datatables.net-buttons": "^1.2.4",
diff --git a/composer.json b/composer.json
index 33d01aa1e8922d85bdf90d8572ef25d434af9cfe..4f2d2d345832f83da816c9a8507224a2d59b2e2b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,8 @@
{
- "name": "jdev-boarding",
+ "name": "devlog/jdev-boarding",
+ "type": "project",
"description": "Application pour l'inscription aux JDEVs",
+ "license": "CeCILL v2.1",
"authors": [
{
"name": "Chrystel Moreau",
diff --git a/composer.phar b/composer.phar
deleted file mode 100755
index 1987803bf7e7a3be33aa5a523c8c07aff22c0ba0..0000000000000000000000000000000000000000
Binary files a/composer.phar and /dev/null differ
diff --git a/conf-dev/dev-php.ini b/conf-dev/dev-php.ini
new file mode 100644
index 0000000000000000000000000000000000000000..070e35e60fbb40026b7e79e9da1bf8f7e696f79a
--- /dev/null
+++ b/conf-dev/dev-php.ini
@@ -0,0 +1,12 @@
+display_errors=1
+error_reporting=E_ALL
+date.timezone=Europe/Paris
+
+[xdebug]
+zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so
+xdebug.remote_enable=1
+xdebug.remote_autostart=1
+xdebug.remote_port=9900
+xdebug.remote_connect_back=1
+#xdebug.remote_host=host.docker.internal
+xdebug.remote_log=/var/log/xdebug_remote.log
diff --git a/conf-dev/init-postgres.sh b/conf-dev/init-postgres.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9c56343cfc8dd9226e713103feb24cb43df822d5
--- /dev/null
+++ b/conf-dev/init-postgres.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+ CREATE USER jdev LOGIN PASSWORD 'jdev';
+ CREATE DATABASE jdevdb;
+ GRANT ALL PRIVILEGES ON DATABASE jdevdb TO jdev;
+EOSQL
\ No newline at end of file
diff --git a/conf-dev/npm/Dockerfile b/conf-dev/npm/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..e246d4d6f1326a56b6fb7111a7b50fe74acc6b06
--- /dev/null
+++ b/conf-dev/npm/Dockerfile
@@ -0,0 +1,3 @@
+FROM node
+
+RUN npm install -g bower
diff --git a/conf-dev/php/Dockerfile b/conf-dev/php/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..d31cb19f5e45c56984804455a803256647be0628
--- /dev/null
+++ b/conf-dev/php/Dockerfile
@@ -0,0 +1,19 @@
+FROM php:7.3-apache
+
+# Install modules
+RUN apt-get update \
+ && apt-get install -y zlib1g zlib1g-dev libpq-dev libpq5 libzip-dev zip unzip \
+ && docker-php-ext-install pgsql pdo_pgsql zip bcmath
+
+# Install pecl modules
+RUN pecl install xdebug \
+ && rm -rf /tmp/pear
+
+# Install mod_rewrite
+RUN a2enmod rewrite
+
+# Create doctrine_proxy folder
+RUN mkdir /tmp/doctrine_proxy && chmod 777 /tmp/doctrine_proxy
+RUN mkdir /tmp/cache_twig && chmod 777 /tmp/cache_twig
+
+CMD ["apache2-foreground"]
diff --git a/conf-dev/vhost.conf b/conf-dev/vhost.conf
new file mode 100644
index 0000000000000000000000000000000000000000..8ca1b352bf5a68df7da595e55b8ca28043698881
--- /dev/null
+++ b/conf-dev/vhost.conf
@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+ DocumentRoot /srv/app/public
+
+ <Directory "/srv/app/public">
+ Require all granted
+ RewriteEngine on
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule ^.+$ index.php [L]
+ </Directory>
+
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
diff --git a/config/cli-config.php b/config/cli-config.php
index 5566ca8eeda4fb798318551c0e90f9b5c490cf8a..5f806a89adb63d071065ecc126f2890246b89707 100644
--- a/config/cli-config.php
+++ b/config/cli-config.php
@@ -15,12 +15,12 @@ require 'vendor/autoload.php';
$settings = require './app/settings.php';
$database = $settings['settings']['database'];
-$c = \Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration($database['entity_path'], $database['dev_mode']);
+$c = \Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration(array('app/src/Entity'), $database['dev_mode']);
$c->setProxyDir(getcwd() . '/' . $database['path_proxy']);
if ($database['dev_mode']) {
- $c->setAutoGenerateProxyClasses(true);
+ $c->setAutoGenerateProxyClasses(true);
} else {
- $c->setAutoGenerateProxyClasses(false);
+ $c->setAutoGenerateProxyClasses(false);
}
$em = \Doctrine\ORM\EntityManager::create($database['connection_options'], $c);
diff --git a/docker-compose.yml b/docker-compose.yml
index c2e6f5ca8204ded05bf4152a5e238e389e2060a6..d6c62af4685e675878bb4096c55f6af6efa619b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,47 @@
-web:
- image: nginx
- ports:
- - "80:80"
- volumes:
- - ./config/nginx.conf:/etc/nginx/conf.d/default.conf
- - ./public:/var/www/html/public
- links:
- - php:php
+version: '3'
-php:
- image: php:7.0.7-fpm
- volumes:
- - ./public:/var/www/html/public
- - ./app:/var/www/html/app
- - ./vendor:/var/www/html/vendor
- - ./data:/var/www/html/data
- - ./log:/var/www/html/log
+services:
+ php:
+ build: conf-dev/php
+ working_dir: /srv/app
+ environment:
+ docker: "true"
+ SLIM_DISPLAY_ERROR_DETAILS: "true"
+ TWIG_CACHE: "/tmp/cache_twig"
+ TWIG_DEBUG: "true"
+ TWIG_AUTO_RELOAD: "true"
+ DOCTRINE_PATH_PROXY: "/tmp/doctrine_proxy"
+ DOCTRINE_DEV_MODE: "true"
+ DB_DRIVER: "pdo_pgsql"
+ DB_HOST: "db"
+ DB_DBNAME: "jdevdb"
+ DB_USER: "jdev"
+ DB_PASSWORD: "jdev"
+ MAILER_HOST: "mailer"
+ MAILER_PORT: 25
+ LOGGER_NAME: "jdev-boarding"
+ LOGGER_PATH: "php://stdout"
+ ports:
+ - 8080:80
+ volumes:
+ - .:/srv/app
+ - ./conf-dev/dev-php.ini:/usr/local/etc/php/conf.d/dev-php.ini
+ - ./conf-dev/vhost.conf:/etc/apache2/sites-available/000-default.conf
+ mailer:
+ image: djfarrelly/maildev
+ ports:
+ - 1080:80
+ db:
+ image: postgres
+ environment:
+ POSTGRES_PASSWORD: "postgres"
+ volumes:
+ - pgdata:/var/lib/postgresql/data
+ - ./conf-dev/init-postgres.sh:/docker-entrypoint-initdb.d/init-postgres.sh
+ adminer:
+ image: adminer
+ ports:
+ - 8083:8080
+
+volumes:
+ pgdata:
diff --git a/documentation/jdev-boarding-new-mcd b/documentation/jdev-boarding-new-mcd
deleted file mode 100644
index cca75f252bcd4bd96c5ab26c7f6099d3b26453aa..0000000000000000000000000000000000000000
Binary files a/documentation/jdev-boarding-new-mcd and /dev/null differ
diff --git a/public/index.php b/public/index.php
index b07575d1f766fc326503fe93933c385df721c9c0..4b19c00fa988ff742dbb93e7fff47b2491cac06d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -27,9 +27,6 @@ require __DIR__ . '/../app/dependencies.php';
// Set up actions
require __DIR__ . '/../app/actions.php';
-// Register middleware
-require __DIR__ . '/../app/middleware.php';
-
// Register routes
require __DIR__ . '/../app/routes.php';
diff --git a/public/js/inscription.js b/public/js/inscription.js
index f8d3af38b779f8e2e81a8e070d01a82b6942a694..7e32563743076457739c69b091be6d67563cb793 100644
--- a/public/js/inscription.js
+++ b/public/js/inscription.js
@@ -126,7 +126,7 @@ $(document).ready(function() {
}
});
} else {
- alert('Vous êtes déjà inscrit aux JDEV2017 !');
+ alert('Vous êtes déjà inscrit aux JDEVs!');
form.trigger('reset');
}
});
diff --git a/public/js/participant.js b/public/js/participant.js
index c48f8e8cbc1f9cc14de40a55f534cb11ca4f9654..9af4286ddd3943555073404fe89b9522a4ada8d3 100644
--- a/public/js/participant.js
+++ b/public/js/participant.js
@@ -91,7 +91,7 @@ $(document).ready(function(){
{
"targets" : 0,
"render": function (data) {
- return "<b><a href=\"http://devlog.cnrs.fr/jdev2017/" + data + "\" target=_blank><i class=\"fa fa-external-link\"></i> " + data.toUpperCase()+"</a></b>";
+ return "<b><a href=\"http://devlog.cnrs.fr/jdev" + jdev_annee + "/" + data + "\" target=_blank><i class=\"fa fa-external-link\"></i> " + data.toUpperCase()+"</a></b>";
}
}
]
@@ -113,7 +113,7 @@ $(document).ready(function(){
//download: 'open',
pageSize: 'A4',
header: true,
- filename:'jdev2017-agenda',
+ filename:'jdevs-agenda',
customize: function ( doc ) {
doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
},
@@ -235,7 +235,7 @@ $(document).ready(function(){
//download: 'open',
pageSize: 'A4',
header: true,
- filename:'jdev2017-parcours',
+ filename:'jdevs-parcours',
customize: function ( doc ) {
doc.defaultStyle.fontSize = 10;
doc.defaultStyle.lineHeight = 1;
@@ -267,7 +267,7 @@ $(document).ready(function(){
//download: 'open',
pageSize: 'A4',
header: true,
- filename:'jdev2017-parcours-badge',
+ filename:'jdevs-parcours-badge',
customize: function ( doc ) {
doc.pageMargins = [ 40, 0, 800, 1 ]; //pageMargins [left, top, right, bottom]
doc.defaultStyle.fontSize = 8;
@@ -333,7 +333,7 @@ $(document).ready(function(){
{
"targets" : 0,
"render": function (data) {
- return "<b><a href=\"http://devlog.cnrs.fr/jdev2017/" + data + "\" target=_blank><i class=\"fa fa-external-link\"></i> " + data.toUpperCase()+"</a></b>";
+ return "<b><a href=\"http://devlog.cnrs.fr/jdev" + jdev_annee + "/" + data + "\" target=_blank><i class=\"fa fa-external-link\"></i> " + data.toUpperCase()+"</a></b>";
}
}
],