From ea5ed2ef4875df3a5cbedaeca944c22a6c7e0357 Mon Sep 17 00:00:00 2001 From: stoffu Date: Wed, 22 Aug 2018 23:04:57 +0900 Subject: [PATCH] update html for aeon and monero --- aeon-bc-size.html | 4 +++- aeon-block-reward.html | 6 ++++++ aeon-block-size.html | 3 +++ aeon-coin-supply.html | 4 +++- aeon-tx-per-day.html | 14 ++++++++------ aeon.html | 6 ++++++ monero-bc-size.html | 4 +++- monero-block-reward.html | 6 ++++++ monero-block-size.html | 3 +++ monero-coin-supply.html | 4 +++- monero-tx-per-day.html | 14 ++++++++------ 11 files changed, 52 insertions(+), 16 deletions(-) diff --git a/aeon-bc-size.html b/aeon-bc-size.html index f1e988f..9ce72cd 100644 --- a/aeon-bc-size.html +++ b/aeon-bc-size.html @@ -51,7 +51,9 @@ function formatBytes(bytes, decimal) { } for (var i = 0; i < chartData.length; ++i) { - chartData[i].bc_size = chartData[i].block_size; + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + chartData[i].bc_size = chartData[i][3]; if (i > 0) chartData[i].bc_size += chartData[i - 1].bc_size; chartData[i].bc_size_str = formatBytes(chartData[i].bc_size, 3); diff --git a/aeon-block-reward.html b/aeon-block-reward.html index afee11b..6eecb04 100644 --- a/aeon-block-reward.html +++ b/aeon-block-reward.html @@ -39,6 +39,12 @@ chartData = chartData.concat(chartData_7); chartData = chartData.concat(chartData_8); chartData = chartData.concat(chartData_9); +for (var i = 0; i < chartData.length; ++i) { + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + chartData[i].reward = chartData[i][2] / Math.pow(10, 11); +} + var chart = AmCharts.makeChart("chartdiv", { "type": "serial", "theme": "light", diff --git a/aeon-block-size.html b/aeon-block-size.html index aaceda7..fb2024e 100644 --- a/aeon-block-size.html +++ b/aeon-block-size.html @@ -51,6 +51,9 @@ function formatBytes(bytes, decimal) { } for (var i = 0; i < chartData.length; ++i) { + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + chartData[i].block_size = chartData[i][3]; chartData[i].block_size_str = formatBytes(chartData[i].block_size, 3); } diff --git a/aeon-coin-supply.html b/aeon-coin-supply.html index 5fca52e..c4d4bda 100644 --- a/aeon-coin-supply.html +++ b/aeon-coin-supply.html @@ -41,7 +41,9 @@ chartData = chartData.concat(chartData_9); var coin_supply = 0; for (var i = 0; i < chartData.length; ++i) { - coin_supply += chartData[i].reward; + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + coin_supply += chartData[i][2]; chartData[i].coin_supply = coin_supply; } diff --git a/aeon-tx-per-day.html b/aeon-tx-per-day.html index 47f2ee6..9d5d176 100644 --- a/aeon-tx-per-day.html +++ b/aeon-tx-per-day.html @@ -40,15 +40,17 @@ chartData = chartData.concat(chartData_8); chartData = chartData.concat(chartData_9); var chartData_tpd = []; -var last_date = ""; +var last_date = null; var num_txes = 0; for (var i = 0; i < chartData.length; ++i) { - var block = chartData[i]; - var block_date = block.date.substr(0, 10); - if (last_date === "") { + var block_date = new Date(1000 * chartData[i][0]); + block_date.setHours(0); + block_date.setMinutes(0); + block_date.setSeconds(0); + if (last_date === null) { last_date = block_date; } - if (Date.parse(last_date) < Date.parse(block_date) || i == chartData.length - 1) { + if (last_date < block_date || i == chartData.length - 1) { chartData_tpd.push({ "date": last_date, "num_txes": num_txes, @@ -56,7 +58,7 @@ for (var i = 0; i < chartData.length; ++i) { last_date = block_date; num_txes = 0; } else { - num_txes += block.num_txes; + num_txes += chartData[i][4].length; } } diff --git a/aeon.html b/aeon.html index db2a142..ff13ce0 100644 --- a/aeon.html +++ b/aeon.html @@ -39,6 +39,12 @@ chartData = chartData.concat(chartData_7); chartData = chartData.concat(chartData_8); chartData = chartData.concat(chartData_9); +for (var i = 0; i < chartData.length; ++i) { + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + chartData[i].difficulty = chartData[i][1]; +} + var chart = AmCharts.makeChart("chartdiv", { "type": "serial", "theme": "light", diff --git a/monero-bc-size.html b/monero-bc-size.html index 052f0a4..5c966a4 100644 --- a/monero-bc-size.html +++ b/monero-bc-size.html @@ -65,7 +65,9 @@ function formatBytes(bytes, decimal) { } for (var i = 0; i < chartData.length; ++i) { - chartData[i].bc_size = chartData[i].block_size; + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + chartData[i].bc_size = chartData[i][3]; if (i > 0) chartData[i].bc_size += chartData[i - 1].bc_size; chartData[i].bc_size_str = formatBytes(chartData[i].bc_size, 3); diff --git a/monero-block-reward.html b/monero-block-reward.html index f28b036..7b0d876 100644 --- a/monero-block-reward.html +++ b/monero-block-reward.html @@ -53,6 +53,12 @@ chartData = chartData.concat(chartData_14); chartData = chartData.concat(chartData_15); chartData = chartData.concat(chartData_16); +for (var i = 0; i < chartData.length; ++i) { + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + chartData[i].reward = chartData[i][2] / Math.pow(10, 11); +} + var chart = AmCharts.makeChart("chartdiv", { "type": "serial", "theme": "light", diff --git a/monero-block-size.html b/monero-block-size.html index 988fb79..bd97ff4 100644 --- a/monero-block-size.html +++ b/monero-block-size.html @@ -65,6 +65,9 @@ function formatBytes(bytes, decimal) { } for (var i = 0; i < chartData.length; ++i) { + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + chartData[i].block_size = chartData[i][3]; chartData[i].block_size_str = formatBytes(chartData[i].block_size, 3); } diff --git a/monero-coin-supply.html b/monero-coin-supply.html index 321fe7a..953fb58 100644 --- a/monero-coin-supply.html +++ b/monero-coin-supply.html @@ -55,7 +55,9 @@ chartData = chartData.concat(chartData_16); var coin_supply = 0; for (var i = 0; i < chartData.length; ++i) { - coin_supply += chartData[i].reward; + chartData[i].date = new Date(1000 * chartData[i][0]); + chartData[i].height = i + 1; + coin_supply += chartData[i][2]; chartData[i].coin_supply = coin_supply; } diff --git a/monero-tx-per-day.html b/monero-tx-per-day.html index 36066b9..4c7f7db 100644 --- a/monero-tx-per-day.html +++ b/monero-tx-per-day.html @@ -54,15 +54,17 @@ chartData = chartData.concat(chartData_15); chartData = chartData.concat(chartData_16); var chartData_tpd = []; -var last_date = ""; +var last_date = null; var num_txes = 0; for (var i = 0; i < chartData.length; ++i) { - var block = chartData[i]; - var block_date = block.date.substr(0, 10); - if (last_date === "") { + var block_date = new Date(1000 * chartData[i][0]); + block_date.setHours(0); + block_date.setMinutes(0); + block_date.setSeconds(0); + if (last_date === null) { last_date = block_date; } - if (Date.parse(last_date) < Date.parse(block_date) || i == chartData.length - 1) { + if (last_date < block_date || i == chartData.length - 1) { chartData_tpd.push({ "date": last_date, "num_txes": num_txes, @@ -70,7 +72,7 @@ for (var i = 0; i < chartData.length; ++i) { last_date = block_date; num_txes = 0; } else { - num_txes += block.num_txes; + num_txes += chartData[i][4].length; } }