Author: smaisonneuve Date: 2015-05-22 15:05:59 +0000 (Fri, 22 May 2015) New Revision: 1447 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1447 Log: [Timeline] Fixing main timeline in report Modified: wit/js/components/FilterBar.js wit/js/components/FilterLogs.js wit/js/pages/Rapport.js wit/js/services/database.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/components/FilterBar.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -20,22 +20,15 @@ var moment = require("moment"); var db = require("./js/services/database.js"); - this.startDate = moment(this.refs.beginDate.getDOMNode().value); - this.endDate = moment(this.refs.endDate.getDOMNode().value); + var startDate = moment(this.refs.beginDate.getDOMNode().value), + endDate = moment(this.refs.endDate.getDOMNode().value); - return db.searchLogs(null, this.startDate, this.endDate, true); + return db.searchLogs(null, startDate, endDate, true); }, onSearch: function() { - var startDate = this.startDate; - var endDate = this.endDate; - var onSearchResult = this.props.onSearchResult; - this.search() - .then(function(result) { - onSearchResult(result, startDate, endDate); -// console.log(result); - }); + this.search().then(onSearchResult); }, render: function() { Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/components/FilterLogs.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -161,8 +161,8 @@ this.setState({ data: data, tags: currentState.tags || tags, - startDate: currentState.data.startDate, - endDate: currentState.data.endDate + startDate: currentState.data.result.startDate, + endDate: currentState.data.result.endDate }); }, Modified: wit/js/pages/Rapport.js =================================================================== --- wit/js/pages/Rapport.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/pages/Rapport.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -11,10 +11,8 @@ }; }, - handleSearchResult: function(result, startDate, endDate) { + handleSearchResult: function(result) { this.setState({ - startDate: startDate, - endDate: endDate, result: result }); }, Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/services/database.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -74,6 +74,9 @@ }); } + docs.startDate = startDate; + docs.endDate = endDate; + resolve(docs); } else { reject(err);