Corrections sur Timers
This commit is contained in:
@@ -43,7 +43,6 @@ class TimerController extends AbstractController
|
||||
$user = $em->getRepository("App:User")->find($iduser);
|
||||
$tasks = $em->getRepository("App:Task")->findAll();
|
||||
$timers = $em->getRepository("App:Timer")->findBy(["user"=>$iduser]);
|
||||
|
||||
return $this->render($this->render.'list.cal.html.twig',[
|
||||
"useheader" => true,
|
||||
"usesidebar" => true,
|
||||
@@ -105,11 +104,11 @@ class TimerController extends AbstractController
|
||||
$timer->setEnd($end);
|
||||
$timer->setDuration($duration);
|
||||
$timer->setDescription($description);
|
||||
$timer->setActivePenalty($activepenalty);
|
||||
$timer->setActivePenalty($activepenalty ? $activepenalty : false);
|
||||
if ($start < $officeworkstart || $end > $officeworkend) {
|
||||
$timer->setAdditionalHour(true);
|
||||
}else{
|
||||
$timer->setAdditionalHour($additionalhour);
|
||||
$timer->setAdditionalHour($additionalhour ? $additionalhour : false);
|
||||
}
|
||||
$em->persist($timer);
|
||||
$em->flush();
|
||||
|
@@ -14,9 +14,11 @@
|
||||
SUIVI HORAIRE
|
||||
</h1>
|
||||
<div id="timer" class="card">
|
||||
|
||||
|
||||
<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 :
|
||||
<select class="select2entity" id="timer-task" name="timer-task">
|
||||
<option> Tâche </option>
|
||||
@@ -28,7 +30,12 @@ SUIVI HORAIRE
|
||||
<a href='#' title='Add' id='addtimer'>
|
||||
<i class='fas fa-plus-circle'></i>
|
||||
</a>
|
||||
{% else %}
|
||||
Veuillez choisir un Intervenant pour lancer un Timer.
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div>
|
||||
|
Reference in New Issue
Block a user