sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed a problem with the charts

Browse Source
This commit is contained in:
Daniel Camargo 2013-07-12 16:41:59 -03:00
parent a275cb802e
commit 7605d6653f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/library/Crunchbutton/Chart.php
View File

@ -76,6 +76,11 @@ class Crunchbutton_Chart extends Cana_Model {
public function processInterval( $interval ){ public function processInterval( $interval ){
$param_interval = $_REQUEST[ 'interval' ];
if( $interval != $param_interval ){
$interval = $param_interval;
}
switch ( $interval ) { switch ( $interval ) {
case 'day': case 'day':

6
include/views/default/cockpit/home/index.phtml
View File

@ -162,8 +162,8 @@
</div> </div>
<div class="span2"> <div class="span2">
<button class="btn btn-blue" id="button-reload" title="Reload all charts"><i class="icon-refresh"></i></button> <button class="btn btn-blue" id="button-reload" title="Reload all charts"><i class="icon-refresh"></i></button>
&nbsp; <!-- &nbsp;
<button class="btn btn-green" id="button-open-all" title="Open all">Open all</button> <button class="btn btn-green" id="button-open-all" title="Open all">Open all</button> -->
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -277,7 +277,7 @@
var chart = $( this ); var chart = $( this );
if( chart.attr( 'opened' ) == 'true' ){ if( chart.attr( 'opened' ) == 'true' ){
var permalink = chart.attr( 'data-permalink' ); var permalink = chart.attr( 'data-permalink' );
var params = { 'divId' : chart.attr( 'id' ), 'permalink' : permalink, 'force' : true }; var params = { 'divId' : chart.attr( 'id' ), 'permalink' : permalink, 'force' : true, 'interval' : 'week' };
loadChart( params ); loadChart( params );
$( '#button-reload' ).find( 'i' ).addClass( 'icon-spin ' ); $( '#button-reload' ).find( 'i' ).addClass( 'icon-spin ' );
setTimeout( function(){ setTimeout( function(){