Author: zecas Date: Mon May 30 21:06:03 2016 New Revision: 136 URL: http://svn.gna.org/viewcvs/zzzt?rev=136&view=rev Log: resizable graphs
Modified: trunk/index.php trunk/stats/daily.php trunk/stats/index.php trunk/stats/monthly.php trunk/stats/yearly.php Modified: trunk/index.php URL: http://svn.gna.org/viewcvs/zzzt/trunk/index.php?rev=136&r1=135&r2=136&view=diff ============================================================================== --- trunk/index.php (original) +++ trunk/index.php Mon May 30 21:06:03 2016 @@ -1,6 +1,6 @@ <?php /* This file is part of Zzzt!. - Copyright (C) 2009 Antonio Ho, José Jorge + Copyright (C) 2009-2016 Antonio Ho, José Jorge Zzzt! is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with Zzzt! . If not, see <http://www.gnu.org/licenses/>. */ - + require 'i18n/switch.php'; htmlCommun(''); ?> <body> Modified: trunk/stats/daily.php URL: http://svn.gna.org/viewcvs/zzzt/trunk/stats/daily.php?rev=136&r1=135&r2=136&view=diff ============================================================================== --- trunk/stats/daily.php (original) +++ trunk/stats/daily.php Mon May 30 21:06:03 2016 @@ -88,7 +88,9 @@ behaveLikeLine: true, smooth: false, hideHover: 'auto', - data: [ + resize: true, + redraw: true, + data: [ <?php for($i=0;$i<sizeof($values);$i++) { echo "{ j: '".$jour[$i]."'"; Modified: trunk/stats/index.php URL: http://svn.gna.org/viewcvs/zzzt/trunk/stats/index.php?rev=136&r1=135&r2=136&view=diff ============================================================================== --- trunk/stats/index.php (original) +++ trunk/stats/index.php Mon May 30 21:06:03 2016 @@ -29,11 +29,11 @@ ROUND(AVG(pac),0) AS pac, ROUND(AVG(pdc),0) AS pdc, kdy, tkk FROM zzzt - WHERE DATE(`monitor_date`)='$day' GROUP BY md ORDER BY md ASC"; + WHERE DATE(`monitor_date`)='$day' GROUP BY md ORDER BY md ASC"; $db->query($sql); while ($row = $db->fetch()) { if(isset($prev) && !isset($_GET['detaille']) && - ( ($prev<=$row['pdc'] && $prev*1.03>=$row['pdc']) || ($prev>=$row['pdc'] && $prev*0.97<=$row['pdc']) ) + ( ($prev<=$row['pdc'] && $prev*1.03>=$row['pdc']) || ($prev>=$row['pdc'] && $prev*0.97<=$row['pdc']) ) ) {$skip+=1;} else {$skip=0;} if($skip<1 || $skip>9) { $prev=$row['pdc']; @@ -64,8 +64,8 @@ for($i=0;$i<10;$i++){ $d=date('Y-m-d', strtotime($day)-(3600*24*$i) ); - $d==$day ? $selected='selected' : $selected=''; - $bd=strftime("%e %b %G",strtotime($day)-(3600*24*$i)); + $d==$day ? $selected='selected' : $selected=''; + $bd=strftime("%e %b %G",strtotime($day)-(3600*24*$i)); echo "<option value='$d' $selected >$bd</option>\n"; } ?> @@ -102,9 +102,9 @@ <?php $sql="SELECT YEAR(date) AS year, production FROM zzzt_daily - WHERE DAY(date) = DAY('$day') - AND MONTH(date) = MONTH('$day') - ORDER BY year DESC"; + WHERE DAY(date) = DAY('$day') + AND MONTH(date) = MONTH('$day') + ORDER BY year DESC"; $db->query($sql); $ap=strftime("%e %B %G", strtotime($day))." "; @@ -122,56 +122,56 @@ echo "<a title='$ap'>".LAST_MEASURES."</a>"; $sql="SELECT * FROM zzzt - WHERE DATE(monitor_date) = '{$day}' - ORDER BY monitor_date DESC - LIMIT 0,5"; - $db->query($sql); - $titre=' <tr> - <th>'.DYR.'-'.DMT.'-'.DDY.' '.THR.':'.TMI.'</th> - <th>'.EFFICIENCY.'</th> - <th>'.PAC.'</th> - <th>'.PDC.'</th> - <th>'.KDY.'</th> - <th>'.TKK.'</th> - <th>'.MONITOR.'</th> - </tr>'; + WHERE DATE(monitor_date) = '{$day}' + ORDER BY monitor_date DESC + LIMIT 0,5"; + $db->query($sql); + $titre=' <tr> + <th>'.DYR.'-'.DMT.'-'.DDY.' '.THR.':'.TMI.'</th> + <th>'.EFFICIENCY.'</th> + <th>'.PAC.'</th> + <th>'.PDC.'</th> + <th>'.KDY.'</th> + <th>'.TKK.'</th> + <th>'.MONITOR.'</th> + </tr>'; echo ' - <table border=1>'; + <table border=1>'; $monitors=array(); while ($row = $db->fetch()) { if(!array_key_exists($row[5],$monitors)) { $monitors[$row[5]]='#'.dechex(rand(106,254)).dechex(rand(106,254)).dechex(rand(106,254)); } - echo"<tr style='background-color:{$monitors[$row[5]]}'> - <td>$row[0]</td> - <td>".sprintf('%.2F',$row[1]*100/($row[2]+0.0001))."%</td> - <td>$row[1]</td> - <td>$row[2]</td> - <td>$row[3]</td> - <td>$row[4]</td> - <td>$row[5]</td> - </tr>"; + echo"<tr style='background-color:{$monitors[$row[5]]}'> + <td>$row[0]</td> + <td>".sprintf('%.2F',$row[1]*100/($row[2]+0.0001))."%</td> + <td>$row[1]</td> + <td>$row[2]</td> + <td>$row[3]</td> + <td>$row[4]</td> + <td>$row[5]</td> + </tr>"; } echo $titre; $sql="SELECT * FROM ( - SELECT * FROM zzzt WHERE DATE(monitor_date) = '{$day}' ORDER BY monitor_date ASC LIMIT 0,5 ) - AS zzztdebut ORDER BY monitor_date DESC"; + SELECT * FROM zzzt WHERE DATE(monitor_date) = '{$day}' ORDER BY monitor_date ASC LIMIT 0,5 ) + AS zzztdebut ORDER BY monitor_date DESC"; $db->query($sql); while ($row = $db->fetch()) { if(!array_key_exists($row[5],$monitors)) { $monitors[$row[5]]='#'.dechex(rand(106,254)).dechex(rand(106,254)).dechex(rand(106,254)); } - echo"<tr style='background-color:{$monitors[$row[5]]}'> - <td>$row[0]</td> - <td>".sprintf('%.2F',$row[1]*100/($row[2]+0.0001))."%</td> - <td>$row[1]</td> - <td>$row[2]</td> - <td>$row[3]</td> - <td>$row[4]</td> - <td>$row[5]</td> - </tr>"; + echo"<tr style='background-color:{$monitors[$row[5]]}'> + <td>$row[0]</td> + <td>".sprintf('%.2F',$row[1]*100/($row[2]+0.0001))."%</td> + <td>$row[1]</td> + <td>$row[2]</td> + <td>$row[3]</td> + <td>$row[4]</td> + <td>$row[5]</td> + </tr>"; } echo '</table>'; ?> @@ -198,23 +198,45 @@ ?> ]; - var chartP = Morris.Area({element: 'holderP', lineColors: ['#006600','#FF3300','#006699'], pointSize: 0, smooth: false, - behaveLikeLine: true, fillOpacity: 0.5, hideHover: 'auto', lineWidth: 1,data: tabP, xkey: 'h', ykeys: ['k','a','d'], labels: ['<?php echo KDY;?> (daWh)','<?php echo PAC;?> (W)','<?php echo PDC;?> (W)'] }); + var chartP = Morris.Area({ + element: 'holderP', + lineColors: ['#006600','#FF3300','#006699'], + pointSize: 0, + smooth: false, + behaveLikeLine: true, + fillOpacity: 0.5, + hideHover: 'auto', + lineWidth: 1, + data: tabP, + resize: true, + redraw: true, + xkey: 'h', + ykeys: ['k','a','d'], + labels: ['<?php echo KDY;?> (daWh)','<?php echo PAC;?> (W)','<?php echo PDC;?> (W)'] }); var tabR = [ <?php - if( isset($_GET['detaille'])) - for($i=0;$i<sizeof($values['rendement']);$i++) { - echo "{ h: '".$heure[$i]."'"; - echo ", 'r': ".$values['rendement'][$i]; - echo ", 't': ".$values['tkk'][$i]; - if($i<sizeof($values['rendement'])-1) echo " },\n"; else echo " }\n"; - } + for($i=0;$i<sizeof($values['rendement']);$i++) { + echo "{ h: '".$heure[$i]."'"; + echo ", 'r': ".$values['rendement'][$i]; + echo ", 't': ".$values['tkk'][$i]; + if($i<sizeof($values['rendement'])-1) echo " },\n"; else echo " }\n"; + } ?> ]; - var chartR = Morris.Line({element: 'holderR', lineColors: ['#1751A7','#006600'], pointSize: 0, - hideHover: 'auto', lineWidth: 1, data: tabR, xkey: 'h', ykeys: ['r','t'], labels: ['<?php echo EFFICIENCY;?>','<?php echo TKK;?>'] }); + var chartR = Morris.Line({ + element: 'holderR', + lineColors: ['#1751A7','#006600'], + pointSize: 0, + hideHover: 'auto', + lineWidth: 1, + data: tabR, + resize: true, + redraw: true, + xkey: 'h', + ykeys: ['r','t'], + labels: ['<?php echo EFFICIENCY;?>','<?php echo TKK;?>'] }); if (typeof tabP[0] !== 'undefined') { document.getElementById("last").innerHTML = Modified: trunk/stats/monthly.php URL: http://svn.gna.org/viewcvs/zzzt/trunk/stats/monthly.php?rev=136&r1=135&r2=136&view=diff ============================================================================== --- trunk/stats/monthly.php (original) +++ trunk/stats/monthly.php Mon May 30 21:06:03 2016 @@ -55,8 +55,18 @@ foreach($year as $y) $colors[]=$db->rnd_color(); ?> - new Morris.Area({element: 'holder', lineColors: ['#<?php echo implode("','#",$colors); ?>'], - continuousLine: false, fillOpacity: 0.5, postUnits: 'kWh', behaveLikeLine: true, parseTime: false, hideHover: 'auto', data: [ + new Morris.Area({ + element: 'holder', + lineColors: ['#<?php echo implode("','#",$colors); ?>'], + continuousLine: false, + fillOpacity: 0.5, + postUnits: 'kWh', + behaveLikeLine: true, + parseTime: false, + hideHover: 'auto', + resize: true, + redraw: true, + data: [ <?php for($i=1;$i<13;$i++) { $tab=str_pad((int)$i,2,"0",STR_PAD_LEFT); @@ -67,7 +77,10 @@ if($i<12) echo " },\n"; else echo " }\n"; } ?> - ], xkey: 'a', ykeys: ['<?php echo implode("','",$year); ?>'], labels: ['<?php echo implode("','",$year); ?>'] }); + ], + xkey: 'a', + ykeys: ['<?php echo implode("','",$year); ?>'], + labels: ['<?php echo implode("','",$year); ?>'] }); </script> <noscript><br><img src=image_by_month.php?width=1000&height=600></noscript> Modified: trunk/stats/yearly.php URL: http://svn.gna.org/viewcvs/zzzt/trunk/stats/yearly.php?rev=136&r1=135&r2=136&view=diff ============================================================================== --- trunk/stats/yearly.php (original) +++ trunk/stats/yearly.php Mon May 30 21:06:03 2016 @@ -61,6 +61,8 @@ behaveLikeLine: true, parseTime: false, hideHover: 'auto', + resize: true, + redraw: true, data: [ <?php $tableau=''; _______________________________________________ Zzzt-commits mailing list Zzzt-commits@gna.org https://mail.gna.org/listinfo/zzzt-commits