added start and stop entries

enhanced administration of activities/projects/customers
added navbar for active records and recent activities
added edit timesheet entry form
added translation packages for errors and flashmessages
upgraded composer packages

src/TimesheetBundle/Repository/ActivityRepository.php

@@ -12,10 +12,10 @@
 namespace TimesheetBundle\Repository;
 
 use AppBundle\Entity\User;
+use Doctrine\ORM\Query;
 use TimesheetBundle\Entity\Activity;
 use TimesheetBundle\Entity\Timesheet;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
 use TimesheetBundle\Model\ActivityStatistic;
@@ -36,11 +36,53 @@ class ActivityRepository extends EntityRepository
     {
         return $this->find($id);
     }
-    
+
+    /**
+     * @param User|null $user
+     * @param \DateTime|null $startFrom
+     * @return mixed
+     */
+    public function getRecentActivities(User $user = null, \DateTime $startFrom = null)
+    {
+        $qb = $this->getEntityManager()->createQueryBuilder();
+
+        $qb->select('t', 'a', 'p', 'c')
+            ->from('TimesheetBundle:Timesheet', 't')
+            ->join('t.activity', 'a')
+            ->join('a.project', 'p')
+            ->join('p.customer', 'c')
+            ->where($qb->expr()->isNotNull('t.end'))
+            ->groupBy('a.id')
+            ->orderBy('t.end', 'DESC')
+            ->setMaxResults(10)
+        ;
+
+        if ($user !== null) {
+            $qb->andWhere('t.user = :user')
+                ->setParameter('user', $user);
+        }
+
+        if ($startFrom !== null) {
+            $qb->andWhere($qb->expr()->gt('t.begin', ':begin'))
+                ->setParameter('begin', $startFrom);
+        }
+
+        $results = $qb->getQuery()->getResult();
+
+        $activities = [];
+        /* @var Timesheet $entry */
+        foreach($results as $entry) {
+            $activities[] = $entry->getActivity();
+        }
+
+        return $activities;
+    }
+
     /**
      * Return statistic data for all user.
      *
      * @return ActivityStatistic
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getGlobalStatistics()
     {

src/TimesheetBundle/Repository/TimesheetRepository.php

@@ -12,6 +12,7 @@
 namespace TimesheetBundle\Repository;
 
 use AppBundle\Entity\User;
+use TimesheetBundle\Entity\Activity;
 use TimesheetBundle\Entity\Timesheet;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
@@ -32,6 +33,51 @@ use DateTime;
 class TimesheetRepository extends EntityRepository
 {
 
+    /**
+     * @param Timesheet $entry
+     * @return bool
+     * @throws \Doctrine\ORM\ORMException
+     * @throws \Doctrine\ORM\OptimisticLockException
+     */
+    public function stopRecording(Timesheet $entry)
+    {
+        $end = new DateTime();
+        $begin = $entry->getBegin();
+
+        $entry->setEnd($end);
+        $entry->setDuration($end->getTimestamp() - $begin->getTimestamp());
+
+        // TODO calculate rate by users hourly rate
+
+        $entityManager = $this->getEntityManager();
+        $entityManager->persist($entry);
+        $entityManager->flush();
+
+        return true;
+    }
+
+    /**
+     * @param User $user
+     * @param Activity $activity
+     * @return bool
+     * @throws \Doctrine\ORM\ORMException
+     * @throws \Doctrine\ORM\OptimisticLockException
+     */
+    public function startRecording(User $user, Activity $activity)
+    {
+        $entry = new Timesheet();
+        $entry
+            ->setBegin(new DateTime())
+            ->setUser($user)
+            ->setActivity($activity);
+
+        $entityManager = $this->getEntityManager();
+        $entityManager->persist($entry);
+        $entityManager->flush();
+
+        return true;
+    }
+
     /**
      * @param $select
      * @param User|null $user
@@ -78,6 +124,7 @@ class TimesheetRepository extends EntityRepository
      *
      * @param User $user
      * @return TimesheetStatistic
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getUserStatistics(User $user)
     {
@@ -159,7 +206,8 @@ class TimesheetRepository extends EntityRepository
     /**
      * Fetch statistic data for all user.
      *
-     * @return TimesheetStatistic
+     * @return TimesheetGlobalStatistic
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getGlobalStatistics()
     {
@@ -172,7 +220,7 @@ class TimesheetRepository extends EntityRepository
         $userTotal = $this->getEntityManager()
             ->createQuery('SELECT COUNT(DISTINCT(t.user)) FROM TimesheetBundle:Timesheet t')
             ->getSingleScalarResult();
-        $activeNow = $this->getActiveEntry();
+        $activeNow = $this->getActiveEntries();
         $amountMonth = $this->queryThisMonth('SUM(t.rate)')
             ->getQuery()
             ->getSingleScalarResult();
@@ -197,16 +245,20 @@ class TimesheetRepository extends EntityRepository
 
     /**
      * @param User $user
-     * @return Query
+     * @return Timesheet[]|null
      */
-    public function getActiveEntry(User $user = null)
+    public function getActiveEntries(User $user = null)
     {
         $qb = $this->getEntityManager()->createQueryBuilder();
 
-        $qb->select('t')
+        $qb->select('t', 'a', 'p', 'c')
             ->from('TimesheetBundle:Timesheet', 't')
+            ->join('t.activity', 'a')
+            ->join('a.project', 'p')
+            ->join('p.customer', 'c')
             ->where($qb->expr()->gt('t.begin', '0'))
-            ->andWhere($qb->expr()->isNull('t.end'));
+            ->andWhere($qb->expr()->isNull('t.end'))
+            ->orderBy('t.begin', 'DESC');
 
         $params = [];
 
@@ -226,8 +278,9 @@ class TimesheetRepository extends EntityRepository
     {
         $qb = $this->getEntityManager()->createQueryBuilder();
 
-        $qb->select('t')
+        $qb->select('t', 'a')
             ->from('TimesheetBundle:Timesheet', 't')
+            ->join('t.activity', 'a')
             ->orderBy('t.begin', 'DESC');
 
         if (null !== $user) {