[FIX] Proper block shares graph
This commit is contained in:
parent
7924ea0545
commit
9a949dbbb1
@ -1,36 +1,56 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
|
var blk = [
|
||||||
|
{section block $BLOCKSFOUND step=-1}
|
||||||
|
[{$smarty.section.block.iteration}, "{$BLOCKSFOUND[block].height}"],
|
||||||
|
{/section}
|
||||||
|
];
|
||||||
var exp = [
|
var exp = [
|
||||||
{section block $BLOCKSFOUND step=-1}
|
{section block $BLOCKSFOUND step=-1}
|
||||||
[{$BLOCKSFOUND[block].time * 1000}, {$BLOCKSFOUND[block].estshares}],
|
[{$smarty.section.block.iteration}, {$BLOCKSFOUND[block].estshares}],
|
||||||
{/section}
|
{/section}
|
||||||
];
|
];
|
||||||
var act = [
|
var act = [
|
||||||
{section block $BLOCKSFOUND step=-1}
|
{section block $BLOCKSFOUND step=-1}
|
||||||
[{$BLOCKSFOUND[block].time * 1000}, {$BLOCKSFOUND[block].shares|default:"0"}],
|
[{$smarty.section.block.iteration}, {$BLOCKSFOUND[block].shares|default:"0"}],
|
||||||
{/section}
|
{/section}
|
||||||
];
|
];
|
||||||
|
{if $USEBLOCKAVERAGE}
|
||||||
var avg = [
|
var avg = [
|
||||||
{section block $BLOCKSFOUND step=-1}
|
{section block $BLOCKSFOUND step=-1}
|
||||||
[{$BLOCKSFOUND[block].time * 1000}, {$BLOCKSFOUND[block].block_avg}],
|
[{$smarty.section.block.iteration}, {$BLOCKSFOUND[block].block_avg|default:"0"}],
|
||||||
{/section}
|
{/section}
|
||||||
];
|
];
|
||||||
|
{/if}
|
||||||
|
{if $GLOBAL.config.payout_system == 'pplns'}
|
||||||
|
var pplns = [
|
||||||
|
{section block $BLOCKSFOUND step=-1}
|
||||||
|
[{$smarty.section.block.iteration}, {$BLOCKSFOUND[block].pplns_shares|default:"0"}],
|
||||||
|
{/section}
|
||||||
|
];
|
||||||
|
{/if}
|
||||||
|
|
||||||
function doPlot(position) {
|
function doPlot(position) {
|
||||||
$.plot($("#block-line-chart"), [{
|
$.plot($("#block-line-chart"), [{
|
||||||
data: exp,
|
data: exp,
|
||||||
label: "Expected Shares"
|
label: "Expected Shares"
|
||||||
|
}, {
|
||||||
|
data: act,
|
||||||
|
label: "Actual Shares"
|
||||||
|
{if $USEBLOCKAVERAGE}
|
||||||
}, {
|
}, {
|
||||||
data: avg,
|
data: avg,
|
||||||
label: "Average Shares"
|
label: "Average Shares"
|
||||||
|
{/if}
|
||||||
|
{if $GLOBAL.config.payout_system == 'pplns'}
|
||||||
}, {
|
}, {
|
||||||
data: act,
|
data: pplns,
|
||||||
label: "Actual Shares",
|
label: "PPLNS Shares"
|
||||||
yaxis: 2
|
{/if}
|
||||||
}], {
|
}], {
|
||||||
xaxes: [{
|
xaxes: [{
|
||||||
mode: 'time'
|
ticks: blk,
|
||||||
|
mode: null
|
||||||
}],
|
}],
|
||||||
yaxes: [{
|
yaxes: [{
|
||||||
min: 0
|
min: 0
|
||||||
@ -44,12 +64,7 @@ $(function() {
|
|||||||
},
|
},
|
||||||
tooltip: true,
|
tooltip: true,
|
||||||
tooltipOpts: {
|
tooltipOpts: {
|
||||||
content: "%s for %x was %y",
|
content: "%y %s",
|
||||||
xDateFormat: "%y-%0m-%0d",
|
|
||||||
|
|
||||||
onHover: function(flotItem, $tooltipEl) {
|
|
||||||
// console.log(flotItem, $tooltipEl);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
@ -72,7 +87,6 @@ $(function() {
|
|||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="panel-group">
|
<div class="panel-group">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="flot-chart">
|
<div class="flot-chart">
|
||||||
<div class="flot-chart-content" id="block-line-chart"></div>
|
<div class="flot-chart-content" id="block-line-chart"></div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user