Fix bug with multiple times per issue. Add minor improvements to gtt log

Author: kriskbx

gtt-log.js

@@ -33,7 +33,9 @@ Fs.readDir(config.frameDir).forEach(file => {
 
 _.each(frames, (frames, date) => {
     console.log(`${moment(date).format('MMMM Do YYYY')} (${toHumanReadable(times[date])})`.green);
-    frames.forEach(frame => {
-        console.log(`  ${frame.id}  ${moment(frame.start).format('hh:mm').green} to ${moment(frame.stop).format('hh:mm').green}\t${toHumanReadable(frame.duration)}\t${frame.project.magenta}\t${(frame.resource.type + ' #' + frame.resource.id).blue}`)
-    });
+    frames
+        .sort((a, b) => moment(a.start).isBefore(moment(b.start)) ? -1 : 1)
+        .forEach(frame => {
+            console.log(`  ${frame.id}  ${moment(frame.start).format('HH:mm').green} to ${moment(frame.stop).format('hh:mm').green}\t${toHumanReadable(frame.duration)}\t${frame.project.magenta}\t${(frame.resource.type + ' #' + frame.resource.id).blue}`)
+        });
 });

gtt-sync.js

@@ -38,22 +38,23 @@ function createTime(frame, time) {
     });
 }
 
-Cli.bar(`${Cli.process} Syncing time records...`, frames.length);
+// filter out frames, that don't need an update
+frames.filter(frame => {
+    return !(Math.ceil(frame.duration) === _.reduce(frame.notes, (n, m) => (n + m.time), 0));
+});
 
-frames.forEach((frame, done) => {
-    // filter out frames, that don't need an update
-    if (Math.ceil(frame.duration) === _.reduce(frame.notes, (n, m) => (n + m.time), 0)) {
-        Cli.advance();
-        return done();
-    }
+Cli.bar(`${Cli.process}  Syncing time records...`, frames.length);
 
+frames.forEach((frame, done) => {
     new Promise(resolve => resolve())
 
     // set resource if it isn't already set
         .then(() => new Promise((resolve, reject) => {
-            if (resources[frame.resource.type][frame.resource.id]) return resolve();
+            if (resources[frame.resource.type][frame.resource.id] !== undefined
+                && resources[frame.resource.type][frame.resource.id].data.project_id) return resolve();
             resources[frame.resource.type][frame.resource.id] = new classes[frame.resource.type](config, {});
-            resources[frame.resource.type][frame.resource.id].make(frame.project, frame.resource.id)
+            resources[frame.resource.type][frame.resource.id]
+                .make(frame.project, frame.resource.id)
                 .then(() => resolve())
                 .catch(error => reject(error));
         }))
@@ -63,7 +64,8 @@ frames.forEach((frame, done) => {
         .then(() => new Promise((resolve, reject) => {
             let notes;
             if ((notes = resources[frame.resource.type][frame.resource.id].notes) && notes.length > 0) return;
-            resources[frame.resource.type][frame.resource.id].getNotes()
+            resources[frame.resource.type][frame.resource.id]
+                .getNotes()
                 .then(() => resolve())
                 .catch(error => reject(error));
         }))

gtt.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const version = '1.1.3';
+const version = '1.1.4';
 const program = require('commander');
 
 program

models/frameCollection.js

@@ -9,6 +9,23 @@ class frameCollection extends Base {
         this.frames = Fs.readDir(config.frameDir);
     }
 
+    filter(func) {
+        let arr = [];
+
+        this.frames.forEach(file => {
+            let frame = Frame.fromFile(this.config, Fs.join(this.config.frameDir, file));
+            if (frame.stop === false) {
+                return;
+            }
+
+            if (func(frame)) {
+                arr.push(file);
+            }
+        });
+
+        this.frames = arr;
+    }
+
     forEach(iterator) {
         return this.parallel(this.frames, (file, done) => {
             let frame = Frame.fromFile(this.config, Fs.join(this.config.frameDir, file));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab-time-tracker",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "A CLI that makes working with GitLabs time tracking feature more enjoyable",
   "main": "gtt.js",
   "scripts": {},