[CHANGE] Moved from bar shares to pie shares
The cake is a lie! It's a pie! Addresses #1040
This commit is contained in:
Sebastian Grewe
parent
82efbb4609
commit
4fa4259932
@ -8,8 +8,8 @@
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.canvasTextRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.canvasAxisTickRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.categoryAxisRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.barRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.pointLabels.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.donutRenderer.js"></script>
|
||||
|
||||
<script>
|
||||
{literal}
|
||||
@ -61,34 +61,25 @@ $(document).ready(function(){
|
||||
grid: { drawBorder: false, background: '#fbfbfb', shadow: false },
|
||||
seriesColors: [ '#26a4ed', '#ee8310', '#e9e744' ],
|
||||
seriesDefaults: {
|
||||
pointLabels: { show: true },
|
||||
renderer: $.jqplot.BarRenderer,
|
||||
shadowAngle: 135,
|
||||
rendererOptions: {
|
||||
barWidth: 5,
|
||||
barDirection: 'horizontal'
|
||||
},
|
||||
trendline: { show: false },
|
||||
renderer: $.jqplot.DonutRenderer,
|
||||
rendererOptions:{
|
||||
ringMargin: 10,
|
||||
sliceMargin: 10,
|
||||
startAngle: -90,
|
||||
showDataLabels: true,
|
||||
dataLabels: 'value',
|
||||
dataLabelThreshold: 0
|
||||
}
|
||||
},
|
||||
axesDefaults: {
|
||||
autoscale: true,
|
||||
tickRenderer: $.jqplot.CanvasAxisTickRenderer ,
|
||||
},
|
||||
series: [
|
||||
{label: 'Own', }, {label: 'Pool'}
|
||||
],
|
||||
legend: { show: true, location: 'ne', renderer: $.jqplot.EnhancedLegendRenderer, rendererOptions: { seriesToggleReplot: { resetAxes: true } } },
|
||||
axes: {
|
||||
yaxis: { tickOptions: { angle: -90 }, ticks: [ 'valid', 'invalid' ], renderer: $.jqplot.CategoryAxisRenderer },
|
||||
xaxis: { tickOptions: { angle: -17 }, pointLabels: { show: true } }
|
||||
}
|
||||
legend: { show: false }
|
||||
};
|
||||
|
||||
// Init empty graph with 0 data, otherwise some plugins fail
|
||||
|
||||
// Initilize gauges and graph
|
||||
var plot1 = $.jqplot('hashrategraph', [[storedPersonalHashrate], [storedPoolHashrate], [[0, 0.0]]], jqPlotOverviewOptions);
|
||||
var plot2 = $.jqplot('shareinfograph', [[{/literal}{$GLOBAL.userdata.shares.valid}{literal},{/literal}{$GLOBAL.userdata.shares.invalid}{literal}],[{/literal}{$GLOBAL.roundshares.valid}{literal},{/literal}{$GLOBAL.roundshares.invalid}{literal}]], jqPlotShareinfoOptions);
|
||||
var plot2 = $.jqplot('shareinfograph', [
|
||||
[['your valid', {/literal}{$GLOBAL.userdata.shares.valid}{literal}], ['pool valid', {/literal}{$GLOBAL.roundshares.valid}{literal}]],
|
||||
[['your invalid', {/literal}{$GLOBAL.userdata.shares.invalid}{literal}], ['pool invalid', {/literal}{$GLOBAL.roundshares.invalid}{literal}]]
|
||||
], jqPlotShareinfoOptions);
|
||||
|
||||
g1 = new JustGage({id: "nethashrate", value: parseFloat({/literal}{$GLOBAL.nethashrate}{literal}).toFixed(2), min: 0, max: Math.round({/literal}{$GLOBAL.nethashrate}{literal} * 2), title: "Net Hashrate", gaugeColor: '#6f7a8a', valueFontColor: '#555', shadowOpacity : 0.8, shadowSize : 0, shadowVerticalOffset : 10, label: "{/literal}{$GLOBAL.hashunits.network}{literal}"});
|
||||
g2 = new JustGage({id: "poolhashrate", value: parseFloat({/literal}{$GLOBAL.hashrate}{literal}).toFixed(2), min: 0, max: Math.round({/literal}{$GLOBAL.hashrate}{literal}* 2), title: "Pool Hashrate", gaugeColor: '#6f7a8a', valueFontColor: '#555', shadowOpacity : 0.8, shadowSize : 0, shadowVerticalOffset : 10, label: "{/literal}{$GLOBAL.hashunits.pool}{literal}"});
|
||||
@ -116,8 +107,8 @@ $(document).ready(function(){
|
||||
storedPersonalSharerate[storedPersonalSharerate.length] = [timeNow, parseFloat(data.getdashboarddata.data.personal.sharerate)];
|
||||
storedPoolHashrate[storedPoolHashrate.length] = [timeNow, data.getdashboarddata.data.raw.pool.hashrate];
|
||||
tempShareinfoData = [
|
||||
[parseInt(data.getdashboarddata.data.personal.shares.valid), parseInt(data.getdashboarddata.data.personal.shares.invalid)],
|
||||
[parseInt(data.getdashboarddata.data.pool.shares.valid), parseInt(data.getdashboarddata.data.pool.shares.invalid)]
|
||||
[['your valid', parseInt(data.getdashboarddata.data.personal.shares.valid)], ['pool valid', parseInt(data.getdashboarddata.data.pool.shares.valid)]],
|
||||
[['your invalid', parseInt(data.getdashboarddata.data.personal.shares.invalid)], ['pool invalid', parseInt(data.getdashboarddata.data.pool.shares.invalid)]]
|
||||
];
|
||||
replotOverviewOptions = {
|
||||
data: [storedPersonalHashrate, storedPoolHashrate, storedPersonalSharerate],
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.canvasTextRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.canvasAxisTickRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.categoryAxisRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.barRenderer.min.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.pointLabels.js"></script>
|
||||
<script type="text/javascript" src="{$PATH}/js/plugins/jqplot.donutRenderer.js"></script>
|
||||
|
||||
<script>
|
||||
{literal}
|
||||
@ -22,31 +22,24 @@ $(document).ready(function(){
|
||||
grid: { drawBorder: false, background: '#fbfbfb', shadow: false },
|
||||
seriesColors: [ '#26a4ed', '#ee8310', '#e9e744' ],
|
||||
seriesDefaults: {
|
||||
pointLabels: { show: true },
|
||||
renderer: $.jqplot.BarRenderer,
|
||||
shadowAngle: 135,
|
||||
rendererOptions: {
|
||||
barWidth: 5,
|
||||
barDirection: 'horizontal'
|
||||
},
|
||||
trendline: { show: false },
|
||||
renderer: $.jqplot.DonutRenderer,
|
||||
rendererOptions:{
|
||||
ringMargin: 10,
|
||||
sliceMargin: 10,
|
||||
startAngle: -90,
|
||||
showDataLabels: true,
|
||||
dataLabels: 'value',
|
||||
dataLabelThreshold: 0
|
||||
}
|
||||
},
|
||||
axesDefaults: {
|
||||
autoscale: true,
|
||||
tickRenderer: $.jqplot.CanvasAxisTickRenderer ,
|
||||
},
|
||||
series: [
|
||||
{label: 'Own', }, {label: 'Pool'}
|
||||
],
|
||||
legend: { show: true, location: 'ne', renderer: $.jqplot.EnhancedLegendRenderer, rendererOptions: { seriesToggleReplot: { resetAxes: true } } },
|
||||
axes: {
|
||||
yaxis: { tickOptions: { angle: -90 }, ticks: [ 'valid', 'invalid' ], renderer: $.jqplot.CategoryAxisRenderer },
|
||||
xaxis: { tickOptions: { angle: -17 }, pointLabels: { show: true } }
|
||||
}
|
||||
legend: { show: false }
|
||||
};
|
||||
|
||||
// Init shares graph
|
||||
var plot2 = $.jqplot('shareinfograph', [[{/literal}{$GLOBAL.userdata.shares.valid}{literal},{/literal}{$GLOBAL.userdata.shares.invalid}{literal}],[{/literal}{$GLOBAL.roundshares.valid}{literal},{/literal}{$GLOBAL.roundshares.invalid}{literal}]], jqPlotShareinfoOptions);
|
||||
var plot2 = $.jqplot('shareinfograph', [
|
||||
[['your valid', {/literal}{$GLOBAL.userdata.shares.valid}{literal}], ['pool valid', {/literal}{$GLOBAL.roundshares.valid}{literal}]],
|
||||
[['your invalid', {/literal}{$GLOBAL.userdata.shares.invalid}{literal}], ['pool invalid', {/literal}{$GLOBAL.roundshares.invalid}{literal}]]
|
||||
], jqPlotShareinfoOptions);
|
||||
|
||||
g1 = new JustGage({id: "nethashrate", value: parseFloat({/literal}{$GLOBAL.nethashrate}{literal}).toFixed(2), min: 0, max: Math.round({/literal}{$GLOBAL.nethashrate}{literal} * 2), title: "Net Hashrate", gaugeColor: '#6f7a8a', valueFontColor: '#555', shadowOpacity : 0.8, shadowSize : 0, shadowVerticalOffset : 10, label: "{/literal}{$GLOBAL.hashunits.network}{literal}"});
|
||||
g2 = new JustGage({id: "poolhashrate", value: parseFloat({/literal}{$GLOBAL.hashrate}{literal}).toFixed(2), min: 0, max: Math.round({/literal}{$GLOBAL.hashrate}{literal}* 2), title: "Pool Hashrate", gaugeColor: '#6f7a8a', valueFontColor: '#555', shadowOpacity : 0.8, shadowSize : 0, shadowVerticalOffset : 10, label: "{/literal}{$GLOBAL.hashunits.pool}{literal}"});
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<article class="module width_3_quarter">
|
||||
<article class="module width_quarter">
|
||||
<header><h3>Round Information</h3></header>
|
||||
<div class="module_content">
|
||||
<div id="shareinfograph" style="width: 100%; height: 150px;"></div>
|
||||
<div id="shareinfograph" style="width: 100%; height: 100%;"></div>
|
||||
</div>
|
||||
<footer>
|
||||
</footer>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user