RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pre-sort SQL data in array for easy time access

Browse Source 
This allows us to access the array key as the time. This way the
template can properly render the time axis according to current time.
This commit is contained in:
Sebastian Grewe 2013-06-06 11:47:20 +02:00
parent 232e79f7ad
commit 1bf2e7cf18
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/include/classes/statistics.class.php
View File

@ -311,8 +311,12 @@ class Statistics {
AND a.id = ? AND a.id = ?
GROUP BY HOUR(time) GROUP BY HOUR(time)
"); ");
if ($this->checkStmt($stmt) && $stmt->bind_param("i", $account_id) && $stmt->execute() && $result = $stmt->get_result()) if ($this->checkStmt($stmt) && $stmt->bind_param("i", $account_id) && $stmt->execute() && $result = $stmt->get_result()) {
return $this->memcache->setCache(__FUNCTION__ . $account_id, $result->fetch_all(MYSQLI_ASSOC), 3600); while ($row = $result->fetch_assoc()) {
$aData[$row['hour']] = $row['hashrate'];
}
return $this->memcache->setCache(__FUNCTION__ . $account_id, $aData, 3600);
}
// Catchall // Catchall
$this->debug->append("Failed to fetch hourly hashrate: " . $this->mysqli->error); $this->debug->append("Failed to fetch hourly hashrate: " . $this->mysqli->error);
return false; return false;

1
public/include/pages/statistics/user.inc.php
View File

@ -8,7 +8,6 @@ $aHourlyHashRates = $statistics->getHourlyHashrateByAccount($_SESSION['USERDATA'
// Propagate content our template // Propagate content our template
$smarty->assign("YOURHASHRATES", $aHourlyHashRates); $smarty->assign("YOURHASHRATES", $aHourlyHashRates);
$smarty->assign("DIFFICULTY", $dDifficulty);
if ($_SESSION['AUTHENTICATED']) { if ($_SESSION['AUTHENTICATED']) {
$smarty->assign("CONTENT", "default.tpl"); $smarty->assign("CONTENT", "default.tpl");

22
public/templates/mmcFE/statistics/user/default.tpl
View File

@ -1,23 +1,33 @@
{include file="global/block_header.tpl" BLOCK_HEADER="Your Average Hourly Hash Rate" BUTTONS=array(mine,pool,both)} {include file="global/block_header.tpl" BLOCK_HEADER="Your Average Hourly Hash Rate" BUTTONS=array(mine,pool,both)}
{if is_array($YOURHASHRATES)}
<div class="block_content tab_content" id="mine" style="padding-left:30px;"> <div class="block_content tab_content" id="mine" style="padding-left:30px;">
<table class="stats" rel="area" cellpadding="0"> <table class="stats" rel="area" cellpadding="0">
<caption>Your Hashrate&nbsp;</caption> <caption>Your Hashrate&nbsp;</caption>
<thead> <thead>
<tr> <tr>
<td></td> <td></td>
{section hashrate $YOURHASHRATES} {for $i=date('G', time() + 60 * 60) to 23}
<th scope="col">{$YOURHASHRATES[hashrate].hour}</th> <th scope="col">{$i}</th>
{/section} {/for}
{for $i=0 to date('G')}
<th scope="col">{$i}</th>
{/for}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<th scope="row">{$GLOBAL.USERDATA.username}</th> <th scope="row">{$GLOBAL.USERDATA.username}</th>
{section hashrate $YOURHASHRATES} {for $i=date('G', time() + 60 * 60) to 23}
<td>{$YOURHASHRATES[hashrate].hashrate}</td> <td>{$YOURHASHRATES.$i|default:"0"}</td>
{/section} {/for}
{for $i=0 to date('G')}
<td>{$YOURHASHRATES.$i|default:"0"}</td>
{/for}
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
{else}
<p><li>No shares available to start calculations</li></p>
{/if}
{include file="global/block_footer.tpl"} {include file="global/block_footer.tpl"}