From 9836498b1c5fef565c8df0a460991b9c6abade28 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 1 Sep 2020 16:25:05 +0200
Subject: [PATCH] Corrections sur Timers

---
 src/schedule-2.0/src/Controller/TimerController.php |  5 ++---
 src/schedule-2.0/templates/Timer/list.html.twig     | 11 +++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/schedule-2.0/src/Controller/TimerController.php b/src/schedule-2.0/src/Controller/TimerController.php
index 4b3a4fd..bf6ed94 100644
--- a/src/schedule-2.0/src/Controller/TimerController.php
+++ b/src/schedule-2.0/src/Controller/TimerController.php
@@ -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();
diff --git a/src/schedule-2.0/templates/Timer/list.html.twig b/src/schedule-2.0/templates/Timer/list.html.twig
index 20d86b6..f829542 100644
--- a/src/schedule-2.0/templates/Timer/list.html.twig
+++ b/src/schedule-2.0/templates/Timer/list.html.twig
@@ -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>