Add pie chart
This commit is contained in:
parent
28f3c476c2
commit
a0548f53eb
|
@ -10,7 +10,8 @@
|
||||||
border: solid 1px #c7c7c7;
|
border: solid 1px #c7c7c7;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
margin-bottom: 18px;
|
/*margin-bottom: 18px;*/
|
||||||
|
margin: auto;
|
||||||
}
|
}
|
||||||
.chartLabel{
|
.chartLabel{
|
||||||
font-size: 1.2em;
|
font-size: 1.2em;
|
||||||
|
@ -18,7 +19,7 @@
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
}
|
}
|
||||||
.chartHolder{
|
.chartHolder{
|
||||||
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
#boxesLower {
|
#boxesLower {
|
||||||
|
@ -70,6 +71,7 @@
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div id="topCharts">
|
<div id="topCharts">
|
||||||
<div class="chartWrapper">
|
<div class="chartWrapper">
|
||||||
<div class="chartLabel">Pool Historical Hashrate</div>
|
<div class="chartLabel">Pool Historical Hashrate</div>
|
||||||
|
@ -109,9 +111,8 @@
|
||||||
</div>
|
</div>
|
||||||
{{ } }}
|
{{ } }}
|
||||||
</div>
|
</div>
|
||||||
|
{{ var blockscomb = new Array; }}
|
||||||
{{ for(var pool in it.stats.pools) { }}
|
{{ for(var pool in it.stats.pools) { }}
|
||||||
{{ var paidJackpots = parseFloat(it.stats.pools[pool].poolStats.validBlocks) * 1.0; }}
|
|
||||||
<div class="pure-g-r" id="boxesLower">
|
<div class="pure-g-r" id="boxesLower">
|
||||||
<div class="pure-u-1-1">
|
<div class="pure-u-1-1">
|
||||||
<div class="boxStats" id="boxStatsRight">
|
<div class="boxStats" id="boxStatsRight">
|
||||||
|
@ -122,6 +123,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="boxStatsList" style="margin-top: 9px;">
|
<div class="boxStatsList" style="margin-top: 9px;">
|
||||||
<!--<div id="{{=it.stats.pools[pool].name}}NewBlocks"></div>-->
|
<!--<div id="{{=it.stats.pools[pool].name}}NewBlocks"></div>-->
|
||||||
|
|
||||||
{{ for(var b in it.stats.pools[pool].pending.blocks) { }}
|
{{ for(var b in it.stats.pools[pool].pending.blocks) { }}
|
||||||
{{ var block = it.stats.pools[pool].pending.blocks[b].split(":"); }}
|
{{ var block = it.stats.pools[pool].pending.blocks[b].split(":"); }}
|
||||||
<div style="margin-bottom: 9px; background-color: #eeeeee; min-width:600px;"><i class="fa fa-bars"></i>
|
<div style="margin-bottom: 9px; background-color: #eeeeee; min-width:600px;"><i class="fa fa-bars"></i>
|
||||||
|
@ -143,6 +145,7 @@
|
||||||
{{ } }}
|
{{ } }}
|
||||||
<div><i class="fa fa-gavel"></i><small>Mined By:</small> <a href="/workers/{{=block[3].split('.')[0]}}">{{=block[3]}}</a></div>
|
<div><i class="fa fa-gavel"></i><small>Mined By:</small> <a href="/workers/{{=block[3].split('.')[0]}}">{{=block[3]}}</a></div>
|
||||||
</div>
|
</div>
|
||||||
|
{{ blockscomb.push(block);}}
|
||||||
{{ } }}
|
{{ } }}
|
||||||
{{ var i=0; for(var b in it.stats.pools[pool].confirmed.blocks) { }}
|
{{ var i=0; for(var b in it.stats.pools[pool].confirmed.blocks) { }}
|
||||||
{{ if (i < 8) { i++; }}
|
{{ if (i < 8) { i++; }}
|
||||||
|
@ -162,17 +165,105 @@
|
||||||
<span style="float:right; padding-left: 18px; color: green;"><small>*PAID*</small></span>
|
<span style="float:right; padding-left: 18px; color: green;"><small>*PAID*</small></span>
|
||||||
<div><i class="fa fa-gavel"></i><small>Mined By:</small> <a href="/workers/{{=block[3].split('.')[0]}}">{{=block[3]}}</a></div>
|
<div><i class="fa fa-gavel"></i><small>Mined By:</small> <a href="/workers/{{=block[3].split('.')[0]}}">{{=block[3]}}</a></div>
|
||||||
</div>
|
</div>
|
||||||
|
{{blockscomb.push(block);}}
|
||||||
{{ } }}
|
{{ } }}
|
||||||
{{ } }}
|
{{ } }}
|
||||||
|
<!--{{=JSON.stringify(blockscomb)}}-->
|
||||||
|
<script>var blockscomb = ({{=JSON.stringify(blockscomb)}}) </script>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<center><div id="bottomCharts" style="text-align:center;" align="center">
|
||||||
|
<div class="chartWrapper" style="text-align:center;">
|
||||||
|
<div class="chartLabel">Founders of recent blocks</div>
|
||||||
|
<div class="chartHolder"><svg id="blocksPie" style="display: block; margin: auto; text-align:center;"/></div>
|
||||||
|
</div>
|
||||||
|
</div></center>
|
||||||
{{ } }}
|
{{ } }}
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.querySelector('main').appendChild(document.createElement('script')).src = '/static/stats.js';
|
document.querySelector('main').appendChild(document.createElement('script')).src = '/static/stats.js';
|
||||||
|
|
||||||
|
var groupedByFinder = {};
|
||||||
|
var data = [];
|
||||||
|
|
||||||
|
for (var i=0; i < blockscomb.length; i++) { finder=blockscomb[i][3]; // if other doesn 't already have a property for the current letter
|
||||||
|
// create it and assign it to a new empty array
|
||||||
|
if (!(finder in groupedByFinder))
|
||||||
|
groupedByFinder[finder] = [];
|
||||||
|
|
||||||
|
groupedByFinder[finder].push(blockscomb[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
Object.keys(groupedByFinder).forEach(function(i) {
|
||||||
|
var obj = {};
|
||||||
|
obj.label = i
|
||||||
|
obj.value = groupedByFinder[i].length
|
||||||
|
data.push(obj)
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(JSON.stringify(data))
|
||||||
|
|
||||||
|
var w = 400;
|
||||||
|
var h = 400;
|
||||||
|
var r = h/2;
|
||||||
|
var legendRectSize = 18;
|
||||||
|
var legendSpacing = 5;
|
||||||
|
|
||||||
|
var color = d3.scale.category20c();
|
||||||
|
console.log(d3.scale)
|
||||||
|
var vis = d3.select('#blocksPie')
|
||||||
|
.data([data])
|
||||||
|
.attr("width", 1000)
|
||||||
|
.attr("height", h)
|
||||||
|
.attr("style", "display: block; margin: auto;")
|
||||||
|
.attr("preserveAspectRatio", "xMidYMin")
|
||||||
|
.append("svg:g")
|
||||||
|
.attr("transform", "translate(" + r + "," + r + ")");
|
||||||
|
|
||||||
|
var pie = d3.layout.pie().value(function(d){return d.value;});
|
||||||
|
|
||||||
|
// declare an arc generator function
|
||||||
|
var arc = d3.svg.arc().outerRadius(r);
|
||||||
|
|
||||||
|
// select paths, use arc generator to draw
|
||||||
|
var arcs = vis.selectAll("g.slice").data(pie).enter().append("svg:g").attr("class", "slice");
|
||||||
|
arcs.append("svg:path")
|
||||||
|
.attr("fill", function(d, i){
|
||||||
|
return color(i);
|
||||||
|
})
|
||||||
|
.attr("d", function (d) {
|
||||||
|
return arc(d);
|
||||||
|
});
|
||||||
|
|
||||||
|
var legend = vis.selectAll('.legend')
|
||||||
|
.data(color.domain())
|
||||||
|
.enter()
|
||||||
|
.append('g')
|
||||||
|
.attr('class', 'legend')
|
||||||
|
.attr('transform', function(d, i) {
|
||||||
|
var height = legendRectSize + legendSpacing;
|
||||||
|
var offset = height * color.domain().length / 2;
|
||||||
|
var horz = 12 * legendRectSize;
|
||||||
|
var vert = i * height;
|
||||||
|
return 'translate(' + horz + ',' + vert + ')';
|
||||||
|
});
|
||||||
|
|
||||||
|
legend.append('rect')
|
||||||
|
.attr('width', legendRectSize)
|
||||||
|
.attr('height', legendRectSize)
|
||||||
|
.style('fill', color)
|
||||||
|
.style('stroke', color);
|
||||||
|
|
||||||
|
legend.append('text')
|
||||||
|
.attr('x', legendRectSize + legendSpacing)
|
||||||
|
.attr('y', legendRectSize - legendSpacing)
|
||||||
|
.text(function(d, i) {
|
||||||
|
return data[i].label;
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
@ -187,7 +278,7 @@
|
||||||
$('#statsHashrateAvg' + pool).text(getReadableHashRateString(calculateAverageHashrate(pool)));
|
$('#statsHashrateAvg' + pool).text(getReadableHashRateString(calculateAverageHashrate(pool)));
|
||||||
$('#statsLuckDays' + pool).text(stats.pools[pool].luckDays);
|
$('#statsLuckDays' + pool).text(stats.pools[pool].luckDays);
|
||||||
$('#statsValidBlocks' + pool).text(stats.pools[pool].poolStats.validBlocks);
|
$('#statsValidBlocks' + pool).text(stats.pools[pool].poolStats.validBlocks);
|
||||||
$('#statsTotalPaid' + pool).text((parseFloat(stats.pools[pool].poolStats.totalPaid)+paidJackpots).toFixed(8));
|
$('#statsTotalPaid' + pool).text((parseFloat(stats.pools[pool].poolStats.totalPaid)).toFixed(8));
|
||||||
$('#statsNetworkBlocks' + pool).text(stats.pools[pool].poolStats.networkBlocks);
|
$('#statsNetworkBlocks' + pool).text(stats.pools[pool].poolStats.networkBlocks);
|
||||||
$('#statsNetworkDiff' + pool).text(stats.pools[pool].poolStats.networkDiff);
|
$('#statsNetworkDiff' + pool).text(stats.pools[pool].poolStats.networkDiff);
|
||||||
$('#statsNetworkSols' + pool).text(getReadableNetworkHashRateString(stats.pools[pool].poolStats.networkSols));
|
$('#statsNetworkSols' + pool).text(getReadableNetworkHashRateString(stats.pools[pool].poolStats.networkSols));
|
||||||
|
|
Loading…
Reference in New Issue