fix grouping by re-introducig the date formatting in the sql queries

fixes mtierltd#132

Author: mtierltd

appinfo/info.xml

@@ -35,7 +35,7 @@ Mit dem integrierten Dashboard lässt sich anhand eines Kuchen-/Donut-Diagramms
 
 Diese App wird aktuell noch weiterentwickelt, also: Augen offen halten für neue Features! Und falls Dir irgendwelche Verbesserungsvorschläge, Probleme oder neue Features einfallen, schau mal auf unserem [GitHub Projekt](https://github.com/mtierltd/timetracker) vorbei, vielleicht wird Dein Thema bereits diskutiert! Und falls nicht, starte gerne eine neue Diskussion, wir freuen uns auf Dein Feedback!
     </description>
-    <version>0.0.67</version>
+    <version>0.0.68</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >MTier Ltd.</author>
     <namespace>TimeTracker</namespace>

lib/Db/ReportItem.php

@@ -12,6 +12,7 @@ class ReportItem extends Entity {
     public $projectId;
     public $userUid;
     public $time;
+    public $ftime;
     public $totalDuration;
     public $project;
     public $clientId;
@@ -28,6 +29,7 @@ public function __construct() {
         $this->addType('projectId', 'integer');
         $this->addType('userUid', 'string');
         $this->addType('time', 'string');
+        $this->addType('ftime', 'string');
         $this->addType('totalDuration', 'integer');
         $this->addType('project', 'string');
     }

lib/Db/ReportItemMapper.php

@@ -56,11 +56,40 @@ 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 {
             $selectFields[]= "start as time";
+            $selectFields[]= "start as ftime";
+        }
+
+        if ($this->dbengine == 'POSTGRES') {
+            if ($timegroup == 'week') {
+                $selectFields[]= "concat(date_part('year', to_timestamp(start)), 'W', to_char(to_timestamp(start), 'IW')) as ftime";
+            }elseif ($timegroup == 'year') {
+                $selectFields[]= "date_part('year', to_timestamp(start)) as ftime";
+            }elseif ($timegroup == 'month') {
+                $selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM') as ftime";
+            }
+        } else if ($this->dbengine == 'SQLITE') {
+            if ($timegroup == 'week') {
+                $selectFields[]= "strftime('%YW%W', datetime(start, 'unixepoch')) as ftime";
+            }elseif ($timegroup == 'year') {
+                $selectFields[]= "strftime('%Y', datetime(start, 'unixepoch')) as ftime";
+            }elseif ($timegroup == 'month') {
+                $selectFields[]= "strftime('%Y-%m', datetime(start, 'unixepoch')) as ftime";
+            }
+        } else {
+            if ($timegroup == 'week') {
+                $selectFields[]= "CONCAT(YEAR(FROM_UNIXTIME(start)), 'W', WEEK(FROM_UNIXTIME(start))) as ftime";
+            }elseif ($timegroup == 'year') {
+                $selectFields[]= "YEAR(FROM_UNIXTIME(start)) as ftime";
+            }elseif ($timegroup == 'month') {
+                $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m') as ftime";
+            }
         }
 
         if ($aggregation){
@@ -176,7 +205,7 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
             // } elseif ($timegroup == 'year') {
             //     $groups[] = "YEAR(start)";
             // }
-            $groups[] = 'time';
+            $groups[] = 'ftime';
         }
 
         if (!empty($groupOn1)){