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;