- Sandbox-commits - mailman.cloud.codelutin.com

r1294 - in wit: . js js/services
by smaisonneuve＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: smaisonneuve Date: 2015-04-29 12:16:59 +0000 (Wed, 29 Apr 2015) New Revision: 1294 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1294 Log: [Wit] - Activity detection (basis) Added: wit/activityChange.html Modified: wit/js/main.js wit/js/services/TimerService.js wit/js/services/UserActivityService.js Copied: wit/activityChange.html (from rev 1283, wit/idle.html) =================================================================== --- wit/activityChange.html (rev 0) +++ wit/activityChange.html 2015-04-29 12:16:59 UTC (rev 1294) @@ -0,0 +1,55 @@ +<html> + <head> + <title>WIT idle</title> + <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> + + <style> + h1 { + text-align: center; + } + </style> + + <script> + var gui = require('nw.gui'); + var window = gui.Window.get(); + var timer = global.timer; + var user = global.user; + + var keepTiming = function() { + user.resumeActivityDetection(); + window.close(); + }; + var stopTiming = function() { + timer.stop(); + window.close(); + }; + var startNewActivity = function() { + timer.reassignTimeFrom(user.getActivityChangeDetectedDate()); + window.close(); + }; + + timer.subscribeIdle(window.close.bind(window)); + </script> + </head> + + <body> + <div class="container-fluid"> + <h1>Activity change detected</h1> + <div class="alert alert-danger" role="alert"> Are you still working on the same activity ?</div> + + <button type="button" class="btn btn-primary btn-lg btn-block" onclick="keepTiming()"> + <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> + Yes ! Please keep timing current activity + </button> + <button type="button" class="btn btn-primary btn-lg btn-block" onclick="stopTiming()"> + <span class="glyphicon glyphicon-minus" aria-hidden="true"></span> + No, stop the timer ! + </button> + <button type="button" class="btn btn-primary btn-lg btn-block" onclick="startNewActivity()"> + <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> + No, right, i would like to time a new activity. + </button> + </div> + </body> + +</html> Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-29 10:05:58 UTC (rev 1293) +++ wit/js/main.js 2015-04-29 12:16:59 UTC (rev 1294) @@ -15,6 +15,8 @@ global.timer = timer; var user = require('./js/services/UserActivityService.js'); +global.user = user; + var config = require('./js/services/ConfigurationService.js'); var React = require('react'); @@ -101,13 +103,16 @@ React.render(<Handler/>, document.body); }); -timer.subscribeIdle(function() { +var popups = []; +var openWindow = function (file) { var gui = global.window.nwDispatcher.requireNwGui(); var current = gui.Window.get(); current.hide(); - var window = gui.Window.open('idle.html', { + user.suspendActivityDetection(); + + var window = gui.Window.open(file, { "position": "center", "focus": true, "toolbar": false, @@ -116,10 +121,21 @@ "height": 300, }); + popups.push(window); + window.on('close', function() { this.hide(); // Pretend to be closed already this.close(true); + + popups.splice(popups.indexOf(window), 1); - current.show(); - }); -}); + if (!popups.length) { + current.show(); + } + }); +}; + +// Subscriptions to services + +timer.subscribeIdle(openWindow.bind(null, "idle.html")) +user.subscribeActivityChange(openWindow.bind(null, "activityChange.html")); Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-29 10:05:58 UTC (rev 1293) +++ wit/js/services/TimerService.js 2015-04-29 12:16:59 UTC (rev 1294) @@ -44,11 +44,13 @@ }; exports.start = function() { - time = idleTime || new Date(); + time = time || new Date(); idleTime = null; historyIndex = -1; timeChange(); + + user.resumeActivityDetection(); }; exports.stop = function(force) { @@ -126,6 +128,7 @@ }; exports.keepIdle = function() { + user.resumeActivityDetection(); idleTime = null; }; @@ -147,8 +150,12 @@ }; exports.reassignIdle = function() { - insertLog(tags, time, idleTime); - time = idleTime; + exports.reassignTimeFrom(idleTime); +}; + +exports.reassignTimeFrom = function (newStartTime) { + insertLog(tags, time, newStartTime); + time = newStartTime; clearTimeout(timeChangeTimer); eventEmitter.emit('onTimeChanged'); Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-04-29 10:05:58 UTC (rev 1293) +++ wit/js/services/UserActivityService.js 2015-04-29 12:16:59 UTC (rev 1294) @@ -2,11 +2,22 @@ var xprop = require('xprop'); var moment = require('moment'); var db = require("./database.js"); +var config = require("./ConfigurationService.js"); +var events = require('events'); +var eventEmitter = new events.EventEmitter(); + var crtSession; +var activityChangeTimer; +var disableActivityDetection = false; const _NET_ACTIVE_WINDOW = 334; +/** + * Retrieve window activity sessions for the peridio [startDAte; endDate] + * If withEmptySession parameter equals true, then if there is a gap between 2 sessions in the results, + * it will be filled with a fake session + */ exports.getSessions = function (startDate, endDate, withEmptySession) { var rst; if (!startDate || !endDate) { @@ -58,9 +69,32 @@ return rst; } -/* Inspired by : -http://stackoverflow.com/questions/19840459/linux-get-notification-on-focused-gui-window-change/19847998#19847998 -*/ +/** + * Offers an api for services interesting in activity change detection + */ +exports.subscribeActivityChange = function(callback) { + eventEmitter.on('onActivityChange', callback); +}; + +exports.getActivityChangeDetectedDate = function () { + return activityChangeTimer && activityChangeTimer.changeDetectedDate; +}; + +exports.suspendActivityDetection = function () { + disableActivityDetection = true; + clearTimeout(activityChangeTimer); +}; + +exports.resumeActivityDetection = function () { + disableActivityDetection = false; +}; + +/* + * Listen to active window change and window title change + * Some part of the code has derived from : + * http://stackoverflow.com/questions/19840459/linux-get-notification-on-focus… + * + */ x11.createClient(function(err, display) { var X = display.client; @@ -77,7 +111,20 @@ X.on('event', onActiveWindowChange.bind(null, X)); }); +/** + * Subscriber to timer change : + * If timer change occured while activity change detection is on going, + * stop activity change detection process (means the user has handled it) + */ +timer.subscribeTimeChanged(function () { + !timer.getTime() && clearTimeout(activityChangeTimer); +}); + +/////////////// +// Utilities // +/////////////// + var onActiveWindowChange = function (X, ev) { if(ev.name == 'PropertyNotify') { @@ -107,12 +154,23 @@ }); }; +/** + * Create a new window session + */ var addWindowSession = function (X, parentId) { + var crt = crtSession; + return getActiveWindowId(X, parentId) .then(getWindowName) - .then(createNewSession); + .then(createNewSession) + .then(setupActivityDetection.bind(null, crt)); }; +/** + * Current active window is still the same + * but it's title has changed. + * Trace it by creating a new session with the same shape attributes than the previous one + */ var updateWindowSession = function (wid) { return getWindowName(wid) .then(function (windowName) { @@ -165,6 +223,8 @@ var createNewSession = function (windowName, color, startDate) { var now = moment(); + // Stop current session + if (crtSession) { crtSession.endDate = now.valueOf(); db.insertSession(crtSession); @@ -175,6 +235,8 @@ var prev = db.getSessionByName(windowName); + // Create new session + crtSession = { name: windowName, color: color || prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), @@ -190,5 +252,36 @@ color: "transparent", startDate: d1, endDate: d2 + }; +}; + +var setupActivityDetection = function (session) { + if (disableActivityDetection || !session || !timer.getTime()) { + + clearTimeout(activityChangeTimer); // stop activity detection + + } else { + + now = moment(); + if (now.diff(session.startDate, "m") >= config.getActivityTime()) { + + // The user has stayed more than "config.getActivityTime()" minutes on a window + // and now has just switched to another window. + // If it stays at list as long as he did on the previous one, let's notify it to him + + activityChangeTimer = setTimeout( + eventEmitter.emit.bind(eventEmitter, 'onActivityChange', now.toDate()), + moment.duration(config.getActivityTime(), "m").as("ms") + ); + activityChangeTimer.crtActivityName = session.name; + activityChangeTimer.changeDetectedDate = now.toDate(); + + } else if (session.name == activityChangeTimer.crtActivityName) { + + // The user is back to the window from which we initiated the activity timer, + // it seems to indicate that he is still working on the same activity. Let's clear the timer. + + clearTimeout(activityChangeTimer); + } } -} \ No newline at end of file +}; \ No newline at end of file

1 0

r1293 - wit/js
by jruchaud＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: jruchaud Date: 2015-04-29 10:05:58 +0000 (Wed, 29 Apr 2015) New Revision: 1293 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1293 Log: Add dropdown for the rapport Modified: wit/js/main.js Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-29 10:05:44 UTC (rev 1292) +++ wit/js/main.js 2015-04-29 10:05:58 UTC (rev 1293) @@ -27,12 +27,19 @@ var App = React.createClass({ + openRapport: function(e) { + React.findDOMNode(this.refs.rapportDropdown).classList.toggle("open"); + React.findDOMNode(this.refs.editionDropdown).classList.remove("open"); + }, + openEdition: function(e) { React.findDOMNode(this.refs.editionDropdown).classList.toggle("open"); + React.findDOMNode(this.refs.rapportDropdown).classList.remove("open"); }, closeAll: function(e) { React.findDOMNode(this.refs.editionDropdown).classList.remove("open"); + React.findDOMNode(this.refs.rapportDropdown).classList.remove("open"); }, render: function() { @@ -47,8 +54,19 @@ <div className="nav navbar-header pull-right"> <ul className="nav pull-right"> <li className="pull-left"><Link onClick={this.closeAll} to="app">Timer</Link></li> - <li className="pull-left"><Link onClick={this.closeAll} to="rapport">Rapport</Link></li> + <li ref="rapportDropdown" className="dropdown pull-left"> + <a className="dropdown-toggle" onClick={this.openRapport}> + Rapport <span className="caret"></span> + </a> + <ul className="dropdown-menu"> + <li><Link onClick={this.closeAll} to="rapport">By date</Link></li> + <li><a href="#">By week</a></li> + <li><a href="#">By month</a></li> + <li><a href="#">By Year</a></li> + </ul> + </li> + <li ref="editionDropdown" className="dropdown pull-left"> <a className="dropdown-toggle" onClick={this.openEdition}> Edition <span className="caret"></span>

1 0

r1292 - in wit: . js/services
by jruchaud＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: jruchaud Date: 2015-04-29 10:05:44 +0000 (Wed, 29 Apr 2015) New Revision: 1292 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1292 Log: Change database file between dev and prod Modified: wit/js/services/database.js wit/package.json Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-29 09:34:19 UTC (rev 1291) +++ wit/js/services/database.js 2015-04-29 10:05:44 UTC (rev 1292) @@ -1,9 +1,12 @@ -var path = (process.env.HOME || process.env.USERPROFILE) + "/.wit"; +var pjson = require('../../package.json'); +var dbFileNamePrefix = pjson.dbFileNamePrefix; +var path = (process.env.HOME || process.env.USERPROFILE) + "/.wit/"; + var Datastore = require('nedb'); var db = { - logs: new Datastore({filename : path + "/logs.json", autoload: true}), - sessions: new Datastore({filename : path + "/sessions.json", autoload: true}) + logs: new Datastore({filename : path + dbFileNamePrefix + "logs.json", autoload: true}), + sessions: new Datastore({filename : path + dbFileNamePrefix + "sessions.json", autoload: true}) }; /******************** Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-29 09:34:19 UTC (rev 1291) +++ wit/package.json 2015-04-29 10:05:44 UTC (rev 1292) @@ -12,6 +12,17 @@ "frame": true, "transparent": false }, + "dbFileNamePrefix" : "dev-", + "platformOverrides": { + "linux64": { + "dbFileNamePrefix" : "", + "window": { + "height": 490, + "min_height": 490, + "toolbar": false + } + } + }, "dependencies": { "bootstrap": "^3.3.4", "less": "^2.5.0",

1 0

r1291 - wit
by jruchaud＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: jruchaud Date: 2015-04-29 09:34:19 +0000 (Wed, 29 Apr 2015) New Revision: 1291 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1291 Log: Add forget files Modified: wit/gruntfile.js Modified: wit/gruntfile.js =================================================================== --- wit/gruntfile.js 2015-04-29 08:29:53 UTC (rev 1290) +++ wit/gruntfile.js 2015-04-29 09:34:19 UTC (rev 1291) @@ -12,9 +12,7 @@ }, src: [ // Your node-webkit app './*.html', - './node_modules/react/dist/**', - './node_modules/bootstrap/dist/**', - './node_modules/less/dist/**', + './node_modules/**', "./package.json", "./font/**", "./img/**",

1 0

r1290 - wit
by jruchaud＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: jruchaud Date: 2015-04-29 08:29:53 +0000 (Wed, 29 Apr 2015) New Revision: 1290 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1290 Log: Add forget files Modified: wit/gruntfile.js Modified: wit/gruntfile.js =================================================================== --- wit/gruntfile.js 2015-04-29 08:10:20 UTC (rev 1289) +++ wit/gruntfile.js 2015-04-29 08:29:53 UTC (rev 1290) @@ -1,18 +1,26 @@ module.exports = function(grunt) { - - grunt.initOptions = function(options){ - - + grunt.initOptions = function(options) { }; grunt.initConfig({ nodewebkit: { options: { - platforms: ['win','osx',"linux"], +// platforms: ['win','osx',"linux"], + platforms: ["linux64"], buildDir: './webkitbuilds', // Where the build version of my node-webkit app is saved }, - src: ['./index.html', "./package.json", "./css/**", "./js/**"] // Your node-webkit app + src: [ // Your node-webkit app + './*.html', + './node_modules/react/dist/**', + './node_modules/bootstrap/dist/**', + './node_modules/less/dist/**', + "./package.json", + "./font/**", + "./img/**", + "./css/**", + "./js/**" + ] }, })

1 0

r1289 - in wit: . img js
by jruchaud＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: jruchaud Date: 2015-04-29 08:10:20 +0000 (Wed, 29 Apr 2015) New Revision: 1289 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1289 Log: Add icon Added: wit/img/ wit/img/stopwatch-34108_640.png Modified: wit/js/gui.js wit/package.json Added: wit/img/stopwatch-34108_640.png =================================================================== (Binary files differ) Property changes on: wit/img/stopwatch-34108_640.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: wit/js/gui.js =================================================================== --- wit/js/gui.js 2015-04-28 15:59:37 UTC (rev 1288) +++ wit/js/gui.js 2015-04-29 08:10:20 UTC (rev 1289) @@ -13,7 +13,7 @@ this.hide(); // Show tray - tray = new gui.Tray({ icon: 'icon.png' }); + tray = new gui.Tray({ icon: 'img/stopwatch-34108_640.png' }); var menu = new gui.Menu(); menu.append(new gui.MenuItem({ label: 'play' })); Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-28 15:59:37 UTC (rev 1288) +++ wit/package.json 2015-04-29 08:10:20 UTC (rev 1289) @@ -3,6 +3,7 @@ "main": "index.html", "version": "1.0.0", "window": { + "icon": "img/stopwatch-34108_640.png", "width": 480, "height": 520, "min_width": 480,

1 0

r1288 - wit/js
by jruchaud＠users.nuiton.org 28 Apr '15

28 Apr '15

Author: jruchaud Date: 2015-04-28 15:59:37 +0000 (Tue, 28 Apr 2015) New Revision: 1288 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1288 Log: Begin dropdown Modified: wit/js/main.js Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-28 15:57:06 UTC (rev 1287) +++ wit/js/main.js 2015-04-28 15:59:37 UTC (rev 1288) @@ -31,6 +31,10 @@ React.findDOMNode(this.refs.editionDropdown).classList.toggle("open"); }, + closeAll: function(e) { + React.findDOMNode(this.refs.editionDropdown).classList.remove("open"); + }, + render: function() { return ( <div className="container-fluid"> @@ -42,8 +46,8 @@ <div className="nav navbar-header pull-right"> <ul className="nav pull-right"> - <li className="pull-left"><Link to="app">Timer</Link></li> - <li className="pull-left"><Link to="rapport">Rapport</Link></li> + <li className="pull-left"><Link onClick={this.closeAll} to="app">Timer</Link></li> + <li className="pull-left"><Link onClick={this.closeAll} to="rapport">Rapport</Link></li> <li ref="editionDropdown" className="dropdown pull-left"> <a className="dropdown-toggle" onClick={this.openEdition}> @@ -56,7 +60,7 @@ </ul> </li> - <li className="pull-left"><Link to="options">Options</Link></li> + <li className="pull-left"><Link onClick={this.closeAll} to="options">Options</Link></li> </ul> </div> </div>

1 0

r1287 - in wit: css js
by jruchaud＠users.nuiton.org 28 Apr '15

28 Apr '15

Author: jruchaud Date: 2015-04-28 15:57:06 +0000 (Tue, 28 Apr 2015) New Revision: 1287 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1287 Log: Begin dropdown Modified: wit/css/style.less wit/js/main.js Modified: wit/css/style.less =================================================================== --- wit/css/style.less 2015-04-28 15:23:03 UTC (rev 1286) +++ wit/css/style.less 2015-04-28 15:57:06 UTC (rev 1287) @@ -16,6 +16,10 @@ padding: 15px; } +.dropdown-toggle { + cursor: pointer; +} + .editButton { position: absolute; right: 15px; Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-28 15:23:03 UTC (rev 1286) +++ wit/js/main.js 2015-04-28 15:57:06 UTC (rev 1287) @@ -26,14 +26,11 @@ var RouteHandler = Router.RouteHandler; var App = React.createClass({ - userActivity : function() { - var gui = require('nw.gui'); - var new_win = gui.Window.open('index.html#/activity', { - position: 'center', - toolbar: true - }); + + openEdition: function(e) { + React.findDOMNode(this.refs.editionDropdown).classList.toggle("open"); }, - + render: function() { return ( <div className="container-fluid"> @@ -47,9 +44,19 @@ <ul className="nav pull-right"> <li className="pull-left"><Link to="app">Timer</Link></li> <li className="pull-left"><Link to="rapport">Rapport</Link></li> - <li className="pull-left"><a href="#">Tags</a></li> + + <li ref="editionDropdown" className="dropdown pull-left"> + <a className="dropdown-toggle" onClick={this.openEdition}> + Edition <span className="caret"></span> + </a> + <ul className="dropdown-menu"> + <li><a href="#">Logs</a></li> + <li><a href="#">Tags</a></li> + <li><a href="#">Activities</a></li> + </ul> + </li> + <li className="pull-left"><Link to="options">Options</Link></li> - <li className="pull-left"><Link to="activity">Help</Link></li> </ul> </div> </div>

1 0

r1286 - in wit: css js/components js/services
by jruchaud＠users.nuiton.org 28 Apr '15

28 Apr '15

Author: jruchaud Date: 2015-04-28 15:23:03 +0000 (Tue, 28 Apr 2015) New Revision: 1286 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1286 Log: Edit time feature Modified: wit/css/style.less wit/js/components/ActionsBar.js wit/js/components/Time.js wit/js/services/TimerService.js Modified: wit/css/style.less =================================================================== --- wit/css/style.less 2015-04-28 15:03:26 UTC (rev 1285) +++ wit/css/style.less 2015-04-28 15:23:03 UTC (rev 1286) @@ -15,3 +15,17 @@ .nav > li > a { padding: 15px; } + +.editButton { + position: absolute; + right: 15px; + margin-top: 3px; +} + +.editInput { + margin: 20px 0 15px 0; + + input { + font-family: Digital; + } +} Modified: wit/js/components/ActionsBar.js =================================================================== --- wit/js/components/ActionsBar.js 2015-04-28 15:03:26 UTC (rev 1285) +++ wit/js/components/ActionsBar.js 2015-04-28 15:23:03 UTC (rev 1286) @@ -20,37 +20,9 @@ timer.nextHistory(); }, - onReassign: function(e) { - React.findDOMNode(this.refs.reassign).classList.toggle("hidden"); - React.findDOMNode(this.refs.actions).classList.toggle("hidden"); - - var time = timer.getTime() || "00:00:00"; - var reassignValue = React.findDOMNode(this.refs.reassignValue); - reassignValue.value = time; - reassignValue.max = time; - }, - - onReassignValue: function(e) { - React.findDOMNode(this.refs.reassign).classList.toggle("hidden"); - React.findDOMNode(this.refs.actions).classList.toggle("hidden"); - - var reassignValue = React.findDOMNode(this.refs.reassignValue); - timer.reassignTime(reassignValue.value); - }, - render: function() { return ( <div className="text-center"> - <div ref="reassign" className="input-group hidden"> - - <input ref="reassignValue" type="time" className="form-control" - min="00:00:00" step="1"/> - - <span className="input-group-btn"> - <button className="btn btn-primary" type="button" onClick={this.onReassignValue}>OK</button> - </span> - </div> - <div ref="actions" className="btn-group" role="group"> <button type="button" className="btn btn-primary btn-lg" onClick={this.prevHistory}> <span className="glyphicon glyphicon-step-backward" aria-hidden="true"></span> @@ -61,9 +33,6 @@ <button type="button" className="btn btn-primary btn-lg" onClick={this.onStop}> <span className="glyphicon glyphicon-stop" aria-hidden="true"></span> </button> - <button type="button" className="btn btn-primary btn-lg" onClick={this.onReassign}> - <span className="glyphicon glyphicon-pencil" aria-hidden="true"></span> - </button> <button type="button" className="btn btn-primary btn-lg" onClick={this.nextHistory}> <span className="glyphicon glyphicon-step-forward" aria-hidden="true"></span> </button> Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-04-28 15:03:26 UTC (rev 1285) +++ wit/js/components/Time.js 2015-04-28 15:23:03 UTC (rev 1286) @@ -15,12 +15,47 @@ timer.unsubscribeTimeChanged(this.forceUpdate_bound); }, + onEdit: function(e) { + React.findDOMNode(this.refs.editButton).classList.toggle("hidden"); + React.findDOMNode(this.refs.editInput).classList.toggle("hidden"); + React.findDOMNode(this.refs.timeValue).classList.toggle("hidden"); + + var time = timer.getTime() || "00:00:00"; + var editInputTime = React.findDOMNode(this.refs.editInputTime); + editInputTime.value = time; + editInputTime.max = time; + }, + + onSaveTime: function(e) { + React.findDOMNode(this.refs.editButton).classList.toggle("hidden"); + React.findDOMNode(this.refs.editInput).classList.toggle("hidden"); + React.findDOMNode(this.refs.timeValue).classList.toggle("hidden"); + + var editInputTime = React.findDOMNode(this.refs.editInputTime); + timer.editTime(editInputTime.value); + }, + render: function() { return ( <div> - <h1 className="digit"> + <button ref="editButton" type="button" className="btn btn-primary btn-small editButton" onClick={this.onEdit}> + <span className="glyphicon glyphicon-pencil" aria-hidden="true"></span> + </button> + + <div ref="editInput" className="input-group editInput hidden"> + + <input ref="editInputTime" type="time" className="form-control" + min="00:00:00" step="1"/> + + <span className="input-group-btn"> + <button className="btn btn-primary" type="button" onClick={this.onSaveTime}>Save</button> + </span> + </div> + + <h1 ref="timeValue" className="digit"> {this.state.getTime() ? this.state.getTime() : "00:00:00"} </h1> + <h5 className="digit"> {this.state.getDayTime() ? this.state.getDayTime() : "00:00:00"} </h5> Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-28 15:03:26 UTC (rev 1285) +++ wit/js/services/TimerService.js 2015-04-28 15:23:03 UTC (rev 1286) @@ -138,7 +138,7 @@ eventEmitter.emit('onTimeChanged'); }; -exports.reassignTime = function(value) { +exports.editTime = function(value) { if (time) { var d = moment.duration(value); idleTime = moment(time).add(d.asMilliseconds(), "ms").toDate();

1 0

r1285 - in wit/js: components services
by jruchaud＠users.nuiton.org 28 Apr '15

28 Apr '15

Author: jruchaud Date: 2015-04-28 15:03:26 +0000 (Tue, 28 Apr 2015) New Revision: 1285 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1285 Log: Edit time feature Modified: wit/js/components/ActionsBar.js wit/js/services/TimerService.js Modified: wit/js/components/ActionsBar.js =================================================================== --- wit/js/components/ActionsBar.js 2015-04-28 14:46:32 UTC (rev 1284) +++ wit/js/components/ActionsBar.js 2015-04-28 15:03:26 UTC (rev 1285) @@ -20,10 +20,38 @@ timer.nextHistory(); }, + onReassign: function(e) { + React.findDOMNode(this.refs.reassign).classList.toggle("hidden"); + React.findDOMNode(this.refs.actions).classList.toggle("hidden"); + + var time = timer.getTime() || "00:00:00"; + var reassignValue = React.findDOMNode(this.refs.reassignValue); + reassignValue.value = time; + reassignValue.max = time; + }, + + onReassignValue: function(e) { + React.findDOMNode(this.refs.reassign).classList.toggle("hidden"); + React.findDOMNode(this.refs.actions).classList.toggle("hidden"); + + var reassignValue = React.findDOMNode(this.refs.reassignValue); + timer.reassignTime(reassignValue.value); + }, + render: function() { return ( <div className="text-center"> - <div className="btn-group" role="group"> + <div ref="reassign" className="input-group hidden"> + + <input ref="reassignValue" type="time" className="form-control" + min="00:00:00" step="1"/> + + <span className="input-group-btn"> + <button className="btn btn-primary" type="button" onClick={this.onReassignValue}>OK</button> + </span> + </div> + + <div ref="actions" className="btn-group" role="group"> <button type="button" className="btn btn-primary btn-lg" onClick={this.prevHistory}> <span className="glyphicon glyphicon-step-backward" aria-hidden="true"></span> </button> @@ -33,6 +61,9 @@ <button type="button" className="btn btn-primary btn-lg" onClick={this.onStop}> <span className="glyphicon glyphicon-stop" aria-hidden="true"></span> </button> + <button type="button" className="btn btn-primary btn-lg" onClick={this.onReassign}> + <span className="glyphicon glyphicon-pencil" aria-hidden="true"></span> + </button> <button type="button" className="btn btn-primary btn-lg" onClick={this.nextHistory}> <span className="glyphicon glyphicon-step-forward" aria-hidden="true"></span> </button> Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-28 14:46:32 UTC (rev 1284) +++ wit/js/services/TimerService.js 2015-04-28 15:03:26 UTC (rev 1285) @@ -15,6 +15,11 @@ var updateUserIdleTime = function() { x11.createClient(function(err, display) { + if (err) { + console.log(err); + return; + } + var X = display.client; X.require('screen-saver', function(err, SS) { SS.QueryInfo(display.screen[0].root, function(err, info) { @@ -133,6 +138,14 @@ eventEmitter.emit('onTimeChanged'); }; +exports.reassignTime = function(value) { + if (time) { + var d = moment.duration(value); + idleTime = moment(time).add(d.asMilliseconds(), "ms").toDate(); + this.reassignIdle(); + } +}; + exports.reassignIdle = function() { insertLog(tags, time, idleTime); time = idleTime;

1 0