Frontend:
a summary-view added bugfixes git-svn-id: file:///home/jan/tmp/wetterstation/trunk@117 dd492736-c11a-0410-ad51-8c26713eaf7f
This commit is contained in:
parent
04e4bcd3a4
commit
21f15f6c54
|
|
@ -0,0 +1,9 @@
|
||||||
|
<center>
|
||||||
|
<div class="small_set">
|
||||||
|
{content:addModule:innenSmall_1}
|
||||||
|
{content:addModule:auss2Small_4}
|
||||||
|
<br>
|
||||||
|
{content:addModule:windsSmall_2}
|
||||||
|
{content:addModule:regenSmall_3}
|
||||||
|
</div>
|
||||||
|
</center>
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
|
||||||
|
<ul class="val_list">
|
||||||
|
<li class="val_elm">
|
||||||
|
<a href="{content:addSetLink:full}" class="mod_small_link">
|
||||||
|
<div class="mod_header">
|
||||||
|
<h4 class="mod_subheadline">Temparatur</h4>
|
||||||
|
</div>
|
||||||
|
<div class="mod_body">
|
||||||
|
<span class="mod_now">{content:fill:temp_now_val}°C</span>
|
||||||
|
<span class="mod_av">(Ø {content:fill:temp_av_value}°C)</span>
|
||||||
|
</div>
|
||||||
|
<div class="mod_footer">
|
||||||
|
<nobr><span class="mod_max">max: {content:fill:temp_max_val}°C</span><span class="mod_min">min: {content:fill:temp_min_val}°C</span></nobr>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="val_elm">
|
||||||
|
<a href="{content:addSetLink:full}" class="mod_small_link">
|
||||||
|
<div class="mod_header">
|
||||||
|
<h4 class="mod_subheadline">Luftfeuchte</h4>
|
||||||
|
</div>
|
||||||
|
<div class="mod_body">
|
||||||
|
<span class="mod_now">{content:fill:hum_now_val}%</span>
|
||||||
|
<span class="mod_av">(Ø {content:fill:hum_av_value}%)</span>
|
||||||
|
</div>
|
||||||
|
<div class="mod_footer">
|
||||||
|
<nobr><span class="mod_max">max: {content:fill:hum_max_val}%</span><span class="mod_min">min: {content:fill:temp_min_val}%</span></nobr>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
|
||||||
|
<ul class="val_list">
|
||||||
|
<li class="val_elm">
|
||||||
|
<a href="{content:addSetLink:full}" class="mod_small_link">
|
||||||
|
<div class="mod_header">
|
||||||
|
<h4 class="mod_subheadline">Temparatur</h4>
|
||||||
|
</div>
|
||||||
|
<div class="mod_body">
|
||||||
|
<span class="mod_now">{content:fill:temp_now_val}°C</span>
|
||||||
|
<span class="mod_av">(Ø {content:fill:temp_av_value}°C)</span>
|
||||||
|
</div>
|
||||||
|
<div class="mod_footer">
|
||||||
|
<nobr><span class="mod_max">max: {content:fill:temp_max_val}°C</span><span class="mod_min">min: {content:fill:temp_min_val}°C</span></nobr>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="val_elm">
|
||||||
|
<a href="{content:addSetLink:full}" class="mod_small_link">
|
||||||
|
<div class="mod_header">
|
||||||
|
<h4 class="mod_subheadline">Luftfeuchte</h4>
|
||||||
|
</div>
|
||||||
|
<div class="mod_body">
|
||||||
|
<span class="mod_now">{content:fill:hum_now_val}%</span>
|
||||||
|
<span class="mod_av">(Ø {content:fill:hum_av_value}%)</span>
|
||||||
|
</div>
|
||||||
|
<div class="mod_footer">
|
||||||
|
<nobr><span class="mod_max">max: {content:fill:hum_max_val}%</span><span class="mod_min">min: {content:fill:temp_min_val}%</span></nobr>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="val_elm">
|
||||||
|
<a href="{content:addSetLink:full}" class="mod_small_link">
|
||||||
|
<div class="mod_header">
|
||||||
|
<h4 class="mod_subheadline">Luftdruck</h4>
|
||||||
|
</div>
|
||||||
|
<div class="mod_body">
|
||||||
|
<span class="mod_now">{content:fill:press_now_val}hPa</span>
|
||||||
|
<span class="mod_av">(Ø {content:fill:press_av_value}hPa)</span>
|
||||||
|
</div>
|
||||||
|
<div class="mod_footer">
|
||||||
|
<nobr><span class="mod_max">max: {content:fill:press_max_val}hPa</span><span class="mod_min">min: {content:fill:press_min_val}0hPa</span></nobr>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<h4 class="mod_subhead">Aktuelle Werte</h4>
|
<h4 class="mod_subhead">Aktuelle Werte</h4>
|
||||||
<table class="mod_rain_now_data">
|
<table class="mod_rain_now_data">
|
||||||
<tr class="mod_rain_hour_row">
|
<tr class="mod_rain_hour_row">
|
||||||
<td class="mod_line_desc">Letze Stunde:</td><td class="mod_line_val">{content:fill:rain_now_hour} <sup>l</sup>/<sub>m<sup>2</sup><sub></td>
|
<td class="mod_line_desc">Letze Stunde:</td><td class="mod_line_val">{content:fill:rain_now_hour} <sup>l</sup>/<sub>m<sup>2</sup></sub></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_rain_day_row">
|
<tr class="mod_rain_day_row">
|
||||||
<td class="mod_line_desc">Heute:</td><td class="mod_line_val">{content:fill:rain_now_day} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td> </td>
|
<td class="mod_line_desc">Heute:</td><td class="mod_line_val">{content:fill:rain_now_day} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td> </td>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
|
||||||
|
<ul class="val_list">
|
||||||
|
<li class="val_elm">
|
||||||
|
<a href="{content:addSetLink:full}" class="mod_small_link">
|
||||||
|
<div class="mod_header">
|
||||||
|
<h4 class="mod_subheadline">Regen</h4>
|
||||||
|
</div>
|
||||||
|
<div class="mod_body">
|
||||||
|
<span class="mod_now">Stunde: {content:fill:rain_now_hour} <sup>l</sup>/<sub>m<sup>2</sup></sub></span>
|
||||||
|
<span class="mod_av">(Tag: {content:fill:rain_now_day} <sup>l</sup>/<sub>m<sup>2</sup></sub>)</span>
|
||||||
|
</div>
|
||||||
|
<div class="mod_footer">
|
||||||
|
<nobr><span class="mod_max">max (Stunde): {content:fill:rain_max_hour_val} <sup>l</sup>/<sub>m<sup>2</sup></sub></span> <span class="mod_min">max (Tag): {content:fill:rain_max_day_val} <sup>l</sup>/<sub>m<sup>2</sup></sub></span></nobr>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
|
||||||
|
<ul class="val_list">
|
||||||
|
<li class="val_elm">
|
||||||
|
<a href="{content:addSetLink:full}" class="mod_small_link">
|
||||||
|
<div class="mod_header">
|
||||||
|
<h4 class="mod_subheadline">Wind</h4>
|
||||||
|
</div>
|
||||||
|
<div class="mod_body">
|
||||||
|
<span class="mod_now">{content:fill:wind_now_val} <sup>km</sup>/<sub>h</sub></span>
|
||||||
|
<span class="mod_now_extra"> Aus: {content:fill:wind_now_dir_full}</span>
|
||||||
|
<span class="mod_av">(Ø {content:fill:wind_av_value} <sup>km</sup>/<sub>h</sub>)</span>
|
||||||
|
</div>
|
||||||
|
<div class="mod_footer">
|
||||||
|
<nobr><span class="mod_max">max: {content:fill:wind_max_val} <sup>km</sup>/<sub>h</sub></span> <span class="mod_min">Aus: {content:fill:wind_max_dir_full}</span></nobr>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
|
@ -122,8 +122,6 @@ div.back_link_div {
|
||||||
background: #fafafa;
|
background: #fafafa;
|
||||||
border: 1px solid #aa8888;
|
border: 1px solid #aa8888;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
/*width: 80px;
|
|
||||||
height: 20px;*/
|
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
margin:5px;
|
margin:5px;
|
||||||
left: 0px;
|
left: 0px;
|
||||||
|
|
@ -140,7 +138,7 @@ div.back_link_div a.back_link {
|
||||||
}
|
}
|
||||||
|
|
||||||
div.chart {
|
div.chart {
|
||||||
overflow:auto;
|
overflow:auto;
|
||||||
padding:10px;
|
padding:10px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 820px;
|
width: 820px;
|
||||||
|
|
@ -148,7 +146,7 @@ overflow:auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.report {
|
div.report {
|
||||||
width:400px;
|
/* width:400px;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
div.report div.rpt_subsec {
|
div.report div.rpt_subsec {
|
||||||
|
|
@ -181,5 +179,148 @@ div.report div.rpt_subsec table.report_table tr.report_line:hover {
|
||||||
background: #FFb696;
|
background: #FFb696;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.small_set {
|
||||||
|
border-color: #D0B080;
|
||||||
|
border-style: dotted;
|
||||||
|
border-width: 1px;
|
||||||
|
padding: 8px;
|
||||||
|
position:relative;
|
||||||
|
width:660px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module {
|
||||||
|
margin:2px;
|
||||||
|
background: #FFEBBB;
|
||||||
|
position:relative;
|
||||||
|
height:135px;
|
||||||
|
overflow:hidden;
|
||||||
|
text-align:center;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module {
|
||||||
|
height:155px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module h3.mod_headline{
|
||||||
|
font-size: 11pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module ul.val_list{
|
||||||
|
margin:0;
|
||||||
|
margin-left:9px;
|
||||||
|
padding:0;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module li.val_elm{
|
||||||
|
float:left;
|
||||||
|
list-style:none;
|
||||||
|
padding:0;
|
||||||
|
margin:0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link {
|
||||||
|
text-decoration: none;
|
||||||
|
background: #F8DDAD;
|
||||||
|
display: block;
|
||||||
|
position: relative;
|
||||||
|
width: 305px;
|
||||||
|
height: 100px;
|
||||||
|
border: 1px solid #aa8888;
|
||||||
|
margin: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module#windsSmall_2 a.mod_small_link, div.small_set div.module#regenSmall_3 a.mod_small_link {
|
||||||
|
width: 618px;
|
||||||
|
height: 120px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module#innenSmall_1 a.mod_small_link {
|
||||||
|
width: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link:hover {
|
||||||
|
background: #FFeebb;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_header{
|
||||||
|
background: #F0D0AF;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_header h4{
|
||||||
|
margin:0px;
|
||||||
|
padding:2px;
|
||||||
|
font-size:10pt;
|
||||||
|
font-weight:900;
|
||||||
|
color: #222255;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_body {
|
||||||
|
position:absolute;
|
||||||
|
bottom:0px;
|
||||||
|
top:0px;
|
||||||
|
height:100%;
|
||||||
|
width:100%;
|
||||||
|
}
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_body span.mod_now {
|
||||||
|
font-size: 17pt;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #225522;
|
||||||
|
display:block;
|
||||||
|
padding-bottom:3pt;
|
||||||
|
padding-top:26pt;
|
||||||
|
}
|
||||||
|
div.small_set div.module#windsSmall_2 a.mod_small_link div.mod_body span.mod_now, div.small_set div.module#regenSmall_3 a.mod_small_link div.mod_body span.mod_now {
|
||||||
|
font-size: 17pt;
|
||||||
|
padding-top:20pt;
|
||||||
|
padding-bottom:0pt;
|
||||||
|
}
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_body span.mod_now_extra {
|
||||||
|
font-size: 8pt;
|
||||||
|
padding-top:0pt;
|
||||||
|
padding-bottom:3pt;
|
||||||
|
color: #446644;
|
||||||
|
display:block;
|
||||||
|
margin:0px;
|
||||||
|
}
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_body span.mod_av {
|
||||||
|
font-size: 11pt;
|
||||||
|
color: #446644;
|
||||||
|
position:absolute;
|
||||||
|
display:block;
|
||||||
|
width:100%;
|
||||||
|
text-align:center;
|
||||||
|
bottom:19px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module#windsSmall_2 a.mod_small_link div.mod_body span.mod_av, div.small_set div.module#regenSmall_3 a.mod_small_link div.mod_body span.mod_av {
|
||||||
|
bottom:21px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_body, div.small_set div.module a.mod_small_link div.mod_footer{
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_footer {
|
||||||
|
position:absolute;
|
||||||
|
bottom:0px;
|
||||||
|
width: 100%;
|
||||||
|
background:#F0D0AF;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_footer span{
|
||||||
|
font-size:9pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_footer span.mod_max {
|
||||||
|
color: #AA3333;
|
||||||
|
margin-right:6px;
|
||||||
|
}
|
||||||
|
div.small_set div.module a.mod_small_link div.mod_footer span.mod_min {
|
||||||
|
color: #33AA33;
|
||||||
|
margin-left:6px;
|
||||||
|
}
|
||||||
|
div.small_set div.module#windsSmall_2 a.mod_small_link div.mod_footer span.mod_min, div.small_set div.module#regenSmall_3 a.mod_small_link div.mod_footer span.mod_min {
|
||||||
|
color: #AA3333;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
$pg_pass = "";
|
$pg_pass = "";
|
||||||
|
|
||||||
/* Default-Werte */
|
/* Default-Werte */
|
||||||
$default_set = "test";
|
$default_set = "small";
|
||||||
$default_chart_dir = "images/chart/";
|
$default_chart_dir = "images/chart/";
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -14,33 +14,33 @@
|
||||||
/* Graphen - Bilder */
|
/* Graphen - Bilder */
|
||||||
$cImg = array(
|
$cImg = array(
|
||||||
/* Bild - Id Dateiname Link - Name Link - Beschreibung Vorschaubild Set */
|
/* Bild - Id Dateiname Link - Name Link - Beschreibung Vorschaubild Set */
|
||||||
'temp_10_1' => array( "temp_ex.png", "Liniendiagram", "Zeigt den Temparaturverlauf der letzten 10 Tage in einem Diagram", null, "chart"),
|
'temp_10_1' => array( "temp_ex.png", "Liniendiagramm", "Zeigt den Temparaturverlauf der letzten 10 Tage in einem Diagramm", null, "chart"),
|
||||||
'temp_30_1' => array( "temp_ex.png", "Liniendiagram", "Zeigt den Temparaturverlauf der letzten 30 Tage in einem Diagram", null, "chart"),
|
'temp_30_1' => array( "temp_ex.png", "Liniendiagramm", "Zeigt den Temparaturverlauf der letzten 30 Tage in einem Diagramm", null, "chart"),
|
||||||
'temp_365_1' => array( "temp_ex.png", "Liniendiagram", "Zeigt den Temparaturverlauf des letzten Jahres in einem Diagram", null, "chart"),
|
'temp_365_1' => array( "temp_ex.png", "Liniendiagramm", "Zeigt den Temparaturverlauf des letzten Jahres in einem Diagramm", null, "chart"),
|
||||||
|
|
||||||
'hum_10_1' => array( "hum_ex.png", "Liniendiagram", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 10 Tagen als Diagram", null, "chart"),
|
'hum_10_1' => array( "hum_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 10 Tagen als Diagramm", null, "chart"),
|
||||||
'hum_30_1' => array( "hum_ex.png", "Liniendiagram", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 30 Tagen als Diagram", null, "chart"),
|
'hum_30_1' => array( "hum_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 30 Tagen als Diagramm", null, "chart"),
|
||||||
'hum_365_1' => array( "hum_ex.png", "Liniendiagram", "Zeigt den Verlauf der Luftfeuchtigkeit im letztem Jahr als Diagram", null, "chart"),
|
'hum_365_1' => array( "hum_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Luftfeuchtigkeit im letztem Jahr als Diagramm", null, "chart"),
|
||||||
|
|
||||||
'press_10_1' => array( "press_ex.png", "Liniendiagram", "Zeigt den Verlauf des Luftdrucks in den letzten 10 Tagen als Diagram", null, "chart"),
|
'press_10_1' => array( "press_ex.png", "Liniendiagramm", "Zeigt den Verlauf des Luftdrucks in den letzten 10 Tagen als Diagramm", null, "chart"),
|
||||||
'press_30_1' => array( "press_ex.png", "Liniendiagram", "Zeigt den Verlauf des Luftdrucks in den letzten 30 Tagen als Diagram", null, "chart"),
|
'press_30_1' => array( "press_ex.png", "Liniendiagramm", "Zeigt den Verlauf des Luftdrucks in den letzten 30 Tagen als Diagramm", null, "chart"),
|
||||||
'press_365_1' => array( "press_ex.png", "Liniendiagram", "Zeigt den Verlauf des Luftdrucks im letztem Jahr als Diagram", null, "chart"),
|
'press_365_1' => array( "press_ex.png", "Liniendiagramm", "Zeigt den Verlauf des Luftdrucks im letztem Jahr als Diagramm", null, "chart"),
|
||||||
|
|
||||||
'rain_10_3' => array( "rain_ex.png", "Balkendiagram", "Zeigt die Niederschlagsmengen der letzten 10 Tage als Diagram", null, "chart"),
|
'rain_10_3' => array( "rain_ex.png", "Balkendiagramm", "Zeigt die Niederschlagsmengen der letzten 10 Tage als Diagramm", null, "chart"),
|
||||||
'rain_30_3' => array( "rain_ex.png", "Balkendiagram", "Zeigt die Niederschlagsmengen der letzten 30 Tage als Diagram", null, "chart"),
|
'rain_30_3' => array( "rain_ex.png", "Balkendiagramm", "Zeigt die Niederschlagsmengen der letzten 30 Tage als Diagramm", null, "chart"),
|
||||||
'rain_365_3' => array( "rain_ex.png", "Balkendiagram", "Zeigt die Niederschlagsmengen des letzten Jahres als Diagram", null, "chart"),
|
'rain_365_3' => array( "rain_ex.png", "Balkendiagramm", "Zeigt die Niederschlagsmengen des letzten Jahres als Diagramm", null, "chart"),
|
||||||
|
|
||||||
'wind_10_2' => array( "wind_ex.png", "Liniendiagram", "Zeigt den Verlauf der Windgeschwindigkeit in den letzten 10 Tagen als Diagram",null, "chart"),
|
'wind_10_2' => array( "wind_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Windgeschwindigkeit in den letzten 10 Tagen als Diagramm",null, "chart"),
|
||||||
'wind_30_2' => array( "wind_ex.png", "Liniendiagram", "Zeigt den Verlauf der Windgeschwindigkeit in den letzten 30 Tagen als Diagram",null, "chart"),
|
'wind_30_2' => array( "wind_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Windgeschwindigkeit in den letzten 30 Tagen als Diagramm",null, "chart"),
|
||||||
'wind_365_2' => array( "wind_ex.png", "Liniendiagram", "Zeigt den Verlauf der Windgeschwindigkeit im letzten Jahr als Diagram", null, "chart"),
|
'wind_365_2' => array( "wind_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Windgeschwindigkeit im letzten Jahr als Diagramm", null, "chart"),
|
||||||
|
|
||||||
'temp_10_4' => array( "temp_ex.png", "Liniendiagram", "Zeigt den Temparaturverlauf der letzten 10 Tage in einem Diagram", null, "chart"),
|
'temp_10_4' => array( "temp_ex.png", "Liniendiagramm", "Zeigt den Temparaturverlauf der letzten 10 Tage in einem Diagramm", null, "chart"),
|
||||||
'temp_30_4' => array( "temp_ex.png", "Liniendiagram", "Zeigt den Temparaturverlauf der letzten 30 Tage in einem Diagram", null, "chart"),
|
'temp_30_4' => array( "temp_ex.png", "Liniendiagramm", "Zeigt den Temparaturverlauf der letzten 30 Tage in einem Diagramm", null, "chart"),
|
||||||
'temp_365_4' => array( "temp_ex.png", "Liniendiagram", "Zeigt den Temparaturverlauf des letzten Jahres in einem Diagram", null, "chart"),
|
'temp_365_4' => array( "temp_ex.png", "Liniendiagramm", "Zeigt den Temparaturverlauf des letzten Jahres in einem Diagramm", null, "chart"),
|
||||||
|
|
||||||
'hum_10_4' => array( "hum_ex.png", "Liniendiagram", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 10 Tagen als Diagram", null, "chart"),
|
'hum_10_4' => array( "hum_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 10 Tagen als Diagramm", null, "chart"),
|
||||||
'hum_30_4' => array( "hum_ex.png", "Liniendiagram", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 30 Tagen als Diagram", null, "chart"),
|
'hum_30_4' => array( "hum_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Luftfeuchtigkeit in den letzten 30 Tagen als Diagramm", null, "chart"),
|
||||||
'hum_365_4' => array( "hum_ex.png", "Liniendiagram", "Zeigt den Verlauf der Luftfeuchtigkeit im letztem Jahr als Diagram", null, "chart"),
|
'hum_365_4' => array( "hum_ex.png", "Liniendiagramm", "Zeigt den Verlauf der Luftfeuchtigkeit im letztem Jahr als Diagramm", null, "chart"),
|
||||||
'' => array( "", "", "", null, "chart")
|
'' => array( "", "", "", null, "chart")
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<?
|
<?
|
||||||
include_once("php_inc/parser.inc.php"); /* Parser */
|
include_once("php_inc/parser.inc.php"); /* Parser */
|
||||||
include_once("php_inc/chart.inc.php"); /* Chart */
|
include_once("php_inc/chart.inc.php"); /* Chart */
|
||||||
|
include_once("php_inc/module_set.inc.php");
|
||||||
include_once("php_inc/modules/sensor.inc.php"); /* Sensor-Klasse */
|
include_once("php_inc/modules/sensor.inc.php"); /* Sensor-Klasse */
|
||||||
include_once("php_inc/modules/temp.inc.php"); /* Temp-Klasse */
|
include_once("php_inc/modules/temp.inc.php"); /* Temp-Klasse */
|
||||||
include_once("php_inc/modules/rain.inc.php"); /* Rain-Klasse */
|
include_once("php_inc/modules/rain.inc.php"); /* Rain-Klasse */
|
||||||
|
|
@ -110,5 +111,9 @@ class Module{
|
||||||
Chart::insertChart($chartName);
|
Chart::insertChart($chartName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addSetLink($setName){
|
||||||
|
return $_SERVER['PHP_SELF'].'?setType='.$setName;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ class ModuleSet{
|
||||||
/* Konstruktor */
|
/* Konstruktor */
|
||||||
function ModuleSet($setName){
|
function ModuleSet($setName){
|
||||||
$parser = & $this->_getParserInstance(); /* Parserinstanz holen */
|
$parser = & $this->_getParserInstance(); /* Parserinstanz holen */
|
||||||
$parser->parseContent($this->_getSetFilename($setName), &$this, NULL); /* Set Parsen */
|
$parser->parseContent($this->_getSetFilename($setName), &$this, NULL, true); /* Set Parsen */
|
||||||
|
|
||||||
if($_REQUEST['chartName'] != "" || $_REQUEST['rptName'] != ""){
|
if($_REQUEST['chartName'] != "" || $_REQUEST['rptName'] != ""){
|
||||||
$parser->appendContent($this->getBackLink());
|
$parser->appendContent($this->getBackLink());
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ class Press{
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_min_val(){
|
function get_min_val(){
|
||||||
return $this->minPress * 0.1;
|
return $this->minPress;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_min_date(){
|
function get_min_date(){
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,11 @@ class Parser{
|
||||||
if(is_array($newContent)){
|
if(is_array($newContent)){
|
||||||
for($i = 0; $i < count($newContent); $i++){
|
for($i = 0; $i < count($newContent); $i++){
|
||||||
array_push($this->contentArray, $newContent[$i]);
|
array_push($this->contentArray, $newContent[$i]);
|
||||||
|
//echo $newContent[$i]."\n";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
array_push($this->contentArray, $newContent);
|
array_push($this->contentArray, $newContent);
|
||||||
|
//echo $newContent."\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -31,7 +33,7 @@ class Parser{
|
||||||
|
|
||||||
|
|
||||||
/* File Parsen */
|
/* File Parsen */
|
||||||
function parseContent($fileName, & $callingObject, $filePart=null){
|
function parseContent($fileName, & $callingObject, $filePart=null, $lineWise = false){
|
||||||
$fileArray = file($fileName); /* File als Array einlesen */
|
$fileArray = file($fileName); /* File als Array einlesen */
|
||||||
if($filePart != null){
|
if($filePart != null){
|
||||||
$fileArray = $this->_fetchFilePart(&$fileArray, $filePart); /* Wenn File aus mehreren Template-Teilen besteht, dann wird hir der relevante Zeil geholt */
|
$fileArray = $this->_fetchFilePart(&$fileArray, $filePart); /* Wenn File aus mehreren Template-Teilen besteht, dann wird hir der relevante Zeil geholt */
|
||||||
|
|
@ -44,9 +46,14 @@ class Parser{
|
||||||
$fileArray[$i] = preg_replace("/\{content:".$results[1][$j].":".$results[2][$j]."\}/i", $insert, $fileArray[$i]);
|
$fileArray[$i] = preg_replace("/\{content:".$results[1][$j].":".$results[2][$j]."\}/i", $insert, $fileArray[$i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if ($lineWise){
|
||||||
|
$this->appendContent($fileArray[$i]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if (!$lineWise){
|
||||||
$this->appendContent($fileArray);
|
$this->appendContent($fileArray);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Sucht innerhalb eines Template-Files nach dem richtigem Template-stück
|
/* Sucht innerhalb eines Template-Files nach dem richtigem Template-stück
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue