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

r1304 - in wit: css js/components
by jruchaud＠users.nuiton.org 29 Apr '15

29 Apr '15

Author: jruchaud Date: 2015-04-29 20:13:27 +0000 (Wed, 29 Apr 2015) New Revision: 1304 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1304 Log: Create filter on tags Modified: wit/css/style.less wit/js/components/FilterLogs.js Modified: wit/css/style.less =================================================================== --- wit/css/style.less 2015-04-29 16:48:57 UTC (rev 1303) +++ wit/css/style.less 2015-04-29 20:13:27 UTC (rev 1304) @@ -33,3 +33,7 @@ font-family: Digital; } } + +.checkbox-label { + margin-right: 10px; +} Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-04-29 16:48:57 UTC (rev 1303) +++ wit/js/components/FilterLogs.js 2015-04-29 20:13:27 UTC (rev 1304) @@ -35,7 +35,14 @@ var r = ""; if (tagObject.duration) { - r += tagObject.duration + " - " + tags.join(', ') + "\n"; + var self = this; + var filterTags = tags.filter(function(tag) { + return self.state.tags[tag]; + }); + + if (filterTags.length) { + r += tagObject.duration + " - " + filterTags.join(', ') + "\n"; + } } var keys = Object.keys(tagObject); @@ -81,20 +88,38 @@ }, getInitialState: function() { - return {data: null}; + return {data: null, tags: {}}; }, componentWillReceiveProps: function(nextProps) { - var state = {}; + this.createTree(nextProps); + }, + + filterTag: function(e) { + this.state.tags[e.target.name] = e.target.checked; + this.createTree({ + data: this.props.data, + tags: this.state.tags + }); + }, + + createTree: function(currentState) { + var data = {}, + tags = {}; - nextProps.data.forEach(function(log) { + currentState.data.forEach(function(log) { var date = moment(log.startDate).format("MM/DD/YY"); var diff = moment(moment(log.endDate).diff(log.startDate)).utcOffset(0); - var current = state[date] = state[date] || {}; + var current = data[date] = data[date] || {}; log.tags.forEach(function(tag) { - current = current[tag] = current[tag] || {}; + + if (!currentState.tags || currentState.tags[tag]) { + current = current[tag] = current[tag] || {}; + } + + tags[tag] = true; }); if (current.diff) { @@ -106,20 +131,27 @@ current.duration = current.diff.format("HH:mm:ss"); }); - this.setState({data: state}); + this.setState({data: data, tags: currentState.tags || tags}); }, 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 self = this; + var filterTags = tags.filter(function(tag) { + return self.state.tags[tag]; + }); + + if (filterTags.length) { + r.push( + <tr> + <td>{date}</td> + <td>{tagObject.duration}</td> + <td>{filterTags.join(', ')}</td> + </tr> + ); + } } var keys = Object.keys(tagObject); @@ -146,7 +178,19 @@ items = items.concat(r); } } - + + var tags = []; + for (var tag of Object.keys(this.state.tags)) { + tags.push( + <div className="pull-left"> + <label className="checkbox-label"> + <input type="checkbox" name={tag} checked={this.state.tags[tag] ? "checked" : ""} /> + {tag} + </label> + </div> + ); + } + return ( <div className={classString}> <h1>{items.length ? "Result" : "No result"}</h1> @@ -154,6 +198,10 @@ <div className={items.length ? "" : "hidden"}> <div ref="actions" className="btn-group" role="group"> <button type="button" className="btn btn-primary" onClick={this.onClipboardCSV}> + Filter <span className="glyphicon glyphicon-tag" aria-hidden="true"></span> + </button> + + <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}> @@ -168,6 +216,10 @@ </button> </div> + <div onChange={this.filterTag}> + {tags} + </div> + <table className="table"> <thead> <tr>

1 0

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