add timezones

Author: kriskbx

package.json

@@ -38,6 +38,7 @@
     "markdown-table": "^1.1.0",
     "mdpdf": "^1.5.1",
     "moment": "^2.18.1",
+    "moment-timezone": "^0.5.16",
     "node-spinner": "^0.0.4",
     "open": "^0.0.5",
     "progress": "^2.0.0",

readme.md

@@ -1,4 +1,4 @@
-/home/kriskbx/data/Keys/ssh/github_rsa"# ![gtt](https://raw.githubusercontent.com/kriskbx/gitlab-time-tracker/master/preview/icon.png) gtt
+# ![gtt](https://raw.githubusercontent.com/kriskbx/gitlab-time-tracker/master/preview/icon.png) gtt
 
 [![npm](https://img.shields.io/npm/dt/gitlab-time-tracker.svg?style=flat-square)](https://www.npmjs.com/package/gitlab-time-tracker)
 [![npm](https://img.shields.io/npm/v/gitlab-time-tracker.svg?style=flat-square)](https://www.npmjs.com/package/gitlab-time-tracker)
@@ -216,6 +216,7 @@ gtt cancel
 ```shell
 gtt log
 ```
+Note: gtt log uses UTC as default timezone. If you want to display the times in a different timezone, make sure to use `timezone: "Europe/Berlin"` in your config.
 
 **Edit a local time record by the given id:**
 
@@ -600,6 +601,10 @@ timeFormat:
   merge_requests: "[%sign][%hours_overall]"
   records: "[%sign][%days>d ][%hours>h ][%minutes>m ][%seconds>s]"
 
+# Change your timezone
+# default: UTC
+timezone: "Europe/Berlin"
+
 # Output type
 # Available: csv, table, markdown, pdf
 # defaults to table

src/gtt-log.js

@@ -1,7 +1,7 @@
 const _ = require('underscore');
 const program = require('commander');
 const colors = require('colors');
-const moment = require('moment');
+const moment = require('moment-timezone');
 
 const Config = require('./include/file-config');
 const Cli = require('./include/cli');
@@ -31,10 +31,10 @@ tasks.log()
 
                 console.log(`${moment(date).format('MMMM Do YYYY')} (${toHumanReadable(times[date])})`.green);
                 frames[date]
-                    .sort((a, b) => moment(a.start).isBefore(moment(b.start)) ? -1 : 1)
+                    .sort((a, b) => a.start.isBefore(b.start) ? -1 : 1)
                     .forEach(frame => {
                         let issue = frame.resource.new ? `new ${frame.resource.type + ' "' + frame.resource.id.blue}"` : `${(frame.resource.type + ' #' + frame.resource.id).blue}`;
-                        console.log(`  ${frame.id}  ${moment(frame.start).format('HH:mm').green} to ${moment(frame.stop).format('HH:mm').green}\t${toHumanReadable(frame.duration)}\t\t${frame.project.magenta}\t\t${issue}`)
+                        console.log(`  ${frame.id}  ${frame.start.clone().format('HH:mm').green} to ${frame.stop.clone().format('HH:mm').green}\t${toHumanReadable(frame.duration)}\t\t${frame.project.magenta}\t\t${issue}`)
                     });
             });
         }

src/include/config.js

@@ -36,6 +36,7 @@ const defaults = {
     noWarnings: false,
     quiet: false,
     showWithoutTimes: false,
+    timezone: "UTC",
     _perPage: 100,
     _parallel: 10,
     _verbose: false,

src/include/tasks.js

@@ -156,7 +156,7 @@ class tasks {
             new FrameCollection(this.config)
                 .forEach((frame, done) => {
                     if (frame.stop === false) return done();
-                    let date = moment(frame.start).format('YYYY-MM-DD');
+                    let date = frame.date.format('YYYY-MM-DD');
 
                     if (!frames[date]) frames[date] = [];
                     if (!times[date]) times[date] = 0;

src/models/frame.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const moment = require('moment');
+const moment = require('moment-timezone');
 const Hashids = require('hashids');
 const hashids = new Hashids();
 
@@ -20,18 +20,20 @@ class frame {
             this.resource.new = true;
 
         this.id = frame.generateId();
-        this.start = false;
-        this.stop = false;
+        this._start = false;
+        this._stop = false;
+        this.timezone = config.get('timezone');
         this.notes = [];
     }
 
     static fromJson(config, json) {
         let frame = new this(config, json.resource.id, json.resource.type);
         frame.project = json.project;
         frame.id = json.id;
-        frame.start = json.start;
-        frame.stop = json.stop;
+        frame._start = json.start;
+        frame._stop = json.stop;
         frame.notes = json.notes;
+        frame.timezone = json.timezone;
 
         return frame;
     }
@@ -41,19 +43,26 @@ class frame {
     }
 
     startMe() {
-        this.start = new Date();
+        this._start = this._getCurrentDate();
         this.write();
 
         return this;
     }
 
     stopMe() {
-        this.stop = new Date();
+        this._stop = this._getCurrentDate();
         this.write();
 
         return this;
     }
 
+    _getCurrentDate() {
+        if(this.timezone)
+            return moment().tz(this.timezone).format();
+
+        return moment();
+    }
+
     /**
      * assert file exists
      */
@@ -71,8 +80,9 @@ class frame {
             project: this.project,
             resource: this.resource,
             notes: this.notes,
-            start: this.start,
-            stop: this.stop
+            start: this._start,
+            stop: this._stop,
+            timezone: this.timezone
         }, null, "\t"));
     }
 
@@ -84,6 +94,18 @@ class frame {
         return moment(this.stop).diff(this.start) / 1000;
     }
 
+    get date() {
+       return this.start;
+    }
+
+    get start() {
+        return this.timezone ? moment(this._start).tz(this.timezone) : moment(this._start);
+    }
+
+    get stop() {
+        return this.timezone ? moment(this._stop).tz(this.timezone) : moment(this._stop);
+    }
+
     /**
      * generate a unique id
      * @returns {number}

yarn.lock

@@ -1271,6 +1271,16 @@ mocha@^3.5.0:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
+moment-timezone@^0.5.16:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.16.tgz#661717d5f55b4d2c2e002262d726c83785192a5a"
+  dependencies:
+    moment ">= 2.9.0"
+
+"moment@>= 2.9.0":
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+
 moment@^2.18.1:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"