Add check for valid time-formats. Add option to show issues without time records

Author: kriskbx

gtt-log.js

@@ -36,6 +36,6 @@ _.each(frames, (frames, date) => {
     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}`)
+            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-report.js

@@ -1,6 +1,7 @@
 const _ = require('underscore');
 const fs = require('fs');
 const program = require('commander');
+const moment = require('moment');
 
 const Cli = require('./include/cli');
 const Config = require('./include/file-config');
@@ -44,6 +45,7 @@ program
     .option('--merge_request_columns <columns>', 'include the given columns in the merge request part of the report', collect, null)
     .option('--user_columns', 'include user columns in the report')
     .option('--quiet', 'only output report')
+    .option('--show_without_times', 'show issues/merge requests without time records')
     .parse(process.argv);
 
 // init helpers
@@ -75,6 +77,7 @@ config
     .set('noHeadlines', program.no_headlines)
     .set('noWarnings', program.no_warnings)
     .set('quiet', program.quiet)
+    .set('showWithoutTimes', program.show_without_times)
     .set('userColumns', program.user_columns);
 
 Cli.quiet = config.get('quiet');
@@ -92,6 +95,12 @@ if ((config.get('report').includes('merge_requests') && !config.get('query').inc
 if (!Output[config.get('output')]) {
     Cli.error(`The output ${config.get('output')} doesn't exist`);
 }
+if (!config.get('from').isValid()) {
+    Cli.error(`FROM is not in a valid ISO date format.`);
+}
+if (!config.get('to').isValid()) {
+    Cli.error(`TO is not a in valid ISO date format.`);
+}
 
 // create report
 let report = new Report(config), output;

gtt.js

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

include/config.js

@@ -29,6 +29,7 @@ const defaults = {
     noHeadlines: false,
     noWarnings: false,
     quiet: false,
+    showWithoutTimes: true,
     _perPage: 100,
     _parallel: 10
 };

models/hasTimes.js

@@ -69,7 +69,7 @@ class hasTimes extends Base {
             // only include times by the configured user
             (this.config.get('user') && this.config.get('user') !== note.author.username) ||
             // filter out times that are not in the given time frame
-            !(created.isSameOrAfter(this.config.get('from')) && created.isSameOrBefore(this.config.get('to'))) ||
+            !(created.isSameOrAfter(moment(this.config.get('from'))) && created.isSameOrBefore(moment(this.config.get('to')))) ||
             // filter out notes that are no time things
             !(match = regex.exec(note.body)) && !(subMatch = subRegex.exec(note.body)) && !(removeMatch = removeRegex.exec(note.body))
             ) return done();

models/report.js

@@ -86,7 +86,7 @@ class report extends Base {
      * @returns {Array}
      */
     static filter(issues) {
-        return issues.filter(issue => issue.times && issue.times.length > 0);
+        return issues.filter(issue => (this.config.get('showWithoutTimes') || issue.times && issue.times.length > 0));
     }
 
     /**

package.json

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

readme.md

@@ -169,6 +169,9 @@ gtt report --include_labels=pending --include_labels=approved
 # exclude the given labels from the results
 gtt report --exclude_labels=bug --exclude_labels=feature
 
+# include issues and merge requests in the report hat have no time records
+gtt report --show_without_times
+
 # choose a different output than a stdout table (json coming soon)
 gtt report --output=markdown --file=filename.md
 gtt report --output=csv --file=filename.csv
@@ -292,6 +295,9 @@ noHeadlines: true
 # hide warnings in report
 noWarnings: true
 
+# include issues and merge requests in the report hat have no time records
+showWithoutTimes: true
+
 # change number of concurrent connections. 
 # handle with care, we don't want to spam GitLabs API too much
 _parallel: 4