Author: jruchaud Date: 2015-04-16 10:38:28 +0000 (Thu, 16 Apr 2015) New Revision: 1217 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1217 Log: Display first rapport Modified: wit/js/database.js wit/rapport.html Modified: wit/js/database.js =================================================================== --- wit/js/database.js 2015-04-16 09:21:59 UTC (rev 1216) +++ wit/js/database.js 2015-04-16 10:38:28 UTC (rev 1217) @@ -5,8 +5,8 @@ return new Promise(function(resolve, reject) { db.insert({ tags: tags, - startDate: startDate, - endDate: endDate + startDate: startDate.getTime(), + endDate: endDate.getTime() }, function(err, newDocs) { if (!err) { resolve(newDocs); @@ -21,8 +21,8 @@ var query = {}; if (tags) { query.tags = { $in: tags }; } - if (startDate) { query.startDate = { $gte: startDate } } - if (endDate) { query.endDate = { $lte: endDate } } + if (startDate) { query.startDate = { $gte: startDate.getTime() } } + if (endDate) { query.endDate = { $lte: endDate.getTime() } } return new Promise(function(resolve, reject) { db.find(query, function(err, docs) { Modified: wit/rapport.html =================================================================== --- wit/rapport.html 2015-04-16 09:21:59 UTC (rev 1216) +++ wit/rapport.html 2015-04-16 10:38:28 UTC (rev 1217) @@ -6,7 +6,46 @@ </head> <body> <h1>Rapport</h1> - <input type="datetime-local"></input> - <input type="datetime-local"></input> + <input id="begin" type="datetime-local" required></input> + <input id="end" type="datetime-local" required></input> + <div id="search">Search</div> + <table><tbody id="result"></tbody></table> + + + <script type="application/javascript"> + var moment = require('moment'); + var db = require("./js/database.js"); + + var beginNode = document.getElementById("begin"); + var endNode = document.getElementById("end"); + var searchNode = document.getElementById("search"); + var resultNode = document.getElementById("result"); + + var now = moment(); + now.add(1, 'hours'); + endNode.value = now.format("YYYY-MM-DDThh:mm"); + + now.subtract(7, 'days'); + beginNode.value = now.format("YYYY-MM-DDThh:mm"); + + searchNode.onclick = function() { + var beginDate = moment(beginNode.value).toDate(); + var endDate = moment(beginNode.value).toDate(); + + resultNode.innerHTML = ""; + + db.searchLogs(null, beginDate) + .then(function(result) { + for (var i = 0, l = result.length; i < l; i ++) { + var log = result[i]; + resultNode.insertAdjacentHTML("beforeend", "<tr>" + + "<td>" + moment(log.startDate).format("MM/DD/YY, h:mm:ss") + "</td>" + + "<td>" + moment(log.endDate).format("MM/DD/YY, h:mm:ss") + "</td>" + + "<td>" + log.tags + "</td>" + + "</tr>"); + } + }); + } + </script> </body> </html>