fix timezone problems in timesheet forms (#555)

src/Controller/CalendarController.php

@@ -13,6 +13,7 @@ use App\Calendar\Service;
 use App\Calendar\TimesheetEntity;
 use App\Entity\Timesheet;
 use App\Repository\Query\TimesheetQuery;
+use App\Timesheet\UserDateTimeFactory;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
@@ -30,13 +31,19 @@ class CalendarController extends AbstractController
      * @var Service
      */
     protected $calendar;
+    /**
+     * @var UserDateTimeFactory
+     */
+    protected $dateTime;
 
     /**
      * @param Service $calendar
+     * @param UserDateTimeFactory $dateTime
      */
-    public function __construct(Service $calendar)
+    public function __construct(Service $calendar, UserDateTimeFactory $dateTime)
     {
         $this->calendar = $calendar;
+        $this->dateTime = $dateTime;
     }
 
     /**
@@ -47,7 +54,8 @@ class CalendarController extends AbstractController
     {
         return $this->render('calendar/user.html.twig', [
             'config' => $this->calendar->getConfig(),
-            'google' => $this->calendar->getGoogle()
+            'google' => $this->calendar->getGoogle(),
+            'now' => $this->dateTime->createDateTime(),
         ]);
     }
 

src/Controller/ProfileController.php

@@ -18,6 +18,7 @@ use App\Form\UserPasswordType;
 use App\Form\UserPreferencesForm;
 use App\Form\UserRolesType;
 use App\Repository\TimesheetRepository;
+use App\Timesheet\UserDateTimeFactory;
 use App\Voter\UserVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -45,12 +46,20 @@ class ProfileController extends AbstractController
     protected $encoder;
 
     /**
-     * @param UserPasswordEncoderInterface $encoder
+     * @var UserDateTimeFactory
      */
-    public function __construct(UserPasswordEncoderInterface $encoder, EventDispatcherInterface $dispatcher)
+    protected $dateTime;
+
+    /**
+     * @param UserPasswordEncoderInterface $encoder
+     * @param EventDispatcherInterface $dispatcher
+     * @param UserDateTimeFactory $dateTime
+     */
+    public function __construct(UserPasswordEncoderInterface $encoder, EventDispatcherInterface $dispatcher, UserDateTimeFactory $dateTime)
     {
         $this->encoder = $encoder;
         $this->dispatcher = $dispatcher;
+        $this->dateTime = $dateTime;
     }
 
     /**
@@ -252,6 +261,7 @@ class ProfileController extends AbstractController
             'user' => $user,
             'stats' => $userStats,
             'years' => $monthlyStats,
+            'local_time' => $this->dateTime->createDateTime(),
             'forms' => []
         ];
 

src/Controller/TimesheetController.php

@@ -29,14 +29,6 @@ class TimesheetController extends AbstractController
 {
     use TimesheetControllerTrait;
 
-    /**
-     * @param int $hardLimit
-     */
-    public function __construct(int $hardLimit)
-    {
-        $this->setHardLimit($hardLimit);
-    }
-
     /**
      * @Route(path="/", defaults={"page": 1}, name="timesheet", methods={"GET"})
      * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="timesheet_paginated", methods={"GET"})
@@ -162,7 +154,7 @@ class TimesheetController extends AbstractController
         try {
             $entry = new Timesheet();
             $entry
-                ->setBegin(new \DateTime())
+                ->setBegin($this->dateTime->createDateTime())
                 ->setUser($user)
                 ->setActivity($timesheet->getActivity())
                 ->setProject($timesheet->getProject())

src/Controller/TimesheetControllerTrait.php

@@ -12,6 +12,7 @@ namespace App\Controller;
 use App\Entity\Timesheet;
 use App\Entity\User;
 use App\Repository\TimesheetRepository;
+use App\Timesheet\UserDateTimeFactory;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -27,6 +28,21 @@ trait TimesheetControllerTrait
      */
     private $hardLimit = 1;
 
+    /**
+     * @var UserDateTimeFactory
+     */
+    protected $dateTime;
+
+    /**
+     * @param UserDateTimeFactory $dateTime
+     * @param int $hardLimit
+     */
+    public function __construct(UserDateTimeFactory $dateTime, int $hardLimit)
+    {
+        $this->dateTime = $dateTime;
+        $this->setHardLimit($hardLimit);
+    }
+
     /**
      * @param int $hardLimit
      */
@@ -118,7 +134,7 @@ trait TimesheetControllerTrait
     {
         $entry = new Timesheet();
         $entry->setUser($this->getUser());
-        $entry->setBegin(new \DateTime());
+        $entry->setBegin($this->dateTime->createDateTime());
 
         $start = $request->get('begin');
         if ($start !== null) {