Commit 4f85d70c authored by Chrystel Moreau's avatar Chrystel Moreau
Browse files

update date evenement

parent f783dd0c
Pipeline #1979 passed with stages
in 2 minutes and 31 seconds
......@@ -37,7 +37,7 @@ return [
'host' => getenv('DB_HOST'), // cesamsidb (@LAM), db (@local)
'user' => getenv('DB_USER'),
'password' => getenv('DB_PASSWORD'),
'dbname' => getenv('DB_DBNAME') // jdevdb (dev), jdev2017 (prod)
'dbname' => getenv('DB_DBNAME') // jdevdb (dev)
]
],
'mailer' => [
......@@ -56,8 +56,8 @@ return [
'email_sponsor' => 'jdev2020-sponsor@services.cnrs.fr',
'email_programme' => 'jdev2020-cp@services.cnrs.fr',
'email_info' => 'jdev2020@services.cnrs.fr',
'date_debut' => '2020-07-07', //'04/07/2017',
'date_fin' => '2020-07-10', //'07/07/2017',
'date_debut' => '2020-07-07',
'date_fin' => '2020-07-10',
'inscription_j1' => '2020-02-29',
'inscription_j2' => '2020-04-30',
'inscription_j3' => '2020-06-23',
......
......@@ -152,13 +152,6 @@ 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)
{
$dql = "SELECT distinct s FROM App\Entity\Salle s LEFT JOIN s.agendas a ";
......
......@@ -133,13 +133,6 @@ 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)
{
$dql = "SELECT s FROM App\Entity\Salle s LEFT JOIN s.agendas a ";
......
......@@ -74,15 +74,26 @@ final class DashboardAdminParticipantParcoursFormationAction
'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());
// Attention chgt 2020 !!!!
$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());
$this->view->render($response, 'dashboard_participant_parcours.twig', $a);
return $response;
}
......
......@@ -115,12 +115,13 @@ final class DashboardParticipantParcoursAction
$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(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 .= "(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";
$query = $this->em->createQuery($dql);
return $query->getResult();
}
public function getParcours($jour, $debut, $fin, $id)
{
......
......@@ -85,15 +85,23 @@ final class DashboardParticipantParcoursFormationAction
'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());
// Attention chgt 2020 !!!!
$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());
$this->view->render($response, 'dashboard_participant_parcours.twig', $a);
return $response;
}
......
......@@ -159,7 +159,7 @@ final class ValidEmailAction
$body .= 'les frais d\'inscription sur la plate-forme Azur-Colloque: https://www.azur-colloque.fr/' . $this->settings['jdev']['DR'] . '/ .' . PHP_EOL;
$body .= PHP_EOL;
$body .= 'Attention, la tarification varie en fonction de la date du paiement. 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 .= 'le paiement par carte bancaire avant le 30 mai 2020. Votre inscription sera validée à l\'issue de votre paiement.' . PHP_EOL;
$body .= PHP_EOL;
$body .= 'Si dans 15 jours, vous ne voyez pas la validation de votre inscription dans votre espace personnel sur ';
$body .= 'https://www.' . $this->settings['jdev']['url'] . ', merci de nous contacter par email (' . $this->settings['jdev']['email'] . '). ';
......@@ -192,7 +192,7 @@ final class ValidEmailAction
$body .= 'les frais d\'inscription sur la plate-forme Azur-Colloque: https://www.azur-colloque.fr/' . $this->settings['jdev']['DR'] . '/ .' . PHP_EOL;
$body .= PHP_EOL;
$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 .= 'le paiement par carte bancaire avant le 30 mai 2020. 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 .= ' - le buffet dînatoire et le spectacle de l\'événement social du mercredi soir.' . PHP_EOL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment