Commit 936044d5 authored by François Agneray's avatar François Agneray
Browse files

Fixed bug: choisir deux GTS dans la même demi-journée

parent f92dc39e
......@@ -54,9 +54,11 @@ final class DashboardParticipantParcoursAction
$agendas = $this->getAgendas($params['jour'],$params['debut'],$params['fin'],$participant->getId());
$a['agendas'] = $agendas;
$inscription = $this->getParcours($params['jour'],$params['debut'],$params['fin'],$participant->getId());
if (count($inscription) > 0) {
$nbInscriptions = count($inscription);
if ($nbInscriptions > 0) {
$a['inscription'] = $inscription[0];
}
}
$a['nb_inscriptions'] = $nbInscriptions;
$a['jour'] = $params['jour'];
$a['debut'] = $params['debut'];
$a['fin'] = $params['fin'];
......
......@@ -58,9 +58,11 @@ final class DashboardParticipantSondageAction
$a['preagendas'] = $preagendas;
$inscription = $this->getInscriptionPreAgenda($params['jour'],$params['debut'],$params['fin'],$participant->getId());
if (count($inscription) > 0) {
$nbInscriptions = count($inscription);
if ($nbInscriptions > 0) {
$a['inscription'] = $inscription[0];
}
$a['nb_inscriptions'] = $nbInscriptions;
$a['jour'] = $params['jour'];
$a['debut'] = $params['debut'];
......
......@@ -185,7 +185,8 @@
</td>
<td class="text-center">
{% if agenda.check == 0 %}
{% if inscription and inscription.getAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% if nb_inscriptions > 1 %}
{% elseif inscription and inscription.getAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% elseif inscription
and (agenda['agenda'].getFormation().getType() != 'Groupe de Travail'
or (agenda['agenda'].getDateDebut() == inscription.getAgenda().getDateDebut() and agenda['agenda'].getDateFin() == inscription.getAgenda().getDateFin()))
......
......@@ -81,7 +81,8 @@
<td class="text-center">
{% if preagenda.check == 0 %}
{% if inscription and inscription.getPreAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% if nb_inscriptions > 1 %}
{% elseif inscription and inscription.getPreAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% elseif inscription
and (preagenda[0].getFormation().getType() != 'Groupe de Travail'
or (preagenda[0].getDateDebut() == inscription.getPreAgenda().getDateDebut() and preagenda[0].getDateFin() == inscription.getPreAgenda().getDateFin()))
......
......@@ -184,7 +184,8 @@
</td>
<td class="text-center">
{% if agenda.check == 0 %}
{% if inscription and inscription.getAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% if nb_inscriptions > 1 %}
{% elseif inscription and inscription.getAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% elseif inscription
and (agenda['agenda'].getFormation().getType() != 'Groupe de Travail'
or (agenda['agenda'].getDateDebut() == inscription.getAgenda().getDateDebut() and agenda['agenda'].getDateFin() == inscription.getAgenda().getDateFin()))
......
......@@ -67,7 +67,8 @@
<td class="text-center">
{% if preagenda.check == 0 %}
{% if inscription and inscription.getPreAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% if nb_inscriptions > 1 %}
{% elseif inscription and inscription.getPreAgenda().getFormation().getType() != 'Groupe de Travail' %}
{% elseif inscription
and (preagenda[0].getFormation().getType() != 'Groupe de Travail'
or (preagenda[0].getDateDebut() == inscription.getPreAgenda().getDateDebut() and preagenda[0].getDateFin() == inscription.getPreAgenda().getDateFin()))
......
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