Only one running timesheet: automatically stop others (#386)

src/Controller/AbstractController.php

@@ -42,15 +42,7 @@ abstract class AbstractController extends Controller
      */
     protected function flashSuccess($translationKey, $parameter = [])
     {
-        if (!empty($parameter)) {
-            $translationKey = $this->getTranslator()->trans(
-                $translationKey,
-                $parameter,
-                self::DOMAIN_FLASH
-            );
-        }
-
-        $this->addFlash(self::FLASH_SUCCESS, $translationKey);
+        $this->addFlashTranslated(self::FLASH_SUCCESS, $translationKey, $parameter);
     }
 
     /**
@@ -61,15 +53,7 @@ abstract class AbstractController extends Controller
      */
     protected function flashWarning($translationKey, $parameter = [])
     {
-        if (!empty($parameter)) {
-            $translationKey = $this->getTranslator()->trans(
-                $translationKey,
-                $parameter,
-                self::DOMAIN_FLASH
-            );
-        }
-
-        $this->addFlash(self::FLASH_WARNING, $translationKey);
+        $this->addFlashTranslated(self::FLASH_WARNING, $translationKey, $parameter);
     }
 
     /**
@@ -79,15 +63,30 @@ abstract class AbstractController extends Controller
      * @param array $parameter
      */
     protected function flashError($translationKey, $parameter = [])
+    {
+        $this->addFlashTranslated(self::FLASH_ERROR, $translationKey, $parameter);
+    }
+
+    /**
+     * Adds a fully translated (both $message and all keys in $parameter) flash message to the stack.
+     *
+     * @param string $type
+     * @param string $message
+     * @param array $parameter
+     */
+    protected function addFlashTranslated(string $type, string $message, array $parameter = [])
     {
         if (!empty($parameter)) {
-            $translationKey = $this->getTranslator()->trans(
-                $translationKey,
+            foreach ($parameter as $key => $value) {
+                $parameter[$key] = $this->getTranslator()->trans($value, [], self::DOMAIN_FLASH);
+            }
+            $message = $this->getTranslator()->trans(
+                $message,
                 $parameter,
                 self::DOMAIN_FLASH
             );
         }
 
-        $this->addFlash(self::FLASH_ERROR, $translationKey);
+        $this->addFlash($type, $message);
     }
 }

src/Controller/Admin/TimesheetController.php

@@ -30,15 +30,6 @@ class TimesheetController extends AbstractController
 {
     use TimesheetControllerTrait;
 
-    /**
-     * TimesheetController constructor.
-     * @param bool $durationOnly
-     */
-    public function __construct(bool $durationOnly)
-    {
-        $this->setDurationMode($durationOnly);
-    }
-
     /**
      * @Route(path="/", defaults={"page": 1}, name="admin_timesheet", methods={"GET"})
      * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_timesheet_paginated", methods={"GET"})
@@ -179,8 +170,6 @@ class TimesheetController extends AbstractController
     {
         return $this->createForm(TimesheetEditForm::class, $entry, [
             'action' => $this->generateUrl('admin_timesheet_create'),
-            'method' => 'POST',
-            'duration_only' => $this->isDurationOnlyMode(),
             'include_rate' => $this->isGranted('edit_rate', $entry),
             'include_user' => true,
         ]);
@@ -198,8 +187,6 @@ class TimesheetController extends AbstractController
                 'id' => $entry->getId(),
                 'page' => $page
             ]),
-            'method' => 'POST',
-            'duration_only' => $this->isDurationOnlyMode(),
             'include_rate' => $this->isGranted('edit_rate', $entry),
             'include_user' => true,
         ]);

src/Controller/TimesheetController.php

@@ -30,11 +30,11 @@ class TimesheetController extends AbstractController
     use TimesheetControllerTrait;
 
     /**
-     * @param bool $durationOnly
+     * @param int $hardLimit
      */
-    public function __construct(bool $durationOnly)
+    public function __construct(int $hardLimit)
     {
-        $this->setDurationMode($durationOnly);
+        $this->setHardLimit($hardLimit);
     }
 
     /**
@@ -168,6 +168,8 @@ class TimesheetController extends AbstractController
             } else {
                 $entityManager = $this->getDoctrine()->getManager();
                 $entityManager->persist($entry);
+                $this->stopActiveEntries($user);
+
                 $entityManager->flush();
                 $this->flashSuccess('timesheet.start.success');
             }
@@ -238,9 +240,7 @@ class TimesheetController extends AbstractController
     {
         return $this->createForm(TimesheetEditForm::class, $entry, [
             'action' => $this->generateUrl('timesheet_create'),
-            'method' => 'POST',
             'include_rate' => $this->isGranted('edit_rate', $entry),
-            'duration_only' => $this->isDurationOnlyMode(),
         ]);
     }
 
@@ -256,9 +256,7 @@ class TimesheetController extends AbstractController
                 'id' => $entry->getId(),
                 'page' => $page
             ]),
-            'method' => 'POST',
             'include_rate' => $this->isGranted('edit_rate', $entry),
-            'duration_only' => $this->isDurationOnlyMode(),
         ]);
     }
 

src/Controller/TimesheetControllerTrait.php

@@ -10,6 +10,7 @@
 namespace App\Controller;
 
 use App\Entity\Timesheet;
+use App\Entity\User;
 use App\Repository\TimesheetRepository;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -22,24 +23,24 @@ use Symfony\Component\HttpFoundation\Response;
 trait TimesheetControllerTrait
 {
     /**
-     * @var bool
+     * @var int
      */
-    private $durationOnly = false;
+    private $hardLimit = 1;
 
     /**
-     * @param bool $durationOnly
+     * @param int $hardLimit
      */
-    protected function setDurationMode(bool $durationOnly)
+    protected function setHardLimit(int $hardLimit)
     {
-        $this->durationOnly = $durationOnly;
+        $this->hardLimit = $hardLimit;
     }
 
     /**
-     * @return bool
+     * @return int
      */
-    protected function isDurationOnlyMode()
+    protected function getHardLimit()
     {
-        return $this->durationOnly;
+        return $this->hardLimit;
     }
 
     /**
@@ -169,11 +170,16 @@ trait TimesheetControllerTrait
             }
 
             $entityManager = $this->getDoctrine()->getManager();
-            $entityManager->persist($entry);
 
-            $entityManager->flush();
+            try {
+                $this->stopActiveEntries($entry->getUser());
+                $entityManager->persist($entry);
+                $entityManager->flush();
 
-            $this->flashSuccess('action.update.success');
+                $this->flashSuccess('action.update.success');
+            } catch (\Exception $ex) {
+                $this->flashError('timesheet.start.error', ['%reason%' => $ex->getMessage()]);
+            }
 
             return $this->redirectToRoute($redirectRoute);
         }
@@ -184,6 +190,17 @@ trait TimesheetControllerTrait
         ]);
     }
 
+    /**
+     * @param User $user
+     * @throws \App\Repository\RepositoryException
+     * @throws \Doctrine\ORM\ORMException
+     * @throws \Doctrine\ORM\OptimisticLockException
+     */
+    protected function stopActiveEntries(User $user)
+    {
+        $this->getRepository()->stopActiveEntries($user, $this->getHardLimit());
+    }
+
     /**
      * @param Timesheet $entry
      * @return \Symfony\Component\Form\FormInterface