From 4ac3d030abf555c437c6806ca07cf873e85f3692 Mon Sep 17 00:00:00 2001 From: librelois <elois@ifee.fr> Date: Thu, 29 Jun 2017 22:31:33 +0200 Subject: [PATCH] [fix] fix #44 --- lg/membersCount_en.txt | 1 + lg/membersCount_fr.txt | 1 + lib/updateCache.js | 4 ++-- routes/membersCount.js | 12 ++++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lg/membersCount_en.txt b/lg/membersCount_en.txt index 6a5ecce..a9e753c 100755 --- a/lg/membersCount_en.txt +++ b/lg/membersCount_en.txt @@ -1,3 +1,4 @@ +LAST_BLOCK last block BEGIN Begin END End STEP step diff --git a/lg/membersCount_fr.txt b/lg/membersCount_fr.txt index b890406..997555b 100755 --- a/lg/membersCount_fr.txt +++ b/lg/membersCount_fr.txt @@ -1,3 +1,4 @@ +LAST_BLOCK dernier bloc BEGIN Début END Fin STEP précision diff --git a/lib/updateCache.js b/lib/updateCache.js index 25cdf90..f053501 100755 --- a/lib/updateCache.js +++ b/lib/updateCache.js @@ -108,7 +108,7 @@ module.exports = (req, res, next) => co(function *() { { case "blocks": unitTime = 3600; cache.onlyDate = false; cache.stepUnit = "blocks"; break; case "hours": unitTime = 3600; cache.onlyDate = false; cache.stepUnit = "hours"; break; - case "days": unitTime = 86400; cache.onlyDate = false; cache.stepUnit = "days"; break; + case "days": unitTime = 86400; cache.onlyDate = true; cache.stepUnit = "days"; break; case "weeks": unitTime = 604800; cache.onlyDate = true; cache.stepUnit = "weeks"; break; case "months": unitTime = 18144000; cache.onlyDate = true; cache.stepUnit = "months"; break; case "years": unitTime = 31557600; cache.onlyDate = true; cache.stepUnit = "years"; break; @@ -117,7 +117,7 @@ module.exports = (req, res, next) => co(function *() { // Default values else { - unitTime = 86400; cache.onlyDate = false; cache.stepUnit = "days"; + unitTime = 86400; cache.onlyDate = true; cache.stepUnit = "days"; } // get endBlock diff --git a/routes/membersCount.js b/routes/membersCount.js index cfacf97..0bafbcf 100755 --- a/routes/membersCount.js +++ b/routes/membersCount.js @@ -14,6 +14,9 @@ module.exports = (req, res, next) => co(function *() { // get GET parameters var format = req.query.format || 'HTML'; + // get lg file + const LANG = getLang(`${__dirname}/../lg/membersCount_${req.query.lg||'fr'}.txt`); + // get medianTime of beginBlock var beginBlock = yield duniterServer.dal.peerDAL.query('SELECT `medianTime`,`hash` FROM block WHERE `fork`=0 AND `number` = '+cache.beginBlock[0].number+' LIMIT 1'); @@ -32,7 +35,7 @@ module.exports = (req, res, next) => co(function *() { } // Initialize nextStepTime, stepIssuerCount and bStep - var nextStepTime = blockchain[0].medianTime; + var nextStepTime = blockchain[0].medianTime - (blockchain[0].medianTime % 86400); let stepIssuerCount = 0; let bStep = 0; @@ -53,7 +56,7 @@ module.exports = (req, res, next) => co(function *() { tabMembersCount.push({ blockNumber: blockchain[b].number, timestamp: blockchain[b].medianTime, - dateTime: timestampToDatetime(blockchain[b].medianTime), + dateTime: timestampToDatetime(blockchain[b].medianTime, cache.onlyDate), membersCount: blockchain[b].membersCount, sentriesCount: cache.blockchain[cacheIndex].sentries, issuersCount: parseInt(stepIssuerCount/bStep) @@ -69,7 +72,7 @@ module.exports = (req, res, next) => co(function *() { tabMembersCount.push({ blockNumber: blockchain[blockchain.length-1].number, timestamp: blockchain[blockchain.length-1].medianTime, - dateTime: timestampToDatetime(blockchain[blockchain.length-1].medianTime), + dateTime: LANG['LAST_BLOCK'], membersCount: blockchain[blockchain.length-1].membersCount, sentriesCount: cache.blockchain[cache.blockchain.length-1].sentries, issuersCount: blockchain[blockchain.length-1].issuersCount @@ -79,9 +82,6 @@ module.exports = (req, res, next) => co(function *() { res.status(200).jsonp( tabMembersCount ) else { - // get lg file - const LANG = getLang(`${__dirname}/../lg/membersCount_${req.query.lg||'fr'}.txt`); - // GET parameters var unit = req.query.unit == 'relative' ? 'relative' : 'quantitative'; var massByMembers = req.query.massByMembers == 'no' ? 'no' : 'yes'; -- GitLab