Author: zecas
Date: Mon Apr 14 08:27:39 2014
New Revision: 107
URL: http://svn.gna.org/viewcvs/zzzt?rev=107&view=rev
Log:
bring back average for the current month
Modified:
trunk/config/1.php
trunk/config/2.php
trunk/config/3.php
trunk/config/index.php
trunk/index.php
trunk/inverter/index.php
trunk/inverter/monitor.php
trunk/stats/monthly.php
Modified: trunk/config/1.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/config/1.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/config/1.php (original)
+++ trunk/config/1.php Mon Apr 14 08:27:39 2014
@@ -30,11 +30,10 @@
$_SESSION['inverter']=new inverter($_POST['model']);
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
<html>
<head>
- <meta content="text/html; charset=UTF-8"
- http-equiv="content-type">
+ <meta charset="UTF-8" >
<link rel="shortcut icon" href="../images/inverter.png" type="image/x-png"/>
<link rel="icon" href="../images/inverter.png" type="image/x-png"/>
<title><?php echo APPLICATION.' - '.CONFIGURE;?></title>
Modified: trunk/config/2.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/config/2.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/config/2.php (original)
+++ trunk/config/2.php Mon Apr 14 08:27:39 2014
@@ -29,11 +29,10 @@
session_start();// after the needed classes
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
<html>
<head>
- <meta content="text/html; charset=UTF-8"
- http-equiv="content-type">
+ <meta charset="UTF-8" >
<link rel="shortcut icon" href="../images/inverter.png" type="image/x-png"/>
<link rel="icon" href="../images/inverter.png" type="image/x-png"/>
<title><?php echo APPLICATION.' - '.CONFIGURE;?></title>
Modified: trunk/config/3.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/config/3.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/config/3.php (original)
+++ trunk/config/3.php Mon Apr 14 08:27:39 2014
@@ -20,11 +20,10 @@
$inverter=new inverter();
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
<html>
<head>
- <meta content="text/html; charset=UTF-8"
- http-equiv="content-type">
+ <meta charset="UTF-8">
<link rel="shortcut icon" href="../images/inverter.png" type="image/x-png"/>
<link rel="icon" href="../images/inverter.png" type="image/x-png"/>
<title><?php echo APPLICATION.' - '.CONFIGURE;?></title>
Modified: trunk/config/index.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/config/index.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/config/index.php (original)
+++ trunk/config/index.php Mon Apr 14 08:27:39 2014
@@ -37,11 +37,10 @@
$_SESSION['inverter']=new inverter();
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
<html>
<head>
- <meta content="text/html; charset=UTF-8"
- http-equiv="content-type">
+ <meta charset="UTF-8">
<link rel="shortcut icon" href="../images/inverter.png" type="image/x-png"/>
<link rel="icon" href="../images/inverter.png" type="image/x-png"/>
<title><?php echo APPLICATION.' - '.CONFIGURE;?></title>
Modified: trunk/index.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/index.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/index.php (original)
+++ trunk/index.php Mon Apr 14 08:27:39 2014
@@ -16,11 +16,11 @@
along with Zzzt! . If not, see <http://www.gnu.org/licenses/>.
*/
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
<html>
<head>
<title>Zzzt!</title>
- <meta content="text/html; charset=UTF-8" http-equiv="content-type">
+ <meta charset="UTF-8">
<link rel="shortcut icon" href="../images/inverter.png" type="image/x-png"/>
<link rel="icon" href="../images/inverter.png" type="image/x-png"/>
</head>
Modified: trunk/inverter/index.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/inverter/index.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/inverter/index.php (original)
+++ trunk/inverter/index.php Mon Apr 14 08:27:39 2014
@@ -20,11 +20,10 @@
session_start();// after the needed classes
if(!isset($_SESSION['inverter'])) {$_SESSION['inverter']=new inverter();}
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
<html>
<head>
- <meta content="text/html; charset=UTF-8"
- http-equiv="content-type">
+ <meta charset="UTF-8" >
<link rel="shortcut icon" href="../images/inverter.png" type="image/x-png"/>
<link rel="icon" href="../images/inverter.png" type="image/x-png"/>
<title><?php echo APPLICATION.' '.VERSION;?></title>
Modified: trunk/inverter/monitor.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/inverter/monitor.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/inverter/monitor.php (original)
+++ trunk/inverter/monitor.php Mon Apr 14 08:27:39 2014
@@ -23,11 +23,10 @@
$inverter->refresh();
$_SESSION['inverter']=$inverter;
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
<html>
<head>
- <meta content="text/html; charset=UTF-8"
- http-equiv="content-type">
+ <meta charset="UTF-8" >
<meta http-equiv="refresh" content="<?php echo
$inverter->config['refresh'];?>" >
<link rel="shortcut icon" href="../images/inverter.png" type="image/x-png"/>
<link rel="icon" href="../images/inverter.png" type="image/x-png"/>
Modified: trunk/stats/monthly.php
URL:
http://svn.gna.org/viewcvs/zzzt/trunk/stats/monthly.php?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/stats/monthly.php (original)
+++ trunk/stats/monthly.php Mon Apr 14 08:27:39 2014
@@ -3,8 +3,7 @@
session_start();// after the needed classes
$inverter=new inverter();
$db=new db($inverter);
- if(!isset($_GET['year'])) $_GET['year']=date('Y');
- $year=$mois=$annees=$values=array();
+ $year=$annees=$values=array();
?>
<!DOCTYPE html>
<html>
@@ -21,6 +20,7 @@
<style>
html, body { height: 95%; }
#holder { width: 98%; height: 100%; }
+ #moyenne { position: absolute; right: 50px; top: 25px;}
</style>
</head>
@@ -59,7 +59,6 @@
<?php
for($i=1;$i<13;$i++) {
$tab=str_pad((int)$i,2,"0",STR_PAD_LEFT);
- $mois[]=$tab;
echo "{ a: '".strftime( '%B', mktime(0,0,0,$i,1) )."'";
foreach($year as $y) {
if(!isset($values[$y][$tab])) $values[$y][$tab]='null';
@@ -71,7 +70,7 @@
</script>
<noscript><br><img
src=image_by_month.php?width=1000&height=600></noscript>
-
+ <div id='moyenne'><?php echo strftime( '%B %Y', mktime(0,0,0,date('n'),1)
).' : '.$moyenne_quotidienne_du_mois.'kWh/'.DDY; ?></div>
</body>
</html>
_______________________________________________
Zzzt-commits mailing list
Zzzt-commits@gna.org
https://mail.gna.org/listinfo/zzzt-commits
