+added configurable hours per day setting

Author: csakaszamok

.gitignore

@@ -5,4 +5,5 @@ node_modules
 .vscode-test/
 
 .vsix
-.images
+.images
+/config.json

CHANGELOG.md

@@ -24,4 +24,8 @@ Add logo
 
 ## 0.5.3
 
-Fix day calculation
+Fix day calculation
+
+## 0.5.4
+
+Add config file (now you can set hour per day)

README.md

@@ -7,11 +7,16 @@ If you want to know what time was spent for projects.
 * Auto activate (no needed hotkey)
 * Spent time is write into csak-timelog.json file (under vscode folder)
 * Show current spent time on statusbar
-* The day is workday (8 hour per day)
 * Timer is paused automatic after 10min inactivity
 * Save every 60sec or when saved a document
 
 ![](https://github.com/csakaszamok/csak-ext-timer/blob/master/screen1.PNG?raw=true)
 
+### Set workday
 
+The default "workhours per day" value is 0.
+In this case show only time is displayed (hour,minute,second)
+
+If you want to see workdays then you can set "workhours per day" value for display.
+Press F1, type "csak-ext-timer config" then select saveConfig menu and type the new value between 1-24. New value will be saved.
 

gif1.gif

@@ -2,7 +2,7 @@
     "name": "csak-ext-timer",
     "displayName": "csak-ext-timer",
     "description": "If you want to know what time was spent for projects",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "publisher": "csakaszamok",
     "engines": {
         "vscode": "^1.18.0"
@@ -13,6 +13,15 @@
     "activationEvents": [
         "*"
     ],
+    "contributes": {
+		"commands": [
+			{
+				"command": "extension.csakexttimerFunctions",
+				"title": "csak-ext-timer config",
+				"description": "Save/load hours setting for csak-ext-timer"
+			}
+        ]
+    },
     "icon": "csak-ext-timer-logo.png",
     "repository": {
         "type": "git",

package.json

@@ -4,6 +4,9 @@ import { window, commands, Disposable, ExtensionContext, StatusBarAlignment, Sta
 import { setInterval, clearInterval } from 'timers';
 import * as fs from 'fs';
 import * as vscode from 'vscode';
+import Window = vscode.window;
+import QuickPickItem = vscode.QuickPickItem;
+import QuickPickOptions = vscode.QuickPickOptions;
 
 const path = require('path');
 /*const remote = require('electron').remote
@@ -30,8 +33,49 @@ export function activate(context: ExtensionContext) {
     // Add to a list of disposables which are disposed when this extension is deactivated.
     context.subscriptions.push(controller);
     context.subscriptions.push(wordCounter);
+
+    vscode.commands.registerCommand('extension.csakexttimerFunctions', csakexttimerFunctions);
 }
 
+class Config {
+
+    private _hoursperday: number;
+
+    constructor() {
+        this.loadConfig();
+    }
+
+    loadConfig(path?) {
+        let obj = {};
+        let _path = path ? path : __dirname + '/../config.json';
+        if (fs.existsSync(_path)) {
+            obj = JSON.parse(fs.readFileSync(_path, 'utf8'));
+            this._hoursperday = (<any>obj).hoursperday;
+        } else {
+            this._hoursperday = 0;
+        }
+    }
+
+    saveConfig(path?) {
+        let _path = path ? path : __dirname + '/../config.json';
+        let obj = {
+            hoursperday: this._hoursperday
+        }
+        fs.writeFileSync(_path, JSON.stringify(obj), 'utf8');
+    }
+
+    get hoursperday() {
+        return this._hoursperday;
+    }
+
+    set hoursperday(value) {
+        this._hoursperday = value;
+    }
+
+}
+
+var globalConfig: Config;
+
 class WordCounter {
 
     private _statusBarItem: StatusBarItem;
@@ -45,13 +89,21 @@ class WordCounter {
         hours = hours - (days * 24);
         minutes = minutes - (days * 24 * 60) - (hours * 60);
         seconds = seconds - (days * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60);
-        days = Math.floor((days * 24 + hours) / 8); //8 hour per workday
 
         function padding(num) {
-            return num < 10 ? '0' + num : num;
+            let result = '';
+            result = num < 1000 ? '000' + num : num;
+            result = num < 100 ? '00' + num : num;
+            result = num < 10 ? '0' + num : num;
+            return result;
+        }
+
+        if (globalConfig.hoursperday && globalConfig.hoursperday > 0) {
+            days = Math.floor((days * 24 + hours) / globalConfig.hoursperday); //8 hour per workday
+            return `${days} day + ${padding(hours)}:${padding(minutes)}:${padding(seconds)}`;
         }
 
-        return `${days} day ${padding(hours)}:${padding(minutes)}:${padding(seconds)}`;
+        return `${padding(hours + (days * 24))}:${padding(minutes)}:${padding(seconds)}`;
     }
 
     public updateWordCount(time, inactive = '') {
@@ -125,6 +177,8 @@ class WordCounterController {
 
     public logfile: string = '';
 
+    private config: object;
+
     private heartbeat() {
 
     }
@@ -178,6 +232,10 @@ class WordCounterController {
         this.starttime = new Date();
         this.lasttime = this.starttime;
 
+        globalConfig = new Config();
+        globalConfig.loadConfig();
+
+
         /*  setTimeout(() => {
               this._wordCounter.updateWordCount(this.getElapsedTime());
           },  1);*/
@@ -262,3 +320,48 @@ class WordCounterController {
     }
 }
 
+
+// Main menu /////////////////////////////////////
+function csakexttimerFunctions() {
+
+    /*if (!vscode.window.activeTextEditor) {
+		vscode.window.showInformationMessage('Open a file first to manipulate text selections');
+		return;
+	}*/
+
+    var opts: QuickPickOptions = { matchOnDescription: true, placeHolder: "Spent timer" };
+    var items: QuickPickItem[] = [];
+
+    items.push({ label: "saveConfig", description: "save hour setting to config file" });
+    items.push({ label: "loadConfig", description: "load hour setting from config file" });
+
+    Window.showQuickPick(items).then((selection) => {
+        if (!selection) {
+            return;
+        }
+        let e = Window.activeTextEditor;
+        let d = e.document;
+        let sel = e.selections;
+
+        switch (selection.label) {
+            case "saveConfig":
+                vscode.window.showInputBox({ prompt: 'Hours per day' }).then(
+                    val => {
+                        let i = parseInt(val);
+                        globalConfig.hoursperday = i;
+                        globalConfig.saveConfig();
+                        vscode.window.showInformationMessage('Current hours per day is: ' + i);
+                    }
+                );
+                break;
+            case "loadConfig":
+                globalConfig.loadConfig();
+                vscode.window.showInformationMessage('Current hours per day is:  ' + globalConfig.hoursperday)
+                break;
+            default:
+                console.log("?")
+                break;
+        }
+    });
+
+}