Commit 1c7d68b7 authored by Regis's avatar Regis
Browse files

Merge branch '#89' into 'master'

#89 fix new issue due to the refactor code

See merge request a_boiteau/site-vikazimut-stage!54
parents be5d78e3 fd8170bb
......@@ -91,7 +91,7 @@ class Track
return $this->totalTime;
}
public function getTotalTimeAsString(): string
public function getTotalTimeAsString(): ?string
{
$sec = (int)($this->totalTime / 1000);
$hrs = 0;
......
......@@ -22,15 +22,15 @@ class ModifyParticipantMakeEventCourseType extends AbstractType
foreach ($options['course']->getOrienteer() as $track) {
if (array_key_exists($track->getName(), $duplicates)) {
if ($duplicates[$track->getName()] === 1) {
$timeOfTheTrack = $tracksSimple[$track->getName()]->getTotalTimeInHMS();
$timeOfTheTrack = $tracksSimple[$track->getName()]->getTotalTimeAsString();
$tracks[$track->getName() . " [1] (" . $timeOfTheTrack . ")"] = $tracks[$track->getName() . " (" . $timeOfTheTrack . ")"];
unset($tracks[$track->getName() . " (" . $timeOfTheTrack . ")"]);
}
$duplicates[$track->getName()] += 1;
$tracks[$track->getName() . " [" . $duplicates[$track->getName()] . "] (" . $track->getTotalTimeInHMS() . ")"] = $track;
$tracks[$track->getName() . " [" . $duplicates[$track->getName()] . "] (" . $track->getTotalTimeAsString() . ")"] = $track;
} else {
$tracks[$track->getName() . " (" . $track->getTotalTimeInHMS() . ")"] = $track;
$tracks[$track->getName() . " (" . $track->getTotalTimeAsString() . ")"] = $track;
$tracksSimple[$track->getName()] = $track;
$duplicates[$track->getName()] = 1;
}
......
......@@ -970,6 +970,110 @@ of Computer Science.</target>
<source>homepage.app.ios.download</source>
<target>Apple Store Preview</target>
</trans-unit>
<trans-unit id="KN2Pte_" resname="import.gpx.nickname">
<source>import.gpx.nickname</source>
<target>Nickname</target>
</trans-unit>
<trans-unit id="1lxHrwx" resname="import.gpx.route.type">
<source>import.gpx.route.type</source>
<target>Course type</target>
</trans-unit>
<trans-unit id="twAmtkh" resname="import.gpx.route.preset">
<source>import.gpx.route.preset</source>
<target>preset</target>
</trans-unit>
<trans-unit id="NwT62T6" resname="import.gpx.route.free">
<source>import.gpx.route.free</source>
<target>free</target>
</trans-unit>
<trans-unit id=".Ag8W_." resname="import.gpx.file">
<source>import.gpx.file</source>
<target>GPX file</target>
</trans-unit>
<trans-unit id="iGMD6RN" resname="my_event_details.participants.course">
<source>my_event_details.participants.course</source>
<target>Course</target>
</trans-unit>
<trans-unit id="q4kvmTB" resname="my_event_details.event_type.time">
<source>my_event_details.event_type.time</source>
<target>Time</target>
</trans-unit>
<trans-unit id="gi3Tch." resname="form.event.name">
<source>form.event.name</source>
<target>Event name</target>
</trans-unit>
<trans-unit id="3YLz5kH" resname="form.event.type">
<source>form.event.type</source>
<target>Event type</target>
</trans-unit>
<trans-unit id="K4ezA8f" resname="form.event.time">
<source>form.event.time</source>
<target>Time</target>
</trans-unit>
<trans-unit id="EuUlQn0" resname="form.event.points">
<source>form.event.points</source>
<target>Points</target>
</trans-unit>
<trans-unit id="OP23nPD" resname="form.eventCourse.course">
<source>form.eventCourse.course</source>
<target>Course</target>
</trans-unit>
<trans-unit id="unquYr4" resname="form.eventCourse.imposed">
<source>form.eventCourse.imposed</source>
<target>Imposed</target>
</trans-unit>
<trans-unit id="v8oy6oh" resname="form.eventCourse.free">
<source>form.eventCourse.free</source>
<target>Free</target>
</trans-unit>
<trans-unit id="gE7123C" resname="form.eventCourse.missingPunchPenalty">
<source>form.eventCourse.missingPunchPenalty</source>
<target>Missing punch penalty</target>
</trans-unit>
<trans-unit id="8sZtsdS" resname="form.eventCourse.overTimePenalty">
<source>form.eventCourse.overTimePenalty</source>
<target>Over time penalty</target>
</trans-unit>
<trans-unit id="xDV5SCt" resname="form.eventCourse.maxTime">
<source>form.eventCourse.maxTime</source>
<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>
<target>Format</target>
</trans-unit>
<trans-unit id="wxpVDU7" resname="form.participant.name">
<source>form.participant.name</source>
<target>Nickname</target>
</trans-unit>
<trans-unit id="jkCCcmh" resname="form.event.championship">
<source>form.event.championship</source>
<target>Championship</target>
</trans-unit>
<trans-unit id="33w84ZF" resname="form.event.cumulativeTime">
<source>form.event.cumulativeTime</source>
<target>Cumulative time</target>
</trans-unit>
<trans-unit id="Ggg8lW3" resname="form.modifyParticipantMakeEventCourse.track">
<source>form.modifyParticipantMakeEventCourse.track</source>
<target>Select a track :</target>
</trans-unit>
<trans-unit id="Nx2_QHl" resname="form.ManuallySetPenalty.participant">
<source>form.ManuallySetPenalty.participant</source>
<target>Participant</target>
</trans-unit>
<trans-unit id="DLO2w1h" resname="form.ManuallySetPenalty.eventCourse">
<source>form.ManuallySetPenalty.eventCourse</source>
<target>Race of the event</target>
</trans-unit>
<trans-unit id="F6TCtti" resname="form.ManuallySetPenalty.nbPM">
<source>form.ManuallySetPenalty.nbPM</source>
<target>Number of Missing Punch</target>
</trans-unit>
<trans-unit id="MMzQHZL" resname="form.ManuallySetPenalty.nbOT">
<source>form.ManuallySetPenalty.nbOT</source>
<target>Number of minutes exceeded</target>
</trans-unit>
</body>
</file>
</xliff>
......@@ -973,6 +973,106 @@ de l’Informatique.</target>
<source>homepage.app.ios.download</source>
<target>Fiche App Store</target>
</trans-unit>
<trans-unit id="KN2Pte_" resname="import.gpx.nickname">
<source>import.gpx.nickname</source>
<target>Pseudo</target>
</trans-unit>
<trans-unit id="1lxHrwx" resname="import.gpx.route.type">
<source>import.gpx.route.type</source>
<target>Type de parcours</target>
</trans-unit>
<trans-unit id="twAmtkh" resname="import.gpx.route.preset">
<source>import.gpx.route.preset</source>
<target>imposé</target>
</trans-unit>
<trans-unit id="NwT62T6" resname="import.gpx.route.free">
<source>import.gpx.route.free</source>
<target>libre</target>
</trans-unit>
<trans-unit id=".Ag8W_." resname="import.gpx.file">
<source>import.gpx.file</source>
<target>Fichier GPX</target>
</trans-unit>
<trans-unit id="q4kvmTB" resname="my_event_details.event_type.time">
<source>my_event_details.event_type.time</source>
<target>Temps</target>
</trans-unit>
<trans-unit id="gi3Tch." resname="form.event.name">
<source>form.event.name</source>
<target>Nom de l'événement</target>
</trans-unit>
<trans-unit id="3YLz5kH" resname="form.event.type">
<source>form.event.type</source>
<target>Type d'événement</target>
</trans-unit>
<trans-unit id="K4ezA8f" resname="form.event.time">
<source>form.event.time</source>
<target>Temps</target>
</trans-unit>
<trans-unit id="EuUlQn0" resname="form.event.points">
<source>form.event.points</source>
<target>Points</target>
</trans-unit>
<trans-unit id="OP23nPD" resname="form.eventCourse.course">
<source>form.eventCourse.course</source>
<target>Course</target>
</trans-unit>
<trans-unit id="unquYr4" resname="form.eventCourse.imposed">
<source>form.eventCourse.imposed</source>
<target>Imposé</target>
</trans-unit>
<trans-unit id="v8oy6oh" resname="form.eventCourse.free">
<source>form.eventCourse.free</source>
<target>Libre</target>
</trans-unit>
<trans-unit id="gE7123C" resname="form.eventCourse.missingPunchPenalty">
<source>form.eventCourse.missingPunchPenalty</source>
<target>Pénalité par poste manquant</target>
</trans-unit>
<trans-unit id="8sZtsdS" resname="form.eventCourse.overTimePenalty">
<source>form.eventCourse.overTimePenalty</source>
<target>Pénalité par minute entamée</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) en heure:minute</target>
</trans-unit>
<trans-unit id="bMeOHKb" resname="form.eventCourse.format">
<source>form.eventCourse.format</source>
<target>Format</target>
</trans-unit>
<trans-unit id="wxpVDU7" resname="form.participant.name">
<source>form.participant.name</source>
<target>Pseudonyme</target>
</trans-unit>
<trans-unit id="jkCCcmh" resname="form.event.championship">
<source>form.event.championship</source>
<target>Championnat</target>
</trans-unit>
<trans-unit id="33w84ZF" resname="form.event.cumulativeTime">
<source>form.event.cumulativeTime</source>
<target>Temps cumulé</target>
</trans-unit>
<trans-unit id="Ggg8lW3" resname="form.modifyParticipantMakeEventCourse.track">
<source>form.modifyParticipantMakeEventCourse.track</source>
<target>Sélectionnez une trace :</target>
</trans-unit>
<trans-unit id="Nx2_QHl" resname="form.ManuallySetPenalty.participant">
<source>form.ManuallySetPenalty.participant</source>
<target>Participant</target>
</trans-unit>
<trans-unit id="DLO2w1h" resname="form.ManuallySetPenalty.eventCourse">
<source>form.ManuallySetPenalty.eventCourse</source>
<target>Course de l'événement</target>
</trans-unit>
<trans-unit id="F6TCtti" resname="form.ManuallySetPenalty.nbPM">
<source>form.ManuallySetPenalty.nbPM</source>
<target>Nombre de PM</target>
</trans-unit>
<trans-unit id="MMzQHZL" resname="form.ManuallySetPenalty.nbOT">
<source>form.ManuallySetPenalty.nbOT</source>
<target>Nombre de minute dépassée</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