From 952c8732b164d49b328ebcdbc767b67f22eadb77 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sun, 7 Jul 2013 22:15:40 +0200 Subject: [PATCH 1/2] Properly display piechart, first attempt Should further address #312 --- public/templates/mmcFE/statistics/graphs/both.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/mmcFE/statistics/graphs/both.tpl b/public/templates/mmcFE/statistics/graphs/both.tpl index ff760be1..61f796dd 100644 --- a/public/templates/mmcFE/statistics/graphs/both.tpl +++ b/public/templates/mmcFE/statistics/graphs/both.tpl @@ -30,7 +30,7 @@ {$POOLHASHRATES.$i|default:"0"} {/for} {for $i=0 to date('G', time() - 60 * 60)} - {$POOLHASHRATES.$i|default:"0"} + {$POOLHASHRATES.$i - $YOURHASHRATES.$i|default:"0"} {/for} From 1c2891cc78b94e137226b8e678a3a796992d8512 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 8 Jul 2013 08:54:17 +0200 Subject: [PATCH 2/2] Removed piechart, removed no shares notification * Removed broken piechart for now * Do not display message if no shares are found for calculations to avoid cross-tabe error messages Fixes #312 --- public/templates/mmcFE/statistics/graphs/both.tpl | 6 +----- public/templates/mmcFE/statistics/graphs/mine.tpl | 2 -- public/templates/mmcFE/statistics/graphs/pool.tpl | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/public/templates/mmcFE/statistics/graphs/both.tpl b/public/templates/mmcFE/statistics/graphs/both.tpl index 61f796dd..03832b5f 100644 --- a/public/templates/mmcFE/statistics/graphs/both.tpl +++ b/public/templates/mmcFE/statistics/graphs/both.tpl @@ -1,7 +1,6 @@ {if is_array($YOURHASHRATES) && is_array($POOLHASHRATES)}
-{foreach from=array('area','pie') item=chartType} - +
@@ -36,8 +35,5 @@
Your vs Pool Hashrate

-{/foreach}
-{else} -

  • No shares available to start calculations
  • {/if} diff --git a/public/templates/mmcFE/statistics/graphs/mine.tpl b/public/templates/mmcFE/statistics/graphs/mine.tpl index fe217f2f..4d4259f2 100644 --- a/public/templates/mmcFE/statistics/graphs/mine.tpl +++ b/public/templates/mmcFE/statistics/graphs/mine.tpl @@ -26,6 +26,4 @@ -{else} -

  • No shares available to start calculations
  • {/if} diff --git a/public/templates/mmcFE/statistics/graphs/pool.tpl b/public/templates/mmcFE/statistics/graphs/pool.tpl index ba2ed4e5..f8d118c7 100644 --- a/public/templates/mmcFE/statistics/graphs/pool.tpl +++ b/public/templates/mmcFE/statistics/graphs/pool.tpl @@ -26,6 +26,4 @@ -{else} -

  • No shares available to start calculations
  • {/if}