Author: jruchaud Date: 2015-05-22 15:06:36 +0000 (Fri, 22 May 2015) New Revision: 1448 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1448 Log: Detection no use wit but it is started Modified: wit/.eslintrc wit/js/main.js wit/js/pages/Options.js wit/js/services/ConfigurationService.js wit/js/services/TimerService.js Modified: wit/.eslintrc =================================================================== --- wit/.eslintrc 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/.eslintrc 2015-05-22 15:06:36 UTC (rev 1448) @@ -5,7 +5,8 @@ "globals": { "console": false, "React": false, - "scope": false + "scope": false, + "alert": false }, "env": { "browser": true, Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/main.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -13,6 +13,7 @@ global.scope = window.scope = {}; +// Services // var timer = require("./js/services/TimerService.js"); scope.timer = timer; @@ -22,6 +23,11 @@ var config = require("./js/services/ConfigurationService.js"); scope.config = config; +var noTimer = require("./js/services/NoTimerService.js"); +scope.noTimer = noTimer; +noTimer.detect(); + +// React conf // var React = require("react"); var Router = require("react-router"); Modified: wit/js/pages/Options.js =================================================================== --- wit/js/pages/Options.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/pages/Options.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -10,6 +10,10 @@ scope.config.setActivityTime(e.target.value); }, + setNoTimer: function(e) { + scope.config.setNoTimer(e.target.value); + }, + setWeekDay: function(e) { scope.config.setWeekDay(e.target.value); }, @@ -17,6 +21,7 @@ render: function() { var idleTime = scope.config.getIdleTime(); var activityTime = scope.config.getActivityTime(); + var noTimer = scope.config.getNoTimer(); var weekDay = scope.config.getWeekDay(); return <div className="form-horizontal"> @@ -36,6 +41,13 @@ </div> <div className="form-group"> + <label for="noTimer" className="col-sm-2 control-label">No timer (minutes)</label> + <div className="col-sm-10"> + <input type="number" className="form-control" defaultValue={noTimer} min="0" step="1" onChange={this.setNoTimer}/> + </div> + </div> + + <div className="form-group"> <label for="idleTime" className="col-sm-2 control-label">Week day</label> <div className="col-sm-10"> <select name="select" className="form-control" id="weekDay" defaultValue={weekDay} onChange={this.setWeekDay}> Modified: wit/js/services/ConfigurationService.js =================================================================== --- wit/js/services/ConfigurationService.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/services/ConfigurationService.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -6,6 +6,7 @@ var DEFAULT_IDLE_TIME = 1; // 1 min var DEFAULT_ACTIVITY_TIME = 1; // 1 min +var DEFAULT_NO_TIMER = 0; // desabled var DEFAULT_WEEK_DAY = 0; // Monday // time as minutes @@ -34,3 +35,11 @@ exports.getWeekDay = function() { return parseInt(storage.weekDay || DEFAULT_WEEK_DAY, 10); }; + +exports.setNoTimer = function(time) { + storage.noTimer = time; +}; + +exports.getNoTimer = function() { + return parseInt(storage.noTimer || DEFAULT_NO_TIMER, 10); +}; Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/services/TimerService.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -2,7 +2,6 @@ var moment = require("moment"); var db = require("./database.js"); -var config = require("./ConfigurationService.js"); var x11 = require("x11"); var log = require("loglevel"); @@ -181,14 +180,30 @@ eventEmitter.emit("onTimeChanged"); }; +exports.getDayTime = function() { + var diff = dayTime; + if (time) { + var now = moment(); + diff += now.diff(time); + } + + var value = moment(diff).utcOffset(0); + return value.format("HH:mm:ss"); +}; + +exports.deleteLog = function(id) { + db.deleteLog(id); +}; + +// History var setTagsFromHistory = function() { db.getHistory(historyIndex) .then(function(logs) { if (logs && logs.length) { - var log = logs[0]; - tags = log.tags.slice(0); + var row = logs[0]; + tags = row.tags.slice(0); } else { tags = []; } @@ -215,18 +230,3 @@ exports.getLastTags = function() { return db.getLastTags(); }; - -exports.getDayTime = function() { - var diff = dayTime; - if (time) { - var now = moment(); - diff += now.diff(time); - } - - var value = moment(diff).utcOffset(0); - return value.format("HH:mm:ss"); -}; - -exports.deleteLog = function(id) { - db.deleteLog(id); -};