Commit 7bfc57b7 authored by Regis's avatar Regis
Browse files

Merge branch '#83' into 'master'

#83

See merge request a_boiteau/site-vikazimut-stage!42
parents 3991dd24 af28f59a
......@@ -110,6 +110,7 @@ class EventController extends AbstractController
if ($modifyParticipantMakeEventCourseForm->isSubmitted() && $participantMakeEventCourse === $participantMakeEventCourseRepository->find(array("eventCourse" => $this->getDoctrine()->getRepository(EventCourse::class)->find($modifyParticipantMakeEventCourse->getEventCourseId()), "participant" => $this->getDoctrine()->getRepository(Participant::class)->find($modifyParticipantMakeEventCourse->getParticipantId())))) {
if (true) {
$modifyParticipantMakeEventCourse->modify($this->getDoctrine()->getManager(), $participantMakeEventCourseRepository);
return $this->redirect($request->getUri());
}
}
}
......@@ -267,7 +268,7 @@ class EventController extends AbstractController
$entityManager->persist($eventCourse);
$eventCourse->generateParticipantMakeEventCourse($entityManager);
//return $this->redirect($request->getUri());
return $this->redirect($request->getUri());
}
$modifyFormsView=[];
foreach ($this->getDoctrine()->getRepository(Event::class)->find($id)->getEventCourses() as $eventCourse){
......@@ -277,6 +278,7 @@ class EventController extends AbstractController
$modifyEventCourseForm->handleRequest($request);
if ($modifyEventCourseForm->isSubmitted() && $modifyEventCourseForm->isValid() && $modifyEventCourse->getId()===$eventCourse->getId()) {
$modifyEventCourse->modify($this->getDoctrine()->getRepository(EventCourse::class), $this->getDoctrine()->getManager());
return $this->redirect($request->getUri());
}
}
......
......@@ -7,6 +7,9 @@
<h2>{% trans %}my_events.courses.title{% endtrans %} : {{ event.name }}</h2>
<div class="overflow-auto h-50" style="margin-bottom: 20px">
<div class=" border rounded" style="padding: 20px">
<a class="ml-auto btn btn-info float-left"
href="{{ path('my_events') }}">{% trans %}my_event.return.my_event{% endtrans %}</a>
<br><br>
<h5>{% trans %}my_events.add_course.coursesList{% endtrans %} : {{ event.name }}</h5>
<table class="table table-bordered table-sm">
<thead>
......
......@@ -7,6 +7,9 @@
<h2>{{ event.name }}</h2>
<div class="overflow-auto h-50" style="margin-bottom: 20px">
<div class=" border rounded" style="padding: 20px">
<a class="ml-auto btn btn-info float-left"
href="{{ path('my_events') }}">{% trans %}my_event.return.my_event{% endtrans %}</a>
<br><br>
<h5 style="text-align: left">{% trans %}my_event_details.event_type{% endtrans %} :
{% if event.type == 0 %}
{% trans %}my_event_details.event_type.championship{% endtrans %}
......
......@@ -7,6 +7,9 @@
<h2>{% trans %}my_events.manage.participant.title{% endtrans %} {{ event.name }}</h2>
<div class="overflow-auto h-50" style="margin-bottom: 20px">
<div class=" border rounded" style="padding: 20px">
<a class="ml-auto btn btn-info float-left"
href="{{ path('my_events') }}">{% trans %}my_event.return.my_event{% endtrans %}</a>
<br><br>
<h5>{% trans %}my_events.manage.participant.list{% endtrans %} :</h5>
<table class="table table-bordered table-sm">
<thead>
......
......@@ -811,7 +811,7 @@ of Computer Science.</target>
</trans-unit>
<trans-unit id="xDV5SCt" resname="form.eventCourse.maxTime">
<source>form.eventCourse.maxTime</source>
<target>Max time</target>
<target>Max time (keep to 0 for don't have) in hour:minute</target>
</trans-unit>
<trans-unit id="bMeOHKb" resname="form.eventCourse.format">
<source>form.eventCourse.format</source>
......@@ -1101,6 +1101,10 @@ of Computer Science.</target>
<source>my_events.modify_course.abort</source>
<target>Cancel</target>
</trans-unit>
<trans-unit id="eYEFYQ_" resname="my_event.return.my_event">
<source>my_event.return.my_event</source>
<target>back to my event list</target>
</trans-unit>
</body>
</file>
</xliff>
......@@ -587,7 +587,7 @@ de l’Informatique.</target>
</trans-unit>
<trans-unit id="4LRYkmE" resname="my_events.add">
<source>my_events.add</source>
<target>Creer un événement</target>
<target>Créer un événement</target>
</trans-unit>
<trans-unit id="y0dd1mW" resname="my_events.details">
<source>my_events.details</source>
......@@ -743,7 +743,7 @@ de l’Informatique.</target>
</trans-unit>
<trans-unit id="eWgEjiM" resname="my_events.create.title">
<source>my_events.create.title</source>
<target>Creer un événement</target>
<target>Créer un événement</target>
</trans-unit>
<trans-unit id="gi3Tch." resname="form.event.name">
<source>form.event.name</source>
......@@ -787,7 +787,7 @@ de l’Informatique.</target>
</trans-unit>
<trans-unit id="xDV5SCt" resname="form.eventCourse.maxTime">
<source>form.eventCourse.maxTime</source>
<target>Limite de temps (laisser à 0 pour ne pas en avoir)</target>
<target>Limite de temps (laisser à 0 pour ne pas en avoir) en heure:minute</target>
</trans-unit>
<trans-unit id="bMeOHKb" resname="form.eventCourse.format">
<source>form.eventCourse.format</source>
......@@ -1205,6 +1205,10 @@ de l’Informatique.</target>
<source>event.info.courses_table.over_time_penalty_sec</source>
<target>Pénalité par minute dépassé en seconde</target>
</trans-unit>
<trans-unit id="eYEFYQ_" resname="my_event.return.my_event">
<source>my_event.return.my_event</source>
<target>retour à ma liste d'événements</target>
</trans-unit>
</body>
</file>
</xliff>
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