try to show localized dates and times in reports as well

Author: mtierltd

js/src/dateformat.js

@@ -14,3 +14,40 @@ exports.tformat = function () {
 exports.dtformat = function () {
     return dformat + ' ' + tformat;
 };
+
+exports.mformat = function () {
+    var sample;
+
+    try {
+        sample = window.Intl ? new Intl.DateTimeFormat((document.documentElement.getAttribute("data-locale") || undefined), {
+          numberingSystem: 'latn',
+          calendar: 'gregory',
+        }).format(new Date(1970, 11, 31)) : '';
+    } catch {
+        sample = window.Intl ? new Intl.DateTimeFormat(undefined, {
+          numberingSystem: 'latn',
+          calendar: 'gregory',
+        }).format(new Date(1970, 11, 31)) : '';
+    }
+
+    let mm = 0,
+        mi = sample.indexOf(12);
+    let dd = 1,
+        di = sample.indexOf(31);
+    let yy = 2,
+        yi = sample.indexOf(1970);
+
+    // IE 10 or earlier, iOS 9 or earlier, non-Latin numbering system
+    // or non-Gregorian calendar; fall back to mm/dd/yyyy
+    if (yi >= 0 && mi >= 0 && di >= 0) {
+      mm = (mi > yi) + (mi > di);
+      dd = (di > yi) + (di > mi);
+      yy = (yi > mi) + (yi > di);
+    }
+
+    let r = [];
+    r[yy] = 'YYYY';
+    r[mm] = 'MM';
+
+    return r.join(sample.match(/[-.]/) || '/').replace('//','/');
+};

js/src/reports.js

@@ -216,7 +216,19 @@ var dtf = require("./dateformat.js");
                   {title:"User", field:"userUid", widthGrow:1}, //column will be allocated 1/5 of the remaining space
                   {title:"Project", field:"project", widthGrow:1}, //column will be allocated 1/5 of the remaining space
                   {title:"Client", field:"client", widthGrow:1}, //column will be allocated 1/5 of the remaining space
-                  {title:"When", field:"time", widthGrow:1}, //column will be allocated 1/5 of the remaining space
+                  {title:"When", field:"time", widthGrow:1,formatter:function(cell, formatterParams, onRendered){
+                    var t = cell.getValue();
+                    switch(group3) {
+                    case 'day':
+                      return moment.unix(t).format(dtf.dformat());
+                    case 'month':
+                      return moment(t).format(dtf.mformat());
+                    case '':
+                      return moment.unix(t).format(dtf.dtformat());
+                    default:
+                      return t;
+                    }
+		  }},
                   {title:"Total Duration", field:"totalDuration",formatter:function(cell, formatterParams, onRendered){
                     //cell - the cell component
                     //formatterParams - parameters set for the column

lib/Db/ReportItemMapper.php

@@ -56,30 +56,30 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
             $pg = 1;
             if(empty($timegroup)){
                 if (!$aggregation) {
-                    $selectFields[]= "to_char(to_timestamp(min(start))::date,'YYYY-MM-DD HH24:MI') as time";
+                    $selectFields[]= "start as time";
                 } else {
-                    $selectFields[]= "to_timestamp(min(start))::date as time";
+                    $selectFields[]= "min(start) as time";
                 }
             } elseif ($timegroup == 'week') {
-                $selectFields[]= "to_char(to_timestamp(start)::date, 'YYYY-WW') as time";
+                $selectFields[]= "concat(date_part(\'year\', to_timestamp(start)), 'W', to_char(to_timestamp(start), 'IW')) as time";
             }elseif ($timegroup == 'day') {
-                $selectFields[]= "to_timestamp(start)::date as time";
+                $selectFields[]= "start as time";
             }elseif ($timegroup == 'year') {
-                $selectFields[]= 'date_part(\'year\', to_timestamp(start)::date) as time';
+                $selectFields[]= 'date_part(\'year\', to_timestamp(start)) as time';
             }elseif ($timegroup == 'month') {
-                $selectFields[]= "to_char(to_timestamp(start)::date, 'YYYY-MM') as time";
+                $selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM') as time";
             }
         } else {
             if(empty($timegroup)){
                 if (!$aggregation) {
-                    $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m-%d %H:%i') as time";
+                    $selectFields[]= "start as time";
                 } else {
-                    $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(min(start)),'%Y-%m-%d') as time";
+                    $selectFields[]= "min(start) as time";
                 }
             } elseif ($timegroup == 'week') {
-                $selectFields[]= "STR_TO_DATE(CONCAT(YEARWEEK(FROM_UNIXTIME(start), 1),' Monday'), '%x%v %W') as time";
+                $selectFields[]= "CONCAT(YEAR(FROM_UNIXTIME(start)), 'W', WEEK(FROM_UNIXTIME(start))) as time";
             }elseif ($timegroup == 'day') {
-                $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m-%d') as time";
+                $selectFields[]= "start as time";
             }elseif ($timegroup == 'year') {
                 $selectFields[]= 'YEAR(FROM_UNIXTIME(start)) as time';
             }elseif ($timegroup == 'month') {
@@ -249,4 +249,4 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
 
 
 
-}
+}