Rail-Module for Frontend added
git-svn-id: file:///home/jan/tmp/wetterstation/trunk@35 dd492736-c11a-0410-ad51-8c26713eaf7f
This commit is contained in:
parent
1eb9283ddf
commit
cf5a6eed70
|
|
@ -1 +1 @@
|
||||||
{content:addModule:press_1}{content:addModule:hum_1}{content:addModule:hum_4}{content:addModule:rain_3}{content:addModule:temp_1}{content:addModule:temp_4}
|
{content:addModule:wind_2}{content:addModule:press_1}{content:addModule:hum_1}{content:addModule:hum_4}{content:addModule:rain_3}{content:addModule:temp_1}{content:addModule:temp_4}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<td class="mod_line_desc">Durchschnitt ({content:fill:hum_av_interval} min.):</td><td class="mod_line_val">{content:fill:hum_av_value}%</td><td> </td>
|
<td class="mod_line_desc">Durchschnitt ({content:fill:hum_av_interval} min.):</td><td class="mod_line_val">{content:fill:hum_av_value}%</td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_hum_moving_row">
|
<tr class="mod_hum_moving_row">
|
||||||
<td class="mod_line_desc">Tendenz (2 std.):</td><td class="mod_line_val">{content:fill:hum_changing}</td><td> </td>
|
<td class="mod_line_desc">Tendenz (2 std.):</td><td class="mod_line_mov_val" colspan=2>{content:fill:hum_changing}</td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<h4 class="mod_subhead">Extrema</h4>
|
<h4 class="mod_subhead">Extrema</h4>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<td class="mod_line_desc">Durchschnitt ({content:fill:press_av_interval} min.):</td><td class="mod_line_val">{content:fill:press_av_value} hPa</td><td> </td>
|
<td class="mod_line_desc">Durchschnitt ({content:fill:press_av_interval} min.):</td><td class="mod_line_val">{content:fill:press_av_value} hPa</td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_press_moving_row">
|
<tr class="mod_press_moving_row">
|
||||||
<td class="mod_line_desc">Tendenz (2 std.):</td><td class="mod_line_val">{content:fill:press_changing}</td><td> </td>
|
<td class="mod_line_desc">Tendenz (2 std.):</td><td class="mod_line_mov_val" colspan=2>{content:fill:press_changing}</td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<h4 class="mod_subhead">Extrema</h4>
|
<h4 class="mod_subhead">Extrema</h4>
|
||||||
|
|
|
||||||
|
|
@ -3,33 +3,33 @@
|
||||||
<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} l/m<sup>2</sup></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} l/m<sup>2</sup></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>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_rain_month_row">
|
<tr class="mod_rain_month_row">
|
||||||
<td class="mod_line_desc">Diesen Monat:</td><td class="mod_line_val">{content:fill:rain_now_month} l/m<sup>2</sup></td><td> </td>
|
<td class="mod_line_desc">Diesen Monat:</td><td class="mod_line_val">{content:fill:rain_now_month} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_rain_year_row">
|
<tr class="mod_rain_year_row">
|
||||||
<td class="mod_line_desc">Dies Jahr:</td><td class="mod_line_val">{content:fill:rain_now_year} l/m<sup>2</sup></td><td> </td>
|
<td class="mod_line_desc">Dies Jahr:</td><td class="mod_line_val">{content:fill:rain_now_year} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_rain_all_row">
|
<tr class="mod_rain_all_row">
|
||||||
<td class="mod_line_desc">Seit Messbegin:</td><td class="mod_line_val">{content:fill:rain_now_all} l/m<sup>2</sup></td><td> </td>
|
<td class="mod_line_desc">Seit Messbegin:</td><td class="mod_line_val">{content:fill:rain_now_all} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<h4 class="mod_subhead">Extrema</h4>
|
<h4 class="mod_subhead">Extrema</h4>
|
||||||
<table>
|
<table>
|
||||||
<tr class="mod_rain_max_hour_row">
|
<tr class="mod_rain_max_hour_row">
|
||||||
<td class="mod_line_desc">Regenreichste Stunde:</td><td class="mod_line_val">{content:fill:rain_max_hour_val} l/m<sup>2</sup></td><td class="mod_line_date">{content:fill:rain_max_hour_date}</td>
|
<td class="mod_line_desc">Regenreichste Stunde:</td><td class="mod_line_val">{content:fill:rain_max_hour_val} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td class="mod_line_date">{content:fill:rain_max_hour_date}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_rain_max_day_row">
|
<tr class="mod_rain_max_day_row">
|
||||||
<td class="mod_line_desc">Regenreichster Tag:</td><td class="mod_line_val">{content:fill:rain_max_day_val} l/m<sup>2</sup></td><td class="mod_line_date">{content:fill:rain_max_day_date}</td>
|
<td class="mod_line_desc">Regenreichster Tag:</td><td class="mod_line_val">{content:fill:rain_max_day_val} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td class="mod_line_date">{content:fill:rain_max_day_date}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_rain_max_month_row">
|
<tr class="mod_rain_max_month_row">
|
||||||
<td class="mod_line_desc">Regenreichster Monat:</td><td class="mod_line_val">{content:fill:rain_max_month_val} l/m<sup>2</sup></td><td class="mod_line_date">{content:fill:rain_max_month_date}</td>
|
<td class="mod_line_desc">Regenreichster Monat:</td><td class="mod_line_val">{content:fill:rain_max_month_val} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td class="mod_line_date">{content:fill:rain_max_month_date}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_rain_max_year_row">
|
<tr class="mod_rain_max_year_row">
|
||||||
<td class="mod_line_desc">Regenreichstes Jahr:</td><td class="mod_line_val">{content:fill:rain_max_year_val} l/m<sup>2</sup></td><td class="mod_line_date">{content:fill:rain_max_year_date}</td>
|
<td class="mod_line_desc">Regenreichstes Jahr:</td><td class="mod_line_val">{content:fill:rain_max_year_val} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td class="mod_line_date">{content:fill:rain_max_year_date}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<td class="mod_line_desc">Durchschnitt ({content:fill:temp_av_interval} min.):</td><td class="mod_line_val">{content:fill:temp_av_value}°C</td><td> </td>
|
<td class="mod_line_desc">Durchschnitt ({content:fill:temp_av_interval} min.):</td><td class="mod_line_val">{content:fill:temp_av_value}°C</td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="mod_temp_moving_row">
|
<tr class="mod_temp_moving_row">
|
||||||
<td class="mod_line_desc">Tendenz (2 std.):</td><td class="mod_line_val">{content:fill:temp_changing}</td><td> </td>
|
<td class="mod_line_desc">Tendenz (2 std.):</td><td class="mod_line_mov_val" colspan=2>{content:fill:temp_changing}</td><td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<h4 class="mod_subhead">Extrema</h4>
|
<h4 class="mod_subhead">Extrema</h4>
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ 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 */
|
||||||
include_once("php_inc/modules/hum.inc.php"); /* Hum-Klasse */
|
include_once("php_inc/modules/hum.inc.php"); /* Hum-Klasse */
|
||||||
include_once("php_inc/modules/press.inc.php"); /* Press-Klasse */
|
include_once("php_inc/modules/press.inc.php"); /* Press-Klasse */
|
||||||
|
include_once("php_inc/modules/wind.inc.php"); /* Wind-Klasse */
|
||||||
|
|
||||||
/* Representiert ein Modul */
|
/* Representiert ein Modul */
|
||||||
class Module{
|
class Module{
|
||||||
|
|
@ -17,6 +18,8 @@ class Module{
|
||||||
var $tempInstance = NULL; /* Temp-Instanz */
|
var $tempInstance = NULL; /* Temp-Instanz */
|
||||||
var $rainInstance = NULL; /* Rain-Instanz */
|
var $rainInstance = NULL; /* Rain-Instanz */
|
||||||
var $humInstance = NULL; /* Hum-Instanz */
|
var $humInstance = NULL; /* Hum-Instanz */
|
||||||
|
var $windInstance = NULL; /* Wind-Instanz */
|
||||||
|
var $pressInstance = NULL; /* Press-Instanz */
|
||||||
|
|
||||||
/* Konstruktor */
|
/* Konstruktor */
|
||||||
function Module($modName, $sensId, &$parser, &$connection){
|
function Module($modName, $sensId, &$parser, &$connection){
|
||||||
|
|
@ -71,6 +74,13 @@ class Module{
|
||||||
return $this->pressInstance;
|
return $this->pressInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Instanz der Wind-Klasse holen */
|
||||||
|
function &_get_wind(){
|
||||||
|
if($this->windInstance == NULL)
|
||||||
|
$this->windInstance = new Wind($this->sensId, $this->connection);
|
||||||
|
return $this->windInstance;
|
||||||
|
}
|
||||||
|
|
||||||
/* Callback-Funktion, wird ausgeführt wenn {content:fill:xyz} gefunden wird */
|
/* Callback-Funktion, wird ausgeführt wenn {content:fill:xyz} gefunden wird */
|
||||||
function fill($contentId){
|
function fill($contentId){
|
||||||
$content_split = explode("_", $contentId); /* Modultyp bekommen */
|
$content_split = explode("_", $contentId); /* Modultyp bekommen */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue