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

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

28 Apr '15

Author: smaisonneuve Date: 2015-04-28 14:46:32 +0000 (Tue, 28 Apr 2015) New Revision: 1284 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1284 Log: [Wit] - Fix Timeline : add sessions hole support Modified: wit/js/components/Timeline.js wit/js/services/UserActivityService.js Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-04-28 13:35:43 UTC (rev 1283) +++ wit/js/components/Timeline.js 2015-04-28 14:46:32 UTC (rev 1284) @@ -18,7 +18,7 @@ // Retrieve window focus activity - user.getSessions(this.startDate, this.endDate) + user.getSessions(this.startDate, this.endDate, true) .then(function (sessions) { self.setState({ sessions: sessions @@ -31,29 +31,24 @@ var items = []; - // Create an empty wrapper to occupy space if the first window session - // doesn't start at the begginning of the timeline - - var balancingSlice = this._buildBalancingSlice(sessions, this.startDate, this.endDate); - if (balancingSlice) { - items.push(balancingSlice); - } - // Create a wrapper for each window session - var self = this, timeRange = this.endDate.diff(this.startDate); + var self = this, + timeRange = this.endDate.diff(this.startDate); + items = items.concat( sessions.map(function(session) { + var rst = ""; + var ns = self._normalize(session, self.startDate, self.endDate); // normalize session according to timeline boundaries - + var data = { title: ns.name, color: ns.color, - width: (ns.duration / timeRange * 100 || 0) +"%", - grow: !ns.duration ? "1":"0" + width: (ns.duration / timeRange * 100 || 0) + "%" }; - - return <TimelineSession key={ns.startDate.unix()} data={data} /> + + return <TimelineSession key={ns.startDate.valueOf()} data={data} /> }) ); @@ -66,47 +61,25 @@ ); }, - /** - * Create an empty slice that will occupy the empty space between the timeline startDate and the first window session startDate - */ - _buildBalancingSlice: function(sessions, startDate, endDate) { - var data = {}; - - if (!sessions.length) { - data.width = "100%"; - } else { - data.width = Math.min(startDate.diff(sessions[0].startDate) / endDate.diff(startDate) * 100, 0); - - // The balancing slice is only needed if there is an offset between the timeline startDate and the first window sessions startDate - - if (data.width < 0) { - data.width = Math.abs(data.width) + "%"; - } - } - - return data.width && <TimelineSession key={startDate.unix()} data={data}/> - }, - /* * Normalize session dates and duration according to the given dates * If the given session starts before the given startDate or end after the given endDate, * this function will remove the session part outside the scope */ _normalize: function (session, startDate, endDate) { - var rst = JSON.parse(JSON.stringify(session)); // Clone session, not to alter initial object + session.startDate = moment(session.startDate); + session.endDate = moment(session.endDate); - rst.startDate = moment(rst.startDate); - rst.endDate = rst.endDate && moment(rst.endDate); - - if (rst.startDate.isBefore(startDate)) { - rst.startDate = startDate; + if (session.startDate.isBefore(startDate)) { + session.startDate = startDate; } - if (rst.endDate && rst.endDate.isAfter(endDate)) { - rst.endDate = endDate; + if (session.endDate.isAfter(endDate)) { + session.endDate = endDate; } - rst.duration = rst.endDate && rst.endDate.diff(rst.startDate); - return rst; + session.duration = session.endDate.diff(session.startDate); + + return session; } }); @@ -117,8 +90,7 @@ var title = data.title || ""; var style = { background: data.color, - width: data.width, - flexGrow: data.grow + width: data.width }; return ( <div className="slice" style={style} title={title}>{title}</div> Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-04-28 13:35:43 UTC (rev 1283) +++ wit/js/services/UserActivityService.js 2015-04-28 14:46:32 UTC (rev 1284) @@ -7,7 +7,7 @@ const _NET_ACTIVE_WINDOW = 334; -exports.getSessions = function (startDate, endDate) { +exports.getSessions = function (startDate, endDate, withEmptySession) { var rst; if (!startDate || !endDate) { @@ -18,10 +18,40 @@ rst = db.getSessions(d1.toDate(), d2.toDate()) .then(function (sessions) { -console.log(crtSession); + // Append the current active session to the sessions list return crtSession ? sessions.concat([crtSession]) : sessions + }) + .then(function (sessions) { + var result = JSON.parse(JSON.stringify(sessions)); + + // Convert results + + var lastSessionEnd = d1, s; + for (var i = 0; i < result.length; i++) { + + s = result[i]; + + // Convert timestamp to moment + + s.startDate = moment(s.startDate); + s.endDate = s.endDate ? moment(s.endDate) : d2; + + // Create an empty session when there is a hole between 2 sessions + + if (withEmptySession && lastSessionEnd.isBefore(s.startDate)) { + result.splice(i, 0, createFakeSession(lastSessionEnd, s.startDate)); + i++; + } + lastSessionEnd = s.endDate; + } + + if (withEmptySession && lastSessionEnd.isBefore(d2)) { + result.push(createFakeSession(lastSessionEnd, d2)); + } + + return result; }); } @@ -133,10 +163,10 @@ }; var createNewSession = function (windowName, color, startDate) { + var now = moment(); + if (crtSession) { - var now = moment(); crtSession.endDate = now.valueOf(); - crtSession.duration = now.diff(crtSession.startDate); db.insertSession(crtSession); } @@ -148,7 +178,17 @@ crtSession = { name: windowName, color: color || prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), - startDate: startDate || moment().valueOf() + startDate: startDate || now.valueOf() }; - console.log('creating new session', crtSession); -}; \ No newline at end of file +}; + +var createFakeSession = function (startDate, endDate) { + var d1 = moment(startDate), d2 = moment(endDate); + + return { + name: "", + color: "transparent", + startDate: d1, + endDate: d2 + } +} \ No newline at end of file

1 0

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

28 Apr '15

Author: jruchaud Date: 2015-04-28 13:35:43 +0000 (Tue, 28 Apr 2015) New Revision: 1283 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1283 Log: Add protection Modified: wit/js/services/UserActivityService.js Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-04-28 13:27:18 UTC (rev 1282) +++ wit/js/services/UserActivityService.js 2015-04-28 13:35:43 UTC (rev 1283) @@ -101,15 +101,13 @@ return new Promise(function (resolve, reject) { X.GetProperty(0, parentId, _NET_ACTIVE_WINDOW, X.atoms.WINDOW, 0, 4, function(err, prop) { - if (err) { + if (err || !prop.data.length) { console.log("Couldn't retrieve active window property"); reject(); } else { - resolve(prop.data.readUInt32LE(0)); - } }); });

1 0

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

28 Apr '15

Author: jruchaud Date: 2015-04-28 13:27:18 +0000 (Tue, 28 Apr 2015) New Revision: 1282 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1282 Log: Add global timer Modified: wit/js/components/ActionsBar.js wit/js/components/Time.js wit/js/services/TimerService.js wit/package.json Modified: wit/js/components/ActionsBar.js =================================================================== --- wit/js/components/ActionsBar.js 2015-04-28 13:06:53 UTC (rev 1281) +++ wit/js/components/ActionsBar.js 2015-04-28 13:27:18 UTC (rev 1282) @@ -27,18 +27,12 @@ <button type="button" className="btn btn-primary btn-lg" onClick={this.prevHistory}> <span className="glyphicon glyphicon-step-backward" aria-hidden="true"></span> </button> - <button type="button" className="btn btn-primary btn-lg"> - <span className="glyphicon glyphicon-backward" aria-hidden="true"></span> - </button> <button type="button" className="btn btn-primary btn-lg" onClick={this.onPlay}> <span className="glyphicon glyphicon-play" aria-hidden="true"></span> </button> <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"> - <span className="glyphicon glyphicon-forward" 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 13:06:53 UTC (rev 1281) +++ wit/js/components/Time.js 2015-04-28 13:27:18 UTC (rev 1282) @@ -17,9 +17,14 @@ render: function() { return ( - <h1 className="digit"> - {this.state.getTime() ? this.state.getTime() : "00:00:00"} - </h1> + <div> + <h1 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> + </div> ); } }); Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-28 13:06:53 UTC (rev 1281) +++ wit/js/services/TimerService.js 2015-04-28 13:27:18 UTC (rev 1282) @@ -9,6 +9,7 @@ var tags = ["wit", "js", "dev"]; var time = null; var idleTime = null; +var dayTime = 0; var historyIndex = -1; @@ -32,6 +33,11 @@ }); }; +var insertLog = function(tags, start, end) { + dayTime += moment(end).diff(moment(start)); + db.insertLog(tags, start, end); +}; + exports.start = function() { time = idleTime || new Date(); idleTime = null; @@ -49,7 +55,7 @@ } if (time && !idleTime) { - db.insertLog(tags, time, new Date()); + insertLog(tags, time, new Date()); time = null; timeChange(); } @@ -119,7 +125,7 @@ }; exports.removeIdle = function() { - db.insertLog(tags, time, idleTime); + insertLog(tags, time, idleTime); time = null; idleTime = null; @@ -128,7 +134,7 @@ }; exports.reassignIdle = function() { - db.insertLog(tags, time, idleTime); + insertLog(tags, time, idleTime); time = idleTime; clearTimeout(timeChangeTimer); @@ -169,3 +175,14 @@ 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"); +}; Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-28 13:06:53 UTC (rev 1281) +++ wit/package.json 2015-04-28 13:27:18 UTC (rev 1282) @@ -4,9 +4,9 @@ "version": "1.0.0", "window": { "width": 480, - "height": 490, + "height": 520, "min_width": 480, - "min_height": 490, + "min_height": 520, "toolbar": true, "frame": true, "transparent": false

1 0

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

28 Apr '15

Author: jruchaud Date: 2015-04-28 13:06:53 +0000 (Tue, 28 Apr 2015) New Revision: 1281 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1281 Log: Change window configuration Modified: wit/css/style.less wit/js/services/database.js wit/package.json Modified: wit/css/style.less =================================================================== --- wit/css/style.less 2015-04-28 13:05:06 UTC (rev 1280) +++ wit/css/style.less 2015-04-28 13:06:53 UTC (rev 1281) @@ -3,6 +3,10 @@ src: url(../font/DIGITALDREAM.ttf); } +body { + -webkit-user-select: none; +} + .digit { font-family: Digital; text-align: center; Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-28 13:05:06 UTC (rev 1280) +++ wit/js/services/database.js 2015-04-28 13:06:53 UTC (rev 1281) @@ -123,4 +123,5 @@ } }); }); -} +}; + Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-28 13:05:06 UTC (rev 1280) +++ wit/package.json 2015-04-28 13:06:53 UTC (rev 1281) @@ -5,6 +5,8 @@ "window": { "width": 480, "height": 490, + "min_width": 480, + "min_height": 490, "toolbar": true, "frame": true, "transparent": false

1 0

r1280 - in wit/js: components pages services
by smaisonneuve＠users.nuiton.org 28 Apr '15

28 Apr '15

Author: smaisonneuve Date: 2015-04-28 13:05:06 +0000 (Tue, 28 Apr 2015) New Revision: 1280 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1280 Log: [Wit] - Timeline : parameterize component Modified: wit/js/components/Timeline.js wit/js/pages/UserActivity.js wit/js/services/UserActivityService.js Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-04-28 12:58:00 UTC (rev 1279) +++ wit/js/components/Timeline.js 2015-04-28 13:05:06 UTC (rev 1280) @@ -1,71 +1,62 @@ var moment = require('moment'); var Timeline = React.createClass({ - poolingInterval: 5 * 1000, getInitialState: function() { + var data = this.props.data; + + this.startDate = data && data.startDate && moment(data.startDate), + this.endDate = data && data.endDate && moment(data.endDate); + return { sessions: [], - startDate: moment().subtract(1, "m"), - endDate: moment() }; }, componentDidMount: function () { - this.pollingTimer = setInterval(this._refreshSessions.bind(this), this.poolingInterval); - }, - - componentWillUnmount: function () { - clearTimeout(this.pollingTimer); - }, - - _refreshSessions: function () { var self = this; - - var startDate = moment().subtract(1, "m"), - endDate = moment(); // Retrieve window focus activity - user.getSessions(startDate, endDate) + user.getSessions(this.startDate, this.endDate) .then(function (sessions) { self.setState({ - sessions: sessions, - startDate: startDate, - endDate: endDate + sessions: sessions }); - }); + }); }, render: function() { - var startDate = this.state.startDate, - endDate = this.state.endDate, - sessions = this.state.sessions; + var sessions = this.state.sessions; - // Build timeline + var items = []; + + // Create an empty wrapper to occupy space if the first window session + // doesn't start at the begginning of the timeline - var items = [], data; - - if (sessions.length && startDate.isBefore(sessions[0].startDate)) { - - data = { width: Math.abs(startDate.diff(sessions[0].startDate) / endDate.diff(startDate) * 100 ) +"%" } - items = [<TimelineSession key={startDate.unix()} data={data}/>]; - + var balancingSlice = this._buildBalancingSlice(sessions, this.startDate, this.endDate); + if (balancingSlice) { + items.push(balancingSlice); } + // Create a wrapper for each window session + + var self = this, timeRange = this.endDate.diff(this.startDate); items = items.concat( sessions.map(function(session) { - data = { - title: session.name, - color: session.color, - width: (session.duration / endDate.diff(startDate) * 100 || 0) +"%", - grow: !session.duration ? "1":"0" + var ns = self._normalize(session, self.startDate, self.endDate); // normalize session according to timeline boundaries + + var data = { + title: ns.name, + color: ns.color, + width: (ns.duration / timeRange * 100 || 0) +"%", + grow: !ns.duration ? "1":"0" }; - return <TimelineSession key={session.startDate} data={data} /> + return <TimelineSession key={ns.startDate.unix()} data={data} /> }) ); - + return ( <div className="timeline"> <div className="sessions"> @@ -73,6 +64,49 @@ </div> </div> ); + }, + + /** + * Create an empty slice that will occupy the empty space between the timeline startDate and the first window session startDate + */ + _buildBalancingSlice: function(sessions, startDate, endDate) { + var data = {}; + + if (!sessions.length) { + data.width = "100%"; + } else { + data.width = Math.min(startDate.diff(sessions[0].startDate) / endDate.diff(startDate) * 100, 0); + + // The balancing slice is only needed if there is an offset between the timeline startDate and the first window sessions startDate + + if (data.width < 0) { + data.width = Math.abs(data.width) + "%"; + } + } + + return data.width && <TimelineSession key={startDate.unix()} data={data}/> + }, + + /* + * Normalize session dates and duration according to the given dates + * If the given session starts before the given startDate or end after the given endDate, + * this function will remove the session part outside the scope + */ + _normalize: function (session, startDate, endDate) { + var rst = JSON.parse(JSON.stringify(session)); // Clone session, not to alter initial object + + rst.startDate = moment(rst.startDate); + rst.endDate = rst.endDate && moment(rst.endDate); + + if (rst.startDate.isBefore(startDate)) { + rst.startDate = startDate; + } + if (rst.endDate && rst.endDate.isAfter(endDate)) { + rst.endDate = endDate; + } + rst.duration = rst.endDate && rst.endDate.diff(rst.startDate); + + return rst; } }); Modified: wit/js/pages/UserActivity.js =================================================================== --- wit/js/pages/UserActivity.js 2015-04-28 12:58:00 UTC (rev 1279) +++ wit/js/pages/UserActivity.js 2015-04-28 13:05:06 UTC (rev 1280) @@ -1,12 +1,17 @@ /** @jsx React.DOM */ +var moment = require("moment"); var UserActivity = React.createClass({ render: function() { + var data = { + startDate : moment().subtract(1, "m").valueOf(), + endDate : moment().valueOf() + } return ( <div className="userActivity"> <h1> What the hell did i do today ? </h1> - <Timeline /> + <Timeline data={data}/> </div> ); } Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-04-28 12:58:00 UTC (rev 1279) +++ wit/js/services/UserActivityService.js 2015-04-28 13:05:06 UTC (rev 1280) @@ -8,15 +8,24 @@ const _NET_ACTIVE_WINDOW = 334; exports.getSessions = function (startDate, endDate) { - var d1 = moment(startDate), d2 = moment(endDate); + var rst; + if (!startDate || !endDate) { - return db.getSessions(d1.toDate(), d2.toDate()) - .then(function (sessions) { + console.error("[UserActivityService] getSessions : parameter missing !"); + + } else { + var d1 = moment(startDate), d2 = moment(endDate); - // Append the current active session to the sessions list + rst = db.getSessions(d1.toDate(), d2.toDate()) + .then(function (sessions) { +console.log(crtSession); + // Append the current active session to the sessions list - return crtSession ? sessions.concat([crtSession]) : sessions - }); + return crtSession ? sessions.concat([crtSession]) : sessions + }); + } + + return rst; } /* Inspired by : @@ -31,7 +40,7 @@ // Init windows session with the currently active window - addWindowSession(X, display.screen[0].root) + addWindowSession(X, display.screen[0].root); // Listen to client display events to identify when the currently active window has change @@ -143,4 +152,5 @@ color: color || prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), startDate: startDate || moment().valueOf() }; + console.log('creating new session', crtSession); }; \ No newline at end of file

1 0

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

28 Apr '15

Author: jruchaud Date: 2015-04-28 12:58:00 +0000 (Tue, 28 Apr 2015) New Revision: 1279 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1279 Log: Add completion in input tag Modified: wit/js/services/database.js Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-28 12:55:53 UTC (rev 1278) +++ wit/js/services/database.js 2015-04-28 12:58:00 UTC (rev 1279) @@ -60,7 +60,7 @@ exports.getLastTags = function() { return new Promise(function(resolve, reject) { - db.find({}).sort({startDate: -1 }).limit(100).exec(function (err, docs) { + db.logs.find({}).sort({startDate: -1 }).limit(100).exec(function (err, docs) { if (!err) { var map = {}; docs.forEach(function(log) {

1 0

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

28 Apr '15

Author: jruchaud Date: 2015-04-28 12:55:53 +0000 (Tue, 28 Apr 2015) New Revision: 1278 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1278 Log: Add completion in input tag Modified: wit/js/services/database.js Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-28 12:55:14 UTC (rev 1277) +++ wit/js/services/database.js 2015-04-28 12:55:53 UTC (rev 1278) @@ -123,4 +123,4 @@ } }); }); -};>>>>>>> .r1276 +}

1 0

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

28 Apr '15

Author: jruchaud Date: 2015-04-28 12:55:14 +0000 (Tue, 28 Apr 2015) New Revision: 1277 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1277 Log: Add completion in input tag Modified: wit/index.html wit/js/components/InputTag.js wit/js/components/Tags.js wit/js/services/TimerService.js wit/js/services/database.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-28 09:20:20 UTC (rev 1276) +++ wit/index.html 2015-04-28 12:55:14 UTC (rev 1277) @@ -6,6 +6,7 @@ <script type="text/javascript" src="node_modules/react/dist/react-with-addons.js"></script> <script type="text/javascript" src="node_modules/react/dist/JSXTransformer.js"></script> + <script type="text/jsx" src="js/components/InputTag.js"></script> <script type="text/jsx" src="js/components/Tags.js"></script> <script type="text/jsx" src="js/components/Time.js"></script> <script type="text/jsx" src="js/components/ActionsBar.js"></script> Modified: wit/js/components/InputTag.js =================================================================== --- wit/js/components/InputTag.js 2015-04-28 09:20:20 UTC (rev 1276) +++ wit/js/components/InputTag.js 2015-04-28 12:55:14 UTC (rev 1277) @@ -0,0 +1,63 @@ +/** @jsx React.DOM */ + +var InputTag = React.createClass({ + + getInitialState: function() { + return {options: [], value: ""}; + }, + + getTags: function() { + var self = this; + timer.getLastTags().then(function(tags) { + self.setState({options: tags, value: ""}); + }); + }, + + onKey: function(e) { + var target = e.target; + var value = target.value; + + if (e.keyCode == 13 && value != "") { // On enter + this.setState({options: this.state.options, value: ""}); + + timer.stop(); + timer.addTag(value); + } + }, + + onChange: function(e) { + this.setState({options: this.state.options, value: e.target.value}); + }, + + render: function() { + var options = []; + + if (this.state.value) { + + for (var i = 0, l = this.state.options.length; i < l; i++) { + var item = this.state.options[i]; + + if (options.length < 3 && item.indexOf(this.state.value) == 0) { + var element = <option>{item}</option>; + options.push(element); + } + } + } + + return ( + <div> + <input id="search"className="form-control" + onKeyDown={this.onKey} onFocus={this.getTags} + onChange={this.onChange} placeholder="enter tag" + tabIndex="-1" autoComplete="off" autoCorrect="off" value={this.state.value} + autoCapitalize="off" spellCheck="false" role="textbox" + type="text" list="searchresults" /> + + <datalist id="searchresults"> + {options} + </datalist> + </div> + ); + } + +}); Modified: wit/js/components/Tags.js =================================================================== --- wit/js/components/Tags.js 2015-04-28 09:20:20 UTC (rev 1276) +++ wit/js/components/Tags.js 2015-04-28 12:55:14 UTC (rev 1277) @@ -15,18 +15,6 @@ timer.unsubscribeTagsChanged(this.forceUpdate_bound); }, - onKey: function(e) { - var target = e.target; - var value = target.value; - - if (e.keyCode == 13 && value != "") { // On enter - target.value = ""; - - timer.stop(); - timer.addTag(value); - } - }, - onRemove: function(e) { var target = e.target; var index = target.dataset.index; @@ -59,7 +47,7 @@ {rows} <li className="list-group-item"> - <input className="form-control" onKeyDown={this.onKey} placeholder="enter tag" tabIndex="-1" autoComplete="off" autoCorrect="off" autoCapitalize="off" spellCheck="false" role="textbox" type="text"></input> + <InputTag /> </li> </ul> ); Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-28 09:20:20 UTC (rev 1276) +++ wit/js/services/TimerService.js 2015-04-28 12:55:14 UTC (rev 1277) @@ -165,3 +165,7 @@ setTagsFromHistory(); }; + +exports.getLastTags = function() { + return db.getLastTags(); +}; Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-28 09:20:20 UTC (rev 1276) +++ wit/js/services/database.js 2015-04-28 12:55:14 UTC (rev 1277) @@ -57,6 +57,26 @@ }); }; +exports.getLastTags = function() { + + return new Promise(function(resolve, reject) { + db.find({}).sort({startDate: -1 }).limit(100).exec(function (err, docs) { + if (!err) { + var map = {}; + docs.forEach(function(log) { + log.tags.forEach(function(tag) { + map[tag] = true; + }); + }); + + resolve(Object.keys(map)); + } else { + reject(err); + } + }); + }); +}; + /******************************** * Window sessions db management ********************************/ @@ -103,4 +123,4 @@ } }); }); -}; \ No newline at end of file +};>>>>>>> .r1276

1 0

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

28 Apr '15

Author: jruchaud Date: 2015-04-28 09:20:20 +0000 (Tue, 28 Apr 2015) New Revision: 1276 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1276 Log: Begin implement options Added: wit/js/components/InputTag.js wit/js/pages/Options.js wit/js/services/ConfigurationService.js Modified: wit/index.html wit/js/main.js wit/js/services/TimerService.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-28 09:09:02 UTC (rev 1275) +++ wit/index.html 2015-04-28 09:20:20 UTC (rev 1276) @@ -15,6 +15,7 @@ <script type="text/jsx" src="js/pages/Timer.js"></script> <script type="text/jsx" src="js/pages/Rapport.js"></script> <script type="text/jsx" src="js/pages/UserActivity.js"></script> + <script type="text/jsx" src="js/pages/Options.js"></script> <script type="text/jsx" src="js/main.js"></script> <script type="application/javascript" src="js/gui.js"></script> Added: wit/js/components/InputTag.js =================================================================== Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-28 09:09:02 UTC (rev 1275) +++ wit/js/main.js 2015-04-28 09:20:20 UTC (rev 1276) @@ -9,11 +9,13 @@ global.document = window.document; global.navigator = window.navigator; +global.localStorage = window.localStorage; var timer = require('./js/services/TimerService.js'); global.timer = timer; var user = require('./js/services/UserActivityService.js'); +var config = require('./js/services/ConfigurationService.js'); var React = require('react'); var Router = require('react-router'); @@ -46,7 +48,7 @@ <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 className="pull-left"><a href="#">Options</a></li> + <li className="pull-left"><Link to="options">Options</Link></li> <li className="pull-left"><Link to="activity">Help</Link></li> </ul> </div> @@ -61,6 +63,7 @@ <Route name="app" path="/" handler={App}> <Route name="rapport" handler={Rapport}/> <Route name="activity" handler={UserActivity}/> + <Route name="options" handler={Options}/> <DefaultRoute handler={Timer}/> </Route> ); Copied: wit/js/pages/Options.js (from rev 1274, wit/js/pages/Rapport.js) =================================================================== --- wit/js/pages/Options.js (rev 0) +++ wit/js/pages/Options.js 2015-04-28 09:20:20 UTC (rev 1276) @@ -0,0 +1,56 @@ +/** @jsx React.DOM */ + +var Options = React.createClass({ + + setIdleTime: function(e) { + config.setIdleTime(e.target.value); + }, + + setActivityTime: function(e) { + config.setActivityTime(e.target.value); + }, + + setWeekDay: function(e) { + config.setWeekDay(e.target.value); + }, + + render: function() { + var idleTime = config.getIdleTime(); + var activityTime = config.getActivityTime(); + var weekDay = config.getWeekDay(); + + return ( + <div className="form-horizontal"> + + <div className="form-group"> + <label for="idleTime" className="col-sm-2 control-label">Idle time (minutes)</label> + <div className="col-sm-10"> + <input type="number" className="form-control" defaultValue={idleTime} min="0" step="1" onChange={this.setIdleTime}/> + </div> + </div> + + <div className="form-group"> + <label for="idleTime" className="col-sm-2 control-label">Activity time (minutes)</label> + <div className="col-sm-10"> + <input type="number" className="form-control" id="activityTime" defaultValue={activityTime} min="0" step="1" onChange={this.setActivityTime}/> + </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}> + <option value="0">monday</option> + <option value="1">tuesday</option> + <option value="2">wednesday</option> + <option value="3">thursday</option> + <option value="4">friday</option> + <option value="5">saturday</option> + <option value="6">sunday</option> + </select> + </div> + </div> + </div> + ); + } +}); Added: wit/js/services/ConfigurationService.js =================================================================== --- wit/js/services/ConfigurationService.js (rev 0) +++ wit/js/services/ConfigurationService.js 2015-04-28 09:20:20 UTC (rev 1276) @@ -0,0 +1,34 @@ +// Base on localStorage + +var storage = localStorage; + +var DEFAULT_IDLE_TIME = 1; // 1 min +var DEFAULT_ACTIVITY_TIME = 1; // 1 min +var DEFAULT_WEEK_DAY = 0; // Monday + +// time as minutes +exports.setIdleTime = function(time) { + storage.idleTime = time; +}; + +exports.getIdleTime = function() { + return parseInt(storage.idleTime || DEFAULT_IDLE_TIME); +}; + +// time as minutes +exports.setActivityTime = function(time) { + storage.activityTime = time; +}; + +exports.getActivityTime = function() { + return parseInt(storage.activityTime || DEFAULT_ACTIVITY_TIME); +}; + +// 0 -> Monday +exports.setWeekDay = function(index) { + storage.weekDay = index; +}; + +exports.getWeekDay = function() { + return parseInt(storage.weekDay || DEFAULT_WEEK_DAY); +}; Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-28 09:09:02 UTC (rev 1275) +++ wit/js/services/TimerService.js 2015-04-28 09:20:20 UTC (rev 1276) @@ -1,12 +1,11 @@ var moment = require('moment'); var db = require("./database.js"); +var config = require("./ConfigurationService.js"); var x11 = require('x11'); var events = require('events'); var eventEmitter = new events.EventEmitter(); -var TIME_IDLE = 4 * 1000; - var tags = ["wit", "js", "dev"]; var time = null; var idleTime = null; @@ -20,7 +19,10 @@ SS.QueryInfo(display.screen[0].root, function(err, info) { // console.log('Idle time ' + info.idle + "ms"); - if (info.idle >= TIME_IDLE && !idleTime) { + var configIdleTime = config.getIdleTime(); + var durationIdleTime = moment.duration(configIdleTime, 'm'); + + if (info.idle >= durationIdleTime.asMilliseconds() && !idleTime) { idleTime = new Date(); eventEmitter.emit('onIdle'); }

1 0

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

28 Apr '15

Author: smaisonneuve Date: 2015-04-28 09:09:02 +0000 (Tue, 28 Apr 2015) New Revision: 1275 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1275 Log: [Wit] - Create a database for window sessions Modified: wit/js/components/Timeline.js wit/js/services/UserActivityService.js wit/js/services/database.js Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-04-27 16:12:35 UTC (rev 1274) +++ wit/js/components/Timeline.js 2015-04-28 09:09:02 UTC (rev 1275) @@ -4,14 +4,15 @@ poolingInterval: 5 * 1000, getInitialState: function() { - return this._refreshSessions(); + return { + sessions: [], + startDate: moment().subtract(1, "m"), + endDate: moment() + }; }, componentDidMount: function () { - var self = this; - this.pollingTimer = setInterval(function () { - self.setState(self._refreshSessions()); - }, this.poolingInterval); + this.pollingTimer = setInterval(this._refreshSessions.bind(this), this.poolingInterval); }, componentWillUnmount: function () { @@ -19,18 +20,21 @@ }, _refreshSessions: function () { - // Retrieve window focus activity + var self = this; - var startDate = moment().subtract(1, "h"), + var startDate = moment().subtract(1, "m"), endDate = moment(); + + // Retrieve window focus activity - var sessions = user.getSessions(startDate, endDate); - - return { - sessions: sessions, - startDate: startDate, - endDate: endDate - }; + user.getSessions(startDate, endDate) + .then(function (sessions) { + self.setState({ + sessions: sessions, + startDate: startDate, + endDate: endDate + }); + }); }, render: function() { @@ -42,9 +46,9 @@ var items = [], data; - if (sessions[0].startDate.isAfter(startDate)) { + if (sessions.length && startDate.isBefore(sessions[0].startDate)) { - data = { width: (sessions[0].startDate.diff(startDate) / endDate.diff(startDate) * 100 ) +"%" } + data = { width: Math.abs(startDate.diff(sessions[0].startDate) / endDate.diff(startDate) * 100 ) +"%" } items = [<TimelineSession key={startDate.unix()} data={data}/>]; } @@ -58,7 +62,7 @@ grow: !session.duration ? "1":"0" }; - return <TimelineSession key={session.startDate.unix()} data={data} /> + return <TimelineSession key={session.startDate} data={data} /> }) ); Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-04-27 16:12:35 UTC (rev 1274) +++ wit/js/services/UserActivityService.js 2015-04-28 09:09:02 UTC (rev 1275) @@ -1,29 +1,22 @@ var x11 = require('x11'); var xprop = require('xprop'); var moment = require('moment'); +var db = require("./database.js"); -var windowSessions = []; +var crtSession; const _NET_ACTIVE_WINDOW = 334; exports.getSessions = function (startDate, endDate) { - var result = windowSessions, m; + var d1 = moment(startDate), d2 = moment(endDate); - if (startDate) { - m = moment(startDate); - result = result.filter(function(s) { - return m.isBefore(s.endDate); - }); - } - - if (endDate) { - m = moment(endDate); - result = result.filter(function(s) { - return m.isAfter(s.startDate); - }); - } - - return result; + return db.getSessions(d1.toDate(), d2.toDate()) + .then(function (sessions) { + + // Append the current active session to the sessions list + + return crtSession ? sessions.concat([crtSession]) : sessions + }); } /* Inspired by : @@ -85,10 +78,10 @@ return getWindowName(wid) .then(function (windowName) { - // Let's create a new seesion but with same color attributes as the last one, since the active window has not change, only some of its attibutes + // Let's create a new seesion but with same color attributes than the last one, + // since the active window has not really changed, only some of its attibutes - var last = windowSessions[windowSessions.length - 1]; - if (last.name != windowName) { + if (currentSession.name != windowName) { createNewSession(windowName, last.color); } @@ -133,25 +126,21 @@ }; var createNewSession = function (windowName, color, startDate) { - if (windowSessions.length) { - var now = Date.now(); - var last = windowSessions[windowSessions.length - 1]; - last.endDate = moment(); - last.duration = last.endDate.diff(last.startDate); + if (crtSession) { + var now = moment(); + crtSession.endDate = now.valueOf(); + crtSession.duration = now.diff(crtSession.startDate); + db.insertSession(crtSession); } // Check if a session corresponding to the given name already exists, // so that we can retrieve some properties - var prev = getSessionByName(windowName); + var prev = db.getSessionByName(windowName); - windowSessions.push({ + crtSession = { name: windowName, color: color || prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), - startDate: startDate || moment() - }); -}; - -var getSessionByName = function (name) { - return windowSessions.filter(function (s) { return s.name == name })[0]; + startDate: startDate || moment().valueOf() + }; }; \ No newline at end of file Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-27 16:12:35 UTC (rev 1274) +++ wit/js/services/database.js 2015-04-28 09:09:02 UTC (rev 1275) @@ -1,11 +1,18 @@ -var path = (process.env.HOME || process.env.USERPROFILE) + "/.wit/wit.json"; +var path = (process.env.HOME || process.env.USERPROFILE) + "/.wit"; var Datastore = require('nedb'); -var db = new Datastore({filename : path, autoload: true}); +var db = { + logs: new Datastore({filename : path + "/logs.json", autoload: true}), + sessions: new Datastore({filename : path + "/sessions.json", autoload: true}) +}; +/******************** + * Logs db management + *********************/ + exports.insertLog = function(tags, startDate, endDate) { return new Promise(function(resolve, reject) { - db.insert({ + db.logs.insert({ tags: tags, startDate: startDate.getTime(), endDate: endDate.getTime() @@ -27,7 +34,7 @@ if (endDate) { query.endDate = { $lte: endDate.getTime() } } return new Promise(function(resolve, reject) { - db.find(query).sort({ startDate: -1 }).exec(function(err, docs) { + db.logs.find(query).sort({ startDate: -1 }).exec(function(err, docs) { if (!err) { resolve(docs); } else { @@ -40,7 +47,7 @@ exports.getHistory = function(index) { return new Promise(function(resolve, reject) { - db.find({}).sort({ startDate: -1 }).skip(index).limit(1).exec(function (err, docs) { + db.logs.find({}).sort({ startDate: -1 }).skip(index).limit(1).exec(function (err, docs) { if (!err) { resolve(docs); } else { @@ -49,3 +56,51 @@ }); }); }; + +/******************************** + * Window sessions db management + ********************************/ + +exports.insertSession = function (session) { + return new Promise(function(resolve, reject) { + db.sessions.insert(session, + function(err, newDocs) { + if (!err) { + resolve(newDocs); + } else { + reject(err); + } + }); + }); +}; + +exports.getSessionByName = function (name) { + return new Promise(function(resolve, reject) { + db.sessions.findOne({ + name: name + }, function(err, docs) { + if (!err) { + resolve(docs); + } else { + reject(err); + } + }); + }); +}; + +exports.getSessions = function (startDate, endDate) { + var query = {}; + + if (endDate) { query.startDate = { $lte: endDate.getTime() }; } + if (startDate) { query.endDate = { $gte : startDate.getTime() }; } + + return new Promise(function(resolve, reject) { + db.sessions.find(query).sort({ startDate: 1 }).exec(function(err, docs) { + if (!err) { + resolve(docs); + } else { + reject(err); + } + }); + }); +}; \ No newline at end of file

1 0