[Zzzt-commits] r112 - in /trunk: inverter/class_db.php stats/index.php

[lists . jjorge]

Author: zecas
Date: Sat Nov 29 09:31:43 2014
New Revision: 112

URL: http://svn.gna.org/viewcvs/zzzt?rev=112&view=rev
Log:
fix stats

Modified:
    trunk/inverter/class_db.php
    trunk/stats/index.php

Modified: trunk/inverter/class_db.php
URL: 
http://svn.gna.org/viewcvs/zzzt/trunk/inverter/class_db.php?rev=112&r1=111&r2=112&view=diff
==============================================================================
--- trunk/inverter/class_db.php (original)
+++ trunk/inverter/class_db.php Sat Nov 29 09:31:43 2014
@@ -1,4 +1,5 @@
 <?php
+
 /*    This file is part of Zzzt!.
     Copyright (C) 2009  Antonio Ho, José Jorge
 
@@ -87,12 +88,10 @@
                 date_format(`zzzt`.`monitor_date`,_utf8'%H:%i') AS `time`,
                 `zzzt`.`kdy` AS `kdy`,`zzzt_daily`.`production` AS `kld`
               FROM (`zzzt` join `zzzt_daily`)
-              WHERE ( (DATE_SUB(CURDATE(),INTERVAL 30 DAY) <= 
`zzzt_daily`.`date`)
-                AND (`zzzt_daily`.`date` = 
date_format(`zzzt`.`monitor_date`,_utf8'%Y-%m-%d'))
+              WHERE ((`zzzt_daily`.`date` = 
date_format(`zzzt`.`monitor_date`,_utf8'%Y-%m-%d'))
                 AND (`zzzt`.`kdy` > 0.1)
                 AND (`zzzt`.`pdc` = 0)
-               AND (`zzzt`.`kdy` <> `zzzt_daily`.`production`))
-               AND (date_format(`zzzt`.`monitor_date`,_utf8'%H') > 15) 
+                AND (`zzzt`.`kdy` <> `zzzt_daily`.`production`))
               GROUP BY date_format(`zzzt`.`monitor_date`,_utf8'%Y-%m-%d')
               ORDER BY `zzzt`.`monitor_date` DESC;");
 
@@ -127,7 +126,7 @@
       mt_srand((double)microtime()*1000000);
       $c = '';
       while(strlen($c)<6){
-          $c .= sprintf("%02X", mt_rand(0, 255));
+          $c .= sprintf("%02X", mt_rand(0, 128));
       }
       return $c;
   }
@@ -135,4 +134,4 @@
 
 
 }
-?>
+?>

Modified: trunk/stats/index.php
URL: 
http://svn.gna.org/viewcvs/zzzt/trunk/stats/index.php?rev=112&r1=111&r2=112&view=diff
==============================================================================
--- trunk/stats/index.php       (original)
+++ trunk/stats/index.php       Sat Nov 29 09:31:43 2014
@@ -138,7 +138,10 @@
   }
 
   echo "<a title='$ap'>".LAST_MEASURES."</a>";
-  $sql="SELECT * FROM zzzt WHERE DAY(monitor_date) = DAY('{$_GET['day']}') 
ORDER BY monitor_date DESC LIMIT 0,10";
+  $sql="SELECT * FROM zzzt
+         WHERE DATE(monitor_date) = '{$_GET['day']}'
+         ORDER BY monitor_date DESC
+         LIMIT 0,10";
   $db->query($sql);
   $titre='     <tr>
                        <th>'.DYR.'-'.DMT.'-'.DDY.' '.THR.':'.TMI.'</th>
@@ -150,7 +153,7 @@
                        <th>'.MONITOR.'</th>
                </tr>';
   echo '
-       <table border=1>'.$titre;
+       <table border=1>';
   $monitors=array();
   while ($row = $db->fetch())
   {


_______________________________________________
Zzzt-commits mailing list
Zzzt-commits@gna.org
https://mail.gna.org/listinfo/zzzt-commits