fix group by clause when aggregating by month/week/year

fixes mtierltd#138 and mtierltd#135

Author: mtierltd

lib/Db/ReportItemMapper.php

@@ -53,17 +53,10 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
         }
 
 
-        if(empty($timegroup)){
-            if (!$aggregation) {
-                $selectFields[]= "start as time";
-                $selectFields[]= "start as ftime";
-            } else {
-                $selectFields[]= "min(start) as time";
-                $selectFields[]= "min(start) as ftime";
-            }
-        } else {
+        if (!$aggregation) {
             $selectFields[]= "start as time";
-            $selectFields[]= "start as ftime";
+        } else {
+            $selectFields[]= "min(start) as time";
         }
 
         if ($this->dbengine == 'POSTGRES') {
@@ -73,6 +66,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
                 $selectFields[]= "date_part('year', to_timestamp(start)) as ftime";
             }elseif ($timegroup == 'month') {
                 $selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM') as ftime";
+            }else {
+                $selectFields[]= "start as ftime";
             }
         } else if ($this->dbengine == 'SQLITE') {
             if ($timegroup == 'week') {
@@ -81,6 +76,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
                 $selectFields[]= "strftime('%Y', datetime(start, 'unixepoch')) as ftime";
             }elseif ($timegroup == 'month') {
                 $selectFields[]= "strftime('%Y-%m', datetime(start, 'unixepoch')) as ftime";
+            }else {
+                $selectFields[]= "start as ftime";
             }
         } else {
             if ($timegroup == 'week') {
@@ -89,6 +86,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
                 $selectFields[]= "YEAR(FROM_UNIXTIME(start)) as ftime";
             }elseif ($timegroup == 'month') {
                 $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m') as ftime";
+            }else {
+                $selectFields[]= "start as ftime";
             }
         }
 
@@ -246,7 +245,7 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
         if (empty($limit)){
             $limit = 10000;
         }
-        $sql = 'SELECT '.$selectItems.' where '.implode(" and ",$filters).' '.$group. ' order by start desc';
+        $sql = 'SELECT '.$selectItems.' where '.implode(" and ",$filters).' '.$group;
         //var_dump($sql);
         // var_dump($params);
         return $this->findEntities($sql, $params, $limit, $start);