resume menu

Author: ndu2

src/gtt-resume.js

@@ -1,30 +1,90 @@
-import {Command} from 'commander';
+import { Command } from 'commander';
 import colors from 'colors';
 import moment from 'moment';
 import Config from './include/file-config.js';
 import Cli from './include/cli.js';
 import Tasks from './include/tasks.js';
+import Fs from './include/filesystem.js';
+import Frame from './models/frame.js';
+import inquirer from 'inquirer';
+
+const listSize = 30;
+
+function column(str, n) {
+    if (str.length > n) {
+        str = str.substr(0, n - 1) + "…"
+    }
+    return str.padEnd(n);
+}
+
+function resumeFrame(tasks, frame) {
+    tasks.resume(frame)
+        .then(frame => console.log(`Starting project ${frame.project.magenta} ${frame.resource.type.blue} ${('#' + frame.resource.id).blue} ${frame.note?frame.note:''} at ${moment().format('HH:mm').green}`))
+        .catch(error => Cli.error(error));
+}
 
 function resume() {
     const resume = new Command('resume', 'resume monitoring time for last stopped record')
-    .arguments('[project]')
-    .option('--verbose', 'show verbose output')
-    .action((aproject, options, program) => {
+        .arguments('[project]')
+        .option('--verbose', 'show verbose output')
+        .option('--ask', 'ask the activity to resume from the last entries, ignoring project')
+        .action((project, options, program) => {
 
-Cli.verbose = program.opts().verbose;
+            Cli.verbose = program.opts().verbose;
 
-let config = new Config(process.cwd()).set('project', program.args[0]),
-    tasks = new Tasks(config);
+            let config = new Config(process.cwd()).set('project', project),
+                tasks = new Tasks(config);
 
-if (!config.get('project'))
-    Cli.error('No project set');
+            if (!config.get('project'))
+                Cli.error('No project set');
 
-tasks.resume()
-    .then(frame => console.log(`Starting project ${config.get('project').magenta} ${frame.resource.type.blue} ${('#' + frame.resource.id).blue} at ${moment().format('HH:mm').green}`))
-    .catch(error => Cli.error(error));
-}
-);
-return resume;
+            let lastFrames = Fs.all(config.frameDir).slice(-listSize); // last listSize frames (one page of inquirer)
+            lastFrames = lastFrames.map((file) =>
+                Frame.fromFile(config, Fs.join(config.frameDir, file))
+            );
+            lastFrames = lastFrames.sort((a, b) => moment(a.stop || moment()).isBefore(moment(b.stop || moment())) ? 1 : -1);
+
+            if (!options.ask) {
+                let project = config.get('project');
+                let filteredFrames = lastFrames.filter(frame => (!project) || frame.project === project);
+                resumeFrame(tasks, (filteredFrames.length > 0) ? filteredFrames[0] : undefined);
+            } else {
+                let lastFramesDetails = lastFrames
+                    .sort((a, b) => (a.start.isBefore(b.start) ? -1 : 1))
+                    .map((frame) => {
+                        let issue = `${(frame.resource.type + " #" + frame.resource.id).padEnd(20).blue
+                            }${column(frame.title != null ? frame.title : "", 50)}`;
+                        return {
+                            name:
+                                `  ${frame.id}  ${frame.start.clone().format("MMMM Do YYYY HH:mm").green} ${frame.stop ? "to " + frame.stop.clone().format("HH:mm").green : "(running)"}\t` +
+                                `${column(frame.project, 50).magenta}${issue}${frame.note != null ? frame.note : ""
+                                }`,
+                            value: frame,
+                        };
+                    });
+
+
+                inquirer
+                    .prompt([
+                        {
+                            type: "list",
+                            name: "frame",
+                            message: "Frame?",
+                            default: lastFramesDetails.length - 1,
+                            choices: lastFramesDetails,
+                            pageSize: listSize,
+                        },
+                    ])
+                    .then((answer) => {
+                        resumeFrame(tasks, answer.frame);
+                    });
+            }
+
+
+        }
+
+        );
+    return resume;
 }
 
 export default resume;

src/include/tasks.js

@@ -177,21 +177,12 @@ class tasks {
      *
      * @returns {Promise}
      */
-    resume() {
+    resume(frame) {
         return new Promise((resolve, reject) => {
-            let project = this.config.get('project'),
-                frames = new FrameCollection(this.config);
-
-            if (!project) return reject("No project set.");
-
-            frames
-                .filter(frame => frame.project === project)
-                .sort((a, b) => moment(a.stop).isBefore(moment(b.stop)) ? 1 : -1);
-            if (frames.length == 0) {
+            if (!frame) {
                 return reject("No task found to resume.");
             }
-            let last = frames.frames[0];
-            this.start(last.project, last.resource.type, last.resource.id)
+            this.start(frame.project, frame.resource.type, frame.resource.id, frame.note)
                 .then(frame => resolve(frame))
                 .catch(error => reject(error));
         });