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

r1303 - in wit/js: components pages
by smaisonneuve＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: smaisonneuve Date: 2015-04-29 16:48:57 +0000 (Wed, 29 Apr 2015) New Revision: 1303 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1303 Log: [Wit] - Rapport : add timeline Modified: wit/js/components/FilterBar.js wit/js/components/Timeline.js wit/js/pages/Rapport.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-04-29 15:16:24 UTC (rev 1302) +++ wit/js/components/FilterBar.js 2015-04-29 16:48:57 UTC (rev 1303) @@ -20,10 +20,10 @@ var moment = require('moment'); var db = require("./js/services/database.js"); - var beginDate = moment(React.findDOMNode(this.refs.beginDate).value); - var endDate = moment(React.findDOMNode(this.refs.endDate).value); + this.startDate = moment(React.findDOMNode(this.refs.beginDate).value); + this.endDate = moment(React.findDOMNode(this.refs.endDate).value); - return db.searchLogs(null, beginDate, endDate, true); + return db.searchLogs(null, this.startDate, this.endDate, true); }, onSearch: function() { @@ -31,7 +31,7 @@ this.search() .then(function(result) { - self.props.onSearchResult(result); + self.props.onSearchResult(result, self.startDate, self.endDate); // console.log(result); }); }, Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-04-29 15:16:24 UTC (rev 1302) +++ wit/js/components/Timeline.js 2015-04-29 16:48:57 UTC (rev 1303) @@ -14,11 +14,23 @@ }, componentDidMount: function () { - var self = this; // Retrieve window focus activity - user.getSessions(this.startDate, this.endDate, true) + this.refresh(this.startDate, this.endDate); + }, + + componentWillReceiveProps: function(nextProps) { + this.refresh(nextProps.data.startDate, nextProps.data.endDate); + }, + + refresh: function (startDate, endDate) { + this.startDate = startDate; + this.endDate = endDate; + + var self = this; + + user.getSessions(startDate, endDate, true) .then(function (sessions) { self.setState({ sessions: sessions @@ -34,7 +46,7 @@ // Create a wrapper for each window session var self = this, - timeRange = this.endDate.diff(this.startDate); + timeRange = this.endDate && this.endDate.diff(this.startDate); items = items.concat( sessions.map(function(session) { Modified: wit/js/pages/Rapport.js =================================================================== --- wit/js/pages/Rapport.js 2015-04-29 15:16:24 UTC (rev 1302) +++ wit/js/pages/Rapport.js 2015-04-29 16:48:57 UTC (rev 1303) @@ -1,13 +1,22 @@ /** @jsx React.DOM */ +var moment = require("moment"); var Rapport = React.createClass({ getInitialState : function() { - return {result: []}; + return { + startDate: moment().subtract(1, "h"), + endDate: moment(), + result: [] + }; }, - handleSearchResult: function(result) { - this.setState({result: result}); + handleSearchResult: function(result, startDate, endDate) { + this.setState({ + startDate: startDate, + endDate: endDate, + result: result + }); }, render: function() { @@ -15,6 +24,7 @@ <div> <FilterBar onSearchResult={this.handleSearchResult}/> <FilterLogs data={this.state.result}/> + <Timeline data={this.state}/> </div> ); }

1 0

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

29 Apr '15

Author: jruchaud Date: 2015-04-29 15:16:24 +0000 (Wed, 29 Apr 2015) New Revision: 1302 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1302 Log: Multiple instance Modified: wit/package.json Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-29 15:10:57 UTC (rev 1301) +++ wit/package.json 2015-04-29 15:16:24 UTC (rev 1302) @@ -2,6 +2,7 @@ "name": "wit", "main": "index.html", "version": "1.0.0", + "single-instance": false, "window": { "icon": "img/stopwatch-34108_640.png", "width": 480,

1 0

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

29 Apr '15

Author: jruchaud Date: 2015-04-29 15:10:57 +0000 (Wed, 29 Apr 2015) New Revision: 1301 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1301 Log: Manage no result Modified: wit/js/components/FilterLogs.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-04-29 15:08:07 UTC (rev 1300) +++ wit/js/components/FilterLogs.js 2015-04-29 15:10:57 UTC (rev 1301) @@ -81,7 +81,7 @@ }, getInitialState: function() { - return {data: {}}; + return {data: null}; }, componentWillReceiveProps: function(nextProps) { @@ -135,44 +135,52 @@ render: function() { var items = []; - var dates = Object.keys(this.state.data); - for (var date of dates) { - var r = this.renderTd(date, [], this.state.data[date]); - items = items.concat(r); + var classString = ""; + if (!this.state.data) { + classString = "hidden"; + + } else { + var dates = Object.keys(this.state.data); + for (var date of dates) { + var r = this.renderTd(date, [], this.state.data[date]); + items = items.concat(r); + } } - + return ( - <div> - <h1>Result</h1> - - <div ref="actions" className="btn-group" role="group"> - <button type="button" className="btn btn-primary" onClick={this.onClipboardCSV}> - CSV <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> - </button> - <button type="button" className="btn btn-primary" onClick={this.onClipboardTXT}> - TXT <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> - </button> - - <button type="button" className="btn btn-primary" onClick={this.onMailCSV}> - CSV <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> - </button> - <button type="button" className="btn btn-primary" onClick={this.onMailTXT}> - TXT <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> - </button> + <div className={classString}> + <h1>{items.length ? "Result" : "No result"}</h1> + + <div className={items.length ? "" : "hidden"}> + <div ref="actions" className="btn-group" role="group"> + <button type="button" className="btn btn-primary" onClick={this.onClipboardCSV}> + CSV <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> + </button> + <button type="button" className="btn btn-primary" onClick={this.onClipboardTXT}> + TXT <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> + </button> + + <button type="button" className="btn btn-primary" onClick={this.onMailCSV}> + CSV <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> + </button> + <button type="button" className="btn btn-primary" onClick={this.onMailTXT}> + TXT <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> + </button> + </div> + + <table className="table"> + <thead> + <tr> + <th>Date</th> + <th>Duration</th> + <th>Tags</th> + </tr> + </thead> + <tbody> + {items} + </tbody> + </table> </div> - - <table className="table"> - <thead> - <tr> - <th>Date</th> - <th>Duration</th> - <th>Tags</th> - </tr> - </thead> - <tbody> - {items} - </tbody> - </table> </div> ); }

1 0

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

29 Apr '15

Author: smaisonneuve Date: 2015-04-29 15:08:07 +0000 (Wed, 29 Apr 2015) New Revision: 1300 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1300 Log: [Wit] - Database : revert converters (perf issue) Modified: wit/js/services/database.js Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-29 15:03:16 UTC (rev 1299) +++ wit/js/services/database.js 2015-04-29 15:08:07 UTC (rev 1300) @@ -35,11 +35,6 @@ /** * Search for logs in the database - * @param {type} tags - * @param {type} startDate - * @param {type} endDate - * @param {type} truncate - * @returns {Promise} */ exports.searchLogs = function(tags, startDate, endDate, truncate) { var query = {};

1 0

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

29 Apr '15

Author: smaisonneuve Date: 2015-04-29 15:03:16 +0000 (Wed, 29 Apr 2015) New Revision: 1299 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1299 Log: [Wit] - Database : revert converters (perf issue) Modified: wit/js/components/FilterLogs.js wit/js/services/database.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-04-29 14:29:57 UTC (rev 1298) +++ wit/js/components/FilterLogs.js 2015-04-29 15:03:16 UTC (rev 1299) @@ -90,7 +90,7 @@ nextProps.data.forEach(function(log) { var date = moment(log.startDate).format("MM/DD/YY"); - var diff = moment(log.endDate.diff(log.startDate)).utcOffset(0); + var diff = moment(moment(log.endDate).diff(log.startDate)).utcOffset(0); var current = state[date] = state[date] || {}; log.tags.forEach(function(tag) { Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-29 14:29:57 UTC (rev 1298) +++ wit/js/services/database.js 2015-04-29 15:03:16 UTC (rev 1299) @@ -43,26 +43,23 @@ */ exports.searchLogs = function(tags, startDate, endDate, truncate) { var query = {}; - var m1 = startDate && moment(startDate), - m2 = endDate && moment(endDate); + var t1 = startDate && moment(startDate).valueOf(), + t2 = endDate && moment(endDate).valueOf(); if (tags) { query.tags = { $in: tags }; } - if (m1) { query.endDate = { $gte : m1.valueOf() }; } - if (m2) { query.startDate = { $lte: m2.valueOf() }; } + if (t1) { query.endDate = { $gte : t1 }; } + if (t2) { query.startDate = { $lte: t2 }; } return new Promise(function(resolve, reject) { db.logs.find(query).sort({ startDate: -1 }).exec(function(err, docs) { if (!err) { - // Process results : - // - convert timestamp to moment (easier to use) // - tuncate periods to fit search dates params if required - - _convertLogs(docs); - if (truncate && docs.length) { - _normalize(docs[0], m1, m2); - _normalize(docs[docs.length - 1], m1, m2); + if (truncate) { + docs.forEach(function (d) { + _normalize(d, t1, t2); + }); } resolve(docs); @@ -78,7 +75,7 @@ return new Promise(function(resolve, reject) { db.logs.find({}).sort({ startDate: -1 }).skip(index).limit(1).exec(function (err, docs) { if (!err) { - resolve(_convertLogs(docs)); + resolve(docs); } else { reject(err); } @@ -158,26 +155,13 @@ /************ * Utilities ************/ -var _convertLogs = function (docs) { - return docs.forEach(function (d) { - d.startDate = moment(d.startDate); - d.endDate = moment(d.endDate); - }); -}; - -var _normalize = function (period, startDate, endDate) { - var pStartDate = period.startDate && moment(period.startDate), - pEndDate = period.endDate && moment(period.endDate); - - var m1 = startDate && moment(startDate), - m2 = endDate && moment(endDate); - - if (m1 && pStartDate && pStartDate.isBefore(m1)) { - period.startDate = m1; +var _normalize = function (period, tstmpStart, tstmpEnd) { + if (period.startDate < tstmpStart) { + period.startDate = tstmpStart; } - if (m2 && pEndDate && pEndDate.isAfter(m2)) { - period.endDate = m2; + if (period.endDate > tstmpEnd) { + period.endDate = tstmpEnd; } return period;

1 0

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

29 Apr '15

Author: jruchaud Date: 2015-04-29 14:29:57 +0000 (Wed, 29 Apr 2015) New Revision: 1298 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1298 Log: Continue export CSV and TXT Modified: wit/js/components/FilterLogs.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-04-29 14:00:13 UTC (rev 1297) +++ wit/js/components/FilterLogs.js 2015-04-29 14:29:57 UTC (rev 1298) @@ -2,7 +2,7 @@ var FilterLogs = React.createClass({ - getCSV: function(sepRow, sepCol) { + getCSV: function() { var result = ""; var nodes = document.querySelectorAll("tr"); @@ -11,24 +11,72 @@ for (var c = 0, lc = row.length; c < lc; c++) { var col = row[c]; - result += col.textContent + (sepCol || ";"); + result += col.textContent + ";"; } - result += sepRow || "\n"; + result += "\n"; }; return result; }, - onCopy: function() { - var result = this.getCSV(); + getTXT: function() { + var result = ""; + + var dates = Object.keys(this.state.data); + for (var date of dates) { + result += date + "\n--------\n" + result += "\n" + this.getTXTRow(date, [], this.state.data[date]) + "\n"; + } + + return result; + }, + + getTXTRow: function(date, tags, tagObject) { + var r = ""; + + if (tagObject.duration) { + r += tagObject.duration + " - " + tags.join(', ') + "\n"; + } + + var keys = Object.keys(tagObject); + for (var k of keys) { + if (k != "diff" && k != "duration") { + r += this.getTXTRow(date, tags.concat(k), tagObject[k]); + } + } + + return r; + }, + + onClipboardCSV: function() { + var content = this.getCSV(); + this.clipboard(content); + }, + + onClipboardTXT: function() { + var content = this.getTXT(); + this.clipboard(content); + }, + + clipboard: function(content) { var gui = require('nw.gui'); var clipboard = gui.Clipboard.get(); - clipboard.set(result, 'text'); + clipboard.set(content, 'text'); }, - onMail: function() { - var result = this.getCSV("%0A", "%3B"); - var link = "mailto:?body=" + result; + onMailCSV: function(content) { + var content = this.getCSV(); + this.mail(content); + }, + + onMailTXT: function(content) { + var content = this.getTXT(); + this.mail(content); + }, + + mail: function(content) { + content = content.replace(/\n/g, "%0A").replace(/;/g, "%3B").replace(/-/g, "%2D"); + var link = "mailto:?body=" + content; window.location.href = link; }, @@ -98,17 +146,17 @@ <h1>Result</h1> <div ref="actions" className="btn-group" role="group"> - <button type="button" className="btn btn-primary" onClick={this.onCopy}> + <button type="button" className="btn btn-primary" onClick={this.onClipboardCSV}> CSV <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> </button> - <button type="button" className="btn btn-primary" onClick={this.onCopy}> + <button type="button" className="btn btn-primary" onClick={this.onClipboardTXT}> TXT <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> </button> - <button type="button" className="btn btn-primary" onClick={this.onMail}> + <button type="button" className="btn btn-primary" onClick={this.onMailCSV}> CSV <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> </button> - <button type="button" className="btn btn-primary" onClick={this.onMail}> + <button type="button" className="btn btn-primary" onClick={this.onMailTXT}> TXT <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> </button> </div>

1 0

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

29 Apr '15

Author: jruchaud Date: 2015-04-29 14:00:13 +0000 (Wed, 29 Apr 2015) New Revision: 1297 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1297 Log: Create tree to display Modified: wit/js/components/FilterBar.js wit/js/components/FilterLogs.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-04-29 13:47:56 UTC (rev 1296) +++ wit/js/components/FilterBar.js 2015-04-29 14:00:13 UTC (rev 1297) @@ -6,7 +6,7 @@ var moment = require('moment'); var now = moment(); - now.add(1, 'hours'); + now.add(1, 'days'); var endDefaultDate = now.format("YYYY-MM-DDThh:mm"); now.subtract(7, 'days'); Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-04-29 13:47:56 UTC (rev 1296) +++ wit/js/components/FilterLogs.js 2015-04-29 14:00:13 UTC (rev 1297) @@ -32,33 +32,85 @@ window.location.href = link; }, - render: function() { - var moment = require('moment'); + getInitialState: function() { + return {data: {}}; + }, + + componentWillReceiveProps: function(nextProps) { + var state = {}; - var items = this.props.data.map(function(log) { + nextProps.data.forEach(function(log) { + var date = moment(log.startDate).format("MM/DD/YY"); var diff = moment(log.endDate.diff(log.startDate)).utcOffset(0); - return ( - <tr> - <td>{moment(log.startDate).format("MM/DD/YY")}</td> - <td>{diff.format("HH:mm:ss")}</td> - <td>{log.tags.join(",")}</td> - </tr> - ); + var current = state[date] = state[date] || {}; + log.tags.forEach(function(tag) { + current = current[tag] = current[tag] || {}; }); + + if (current.diff) { + current.diff.add(diff); + } else { + current.diff = diff; + } + + current.duration = current.diff.format("HH:mm:ss"); + }); -// if (!this.props.data || !this.props.data.length) { -// return null; -// } + this.setState({data: state}); + }, + + renderTd: function(date, tags, tagObject) { + var r = []; + if (tagObject.duration) { + r.push( + <tr> + <td>{date}</td> + <td>{tagObject.duration}</td> + <td>{tags.join(', ')}</td> + </tr> + ); + } + + var keys = Object.keys(tagObject); + for (var k of keys) { + if (k != "diff" && k != "duration") { + r = r.concat(this.renderTd(date, tags.concat(k), tagObject[k])); + } + } + + return r; + }, + + render: function() { + var items = []; + + var dates = Object.keys(this.state.data); + for (var date of dates) { + var r = this.renderTd(date, [], this.state.data[date]); + items = items.concat(r); + } + return ( <div> <h1>Result</h1> <div ref="actions" className="btn-group" role="group"> - <button onClick={this.onCopy} className="btn btn-primary">Copy</button> - <button onClick={this.onMail} className="btn btn-primary">Mail</button> + <button type="button" className="btn btn-primary" onClick={this.onCopy}> + CSV <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> + </button> + <button type="button" className="btn btn-primary" onClick={this.onCopy}> + TXT <span className="glyphicon glyphicon-copy" aria-hidden="true"></span> + </button> + + <button type="button" className="btn btn-primary" onClick={this.onMail}> + CSV <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> + </button> + <button type="button" className="btn btn-primary" onClick={this.onMail}> + TXT <span className="glyphicon glyphicon-envelope" aria-hidden="true"></span> + </button> </div> <table className="table">

1 0

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

29 Apr '15

Author: smaisonneuve Date: 2015-04-29 13:47:56 +0000 (Wed, 29 Apr 2015) New Revision: 1296 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1296 Log: [Wit] - Database : fix search on logs Modified: wit/js/components/FilterBar.js wit/js/components/FilterLogs.js wit/js/services/database.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-04-29 12:41:19 UTC (rev 1295) +++ wit/js/components/FilterBar.js 2015-04-29 13:47:56 UTC (rev 1296) @@ -20,10 +20,10 @@ var moment = require('moment'); var db = require("./js/services/database.js"); - var beginDate = moment(React.findDOMNode(this.refs.beginDate).value).toDate(); - var endDate = moment(React.findDOMNode(this.refs.endDate).value).toDate(); + var beginDate = moment(React.findDOMNode(this.refs.beginDate).value); + var endDate = moment(React.findDOMNode(this.refs.endDate).value); - return db.searchLogs(null, beginDate); + return db.searchLogs(null, beginDate, endDate, true); }, onSearch: function() { Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-04-29 12:41:19 UTC (rev 1295) +++ wit/js/components/FilterLogs.js 2015-04-29 13:47:56 UTC (rev 1296) @@ -37,7 +37,7 @@ var items = this.props.data.map(function(log) { - var diff = moment(moment(log.endDate).diff(log.startDate)).utcOffset(0); + var diff = moment(log.endDate.diff(log.startDate)).utcOffset(0); return ( <tr> Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-29 12:41:19 UTC (rev 1295) +++ wit/js/services/database.js 2015-04-29 13:47:56 UTC (rev 1296) @@ -1,3 +1,4 @@ +var moment = require('moment'); var pjson = require('../../package.json'); var dbFileNamePrefix = pjson.dbFileNamePrefix; @@ -14,11 +15,14 @@ *********************/ exports.insertLog = function(tags, startDate, endDate) { + var m1 = startDate && moment(startDate), + m2 = endDate && moment(endDate); + return new Promise(function(resolve, reject) { db.logs.insert({ tags: tags, - startDate: startDate.getTime(), - endDate: endDate.getTime() + startDate: m1.valueOf(), + endDate: m2.valueOf() }, function(err, newDocs) { if (!err) { resolve(newDocs); @@ -28,17 +32,39 @@ }); }); }; - -exports.searchLogs = function(tags, startDate, endDate) { + +/** + * Search for logs in the database + * @param {type} tags + * @param {type} startDate + * @param {type} endDate + * @param {type} truncate + * @returns {Promise} + */ +exports.searchLogs = function(tags, startDate, endDate, truncate) { var query = {}; + var m1 = startDate && moment(startDate), + m2 = endDate && moment(endDate); if (tags) { query.tags = { $in: tags }; } - if (startDate) { query.startDate = { $gte: startDate.getTime() } } - if (endDate) { query.endDate = { $lte: endDate.getTime() } } + if (m1) { query.endDate = { $gte : m1.valueOf() }; } + if (m2) { query.startDate = { $lte: m2.valueOf() }; } return new Promise(function(resolve, reject) { db.logs.find(query).sort({ startDate: -1 }).exec(function(err, docs) { if (!err) { + + // Process results : + // - convert timestamp to moment (easier to use) + // - tuncate periods to fit search dates params if required + + _convertLogs(docs); + + if (truncate && docs.length) { + _normalize(docs[0], m1, m2); + _normalize(docs[docs.length - 1], m1, m2); + } + resolve(docs); } else { reject(err); @@ -52,7 +78,7 @@ return new Promise(function(resolve, reject) { db.logs.find({}).sort({ startDate: -1 }).skip(index).limit(1).exec(function (err, docs) { if (!err) { - resolve(docs); + resolve(_convertLogs(docs)); } else { reject(err); } @@ -128,3 +154,31 @@ }); }; + +/************ + * Utilities + ************/ +var _convertLogs = function (docs) { + return docs.forEach(function (d) { + d.startDate = moment(d.startDate); + d.endDate = moment(d.endDate); + }); +}; + +var _normalize = function (period, startDate, endDate) { + var pStartDate = period.startDate && moment(period.startDate), + pEndDate = period.endDate && moment(period.endDate); + + var m1 = startDate && moment(startDate), + m2 = endDate && moment(endDate); + + if (m1 && pStartDate && pStartDate.isBefore(m1)) { + period.startDate = m1; + } + + if (m2 && pEndDate && pEndDate.isAfter(m2)) { + period.endDate = m2; + } + + return period; +};

1 0

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

29 Apr '15

Author: jruchaud Date: 2015-04-29 12:41:19 +0000 (Wed, 29 Apr 2015) New Revision: 1295 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1295 Log: Prepare export Modified: wit/js/components/FilterBar.js wit/js/components/FilterLogs.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-04-29 12:16:59 UTC (rev 1294) +++ wit/js/components/FilterBar.js 2015-04-29 12:41:19 UTC (rev 1295) @@ -16,15 +16,20 @@ React.findDOMNode(this.refs.endDate).value = endDefaultDate; }, - onSearch: function() { - var self = this; + search: function() { var moment = require('moment'); var db = require("./js/services/database.js"); var beginDate = moment(React.findDOMNode(this.refs.beginDate).value).toDate(); var endDate = moment(React.findDOMNode(this.refs.endDate).value).toDate(); - db.searchLogs(null, beginDate) + return db.searchLogs(null, beginDate); + }, + + onSearch: function() { + var self = this; + + this.search() .then(function(result) { self.props.onSearchResult(result); // console.log(result); Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-04-29 12:16:59 UTC (rev 1294) +++ wit/js/components/FilterLogs.js 2015-04-29 12:41:19 UTC (rev 1295) @@ -2,6 +2,36 @@ var FilterLogs = React.createClass({ + getCSV: function(sepRow, sepCol) { + var result = ""; + + var nodes = document.querySelectorAll("tr"); + for (var r = 0, lr = nodes.length; r < lr; r++) { + var row = nodes[r].children; + + for (var c = 0, lc = row.length; c < lc; c++) { + var col = row[c]; + result += col.textContent + (sepCol || ";"); + } + result += sepRow || "\n"; + }; + + return result; + }, + + onCopy: function() { + var result = this.getCSV(); + var gui = require('nw.gui'); + var clipboard = gui.Clipboard.get(); + clipboard.set(result, 'text'); + }, + + onMail: function() { + var result = this.getCSV("%0A", "%3B"); + var link = "mailto:?body=" + result; + window.location.href = link; + }, + render: function() { var moment = require('moment'); @@ -18,19 +48,32 @@ ); }); +// if (!this.props.data || !this.props.data.length) { +// return null; +// } + return ( - <table className="table"> - <thead> - <tr> - <th>Date</th> - <th>Duration</th> - <th>Tags</th> - </tr> - </thead> - <tbody> - {items} - </tbody> - </table> + <div> + <h1>Result</h1> + + <div ref="actions" className="btn-group" role="group"> + <button onClick={this.onCopy} className="btn btn-primary">Copy</button> + <button onClick={this.onMail} className="btn btn-primary">Mail</button> + </div> + + <table className="table"> + <thead> + <tr> + <th>Date</th> + <th>Duration</th> + <th>Tags</th> + </tr> + </thead> + <tbody> + {items} + </tbody> + </table> + </div> ); } });

1 0

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