Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Corrections sur Timers

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-09-01 16:25:05 +02:00
parent ecacf68ad3
commit 9836498b1c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/schedule-2.0/src/Controller/TimerController.php
View File

@@ -43,7 +43,6 @@ class TimerController extends AbstractController
$user = $em->getRepository("App:User")->find($iduser); $user = $em->getRepository("App:User")->find($iduser);
$tasks = $em->getRepository("App:Task")->findAll(); $tasks = $em->getRepository("App:Task")->findAll();
$timers = $em->getRepository("App:Timer")->findBy(["user"=>$iduser]); $timers = $em->getRepository("App:Timer")->findBy(["user"=>$iduser]);
return $this->render($this->render.'list.cal.html.twig',[ return $this->render($this->render.'list.cal.html.twig',[
"useheader" => true, "useheader" => true,
"usesidebar" => true, "usesidebar" => true,
@@ -105,11 +104,11 @@ class TimerController extends AbstractController
$timer->setEnd($end); $timer->setEnd($end);
$timer->setDuration($duration); $timer->setDuration($duration);
$timer->setDescription($description); $timer->setDescription($description);
$timer->setActivePenalty($activepenalty); $timer->setActivePenalty($activepenalty ? $activepenalty : false);
if ($start < $officeworkstart || $end > $officeworkend) { if ($start < $officeworkstart || $end > $officeworkend) {
$timer->setAdditionalHour(true); $timer->setAdditionalHour(true);
}else{ }else{
$timer->setAdditionalHour($additionalhour); $timer->setAdditionalHour($additionalhour ? $additionalhour : false);
} }
$em->persist($timer); $em->persist($timer);
$em->flush(); $em->flush();

7
src/schedule-2.0/templates/Timer/list.html.twig
View File

@@ -16,7 +16,9 @@ SUIVI HORAIRE
<div id="timer" class="card"> <div id="timer" class="card">
<div class="card-header"> <div class="card-header">
<a class="btn btn-success" style="float:right" href={{ path('app_timer_submit') }}>Créer un Timer</a> <a class="btn btn-success" style="float:right" href={{ path('app_timer_submit') }}>Créer un Timer</a>
{% if user %}
Lancer un Timer : Lancer un Timer :
<select class="select2entity" id="timer-task" name="timer-task"> <select class="select2entity" id="timer-task" name="timer-task">
<option> Tâche </option> <option> Tâche </option>
@@ -28,7 +30,12 @@ SUIVI HORAIRE
<a href='#' title='Add' id='addtimer'> <a href='#' title='Add' id='addtimer'>
<i class='fas fa-plus-circle'></i> <i class='fas fa-plus-circle'></i>
</a> </a>
{% else %}
Veuillez choisir un Intervenant pour lancer un Timer.
{% endif %}
</div> </div>
</div> </div>
<div> <div>