|
@@ -188,13 +188,13 @@
|
|
|
</tr>
|
|
|
#if $day.inTemp.has_data
|
|
|
<tr>
|
|
|
- <td>Inside Temperature</td>
|
|
|
+ <td>Well House Temperature</td>
|
|
|
<td>$current.inTemp</td>
|
|
|
</tr>
|
|
|
#end if
|
|
|
#if $day.inHumidity.has_data
|
|
|
<tr>
|
|
|
- <td>Inside Humidity</td>
|
|
|
+ <td>Well House Humidity</td>
|
|
|
<td>$current.inHumidity</td>
|
|
|
</tr>
|
|
|
#end if
|
|
@@ -210,6 +210,18 @@
|
|
|
<td>$current.UV</td>
|
|
|
</tr>
|
|
|
#end if
|
|
|
+ #if $day.soilMoist1.has_data
|
|
|
+ <tr>
|
|
|
+ <td>Soil moisture - Road side</td>
|
|
|
+ <td>$current.soilMoist1</td>
|
|
|
+ </tr>
|
|
|
+ #end if
|
|
|
+ #if $day.soilMoist2.has_data
|
|
|
+ <tr>
|
|
|
+ <td>Soil moisture - Stable side</td>
|
|
|
+ <td>$current.soilMoist2</td>
|
|
|
+ </tr>
|
|
|
+ #end if
|
|
|
#if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
|
|
|
<tr>
|
|
|
<td>Evapotranspiration</td>
|
|
@@ -330,24 +342,24 @@
|
|
|
</tr>
|
|
|
#if $day.inTemp.has_data
|
|
|
<tr>
|
|
|
- <td>High Inside Temperature</td>
|
|
|
+ <td>High Well House Temperature</td>
|
|
|
<td>$day.inTemp.max</td>
|
|
|
<td>$day.inTemp.maxtime</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>Low Inside Temperature</td>
|
|
|
+ <td>Low Well House Temperature</td>
|
|
|
<td>$day.inTemp.min</td>
|
|
|
<td>$day.inTemp.mintime</td>
|
|
|
</tr>
|
|
|
#end if
|
|
|
#if $day.inHumidity.has_data
|
|
|
<tr>
|
|
|
- <td>High Inside Humidity</td>
|
|
|
+ <td>High Well House Humidity</td>
|
|
|
<td>$day.inHumidity.max</td>
|
|
|
<td>$day.inHumidity.maxtime</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>Low Inside Humidity</td>
|
|
|
+ <td>Low Well House Humidity</td>
|
|
|
<td>$day.inHumidity.min</td>
|
|
|
<td>$day.inHumidity.mintime</td>
|
|
|
</tr>
|
|
@@ -411,8 +423,8 @@
|
|
|
#end if
|
|
|
</table>
|
|
|
</div>
|
|
|
- <!--Leap Year Code -->
|
|
|
- <!--If this year was a leap year -->
|
|
|
+
|
|
|
+ <!--Leap Year Code -->
|
|
|
#set $yr = int($day.dateTime.format("%Y"))%4
|
|
|
#if $yr == 0
|
|
|
#if $yr % 100 == 0
|
|
@@ -437,20 +449,17 @@
|
|
|
#end if
|
|
|
#end if
|
|
|
#else
|
|
|
- <!--If last year was a leap year -->
|
|
|
- #set $yrNew = ($yr - 1)
|
|
|
- #if $yrNew % 100 == 0
|
|
|
- #if $yrNew % 400 == 0
|
|
|
- #if $day.dateTime.format("%d-%b") < '01-Mar'
|
|
|
- #set $n = 366
|
|
|
- #else
|
|
|
- #set $n = 365
|
|
|
- #end if
|
|
|
+ #set $yrNew = ($yr - 1)
|
|
|
+ #if $yrNew % 100 == 0
|
|
|
+ #if $yrNew % 400 == 0
|
|
|
+ #if $day.dateTime.format("%d-%b") < '01-Mar'
|
|
|
+ #set $n = 367
|
|
|
#else
|
|
|
- #set $n = 365
|
|
|
+ #set $n = 366
|
|
|
#end if
|
|
|
+ #end if
|
|
|
#else
|
|
|
- #set $n = 365
|
|
|
+ #set $n = 366
|
|
|
#end if
|
|
|
#end if
|
|
|
#if $days_ago($days_ago=$n).outTemp.max.string != " N/A"
|
|
@@ -514,24 +523,24 @@
|
|
|
</tr>
|
|
|
#if $days_ago($days_ago=$n).inTemp.has_data
|
|
|
<tr>
|
|
|
- <td>High Inside Temperature</td>
|
|
|
+ <td>High Well House Temperature</td>
|
|
|
<td>$days_ago($days_ago=$n).inTemp.max</td>
|
|
|
<td>$days_ago($days_ago=$n).inTemp.maxtime</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>Low Inside Temperature</td>
|
|
|
+ <td>Low Well House Temperature</td>
|
|
|
<td>$days_ago($days_ago=$n).inTemp.min</td>
|
|
|
<td>$days_ago($days_ago=$n).inTemp.mintime</td>
|
|
|
</tr>
|
|
|
#end if
|
|
|
#if $days_ago($days_ago=$n).inHumidity.has_data
|
|
|
<tr>
|
|
|
- <td>High Inside Humidity</td>
|
|
|
+ <td>High Well House Humidity</td>
|
|
|
<td>$days_ago($days_ago=$n).inHumidity.max</td>
|
|
|
<td>$days_ago($days_ago=$n).inHumidity.maxtime</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>Low Inside Humidity</td>
|
|
|
+ <td>Low Well House Humidity</td>
|
|
|
<td>$days_ago($days_ago=$n).inHumidity.min</td>
|
|
|
<td>$days_ago($days_ago=$n).inHumidity.mintime</td>
|
|
|
</tr>
|
|
@@ -821,9 +830,9 @@
|
|
|
<img src="daywindvec.png" alt="Wind Vector" />
|
|
|
<img src="daybarometer.png" alt="barometer"/>
|
|
|
#if $day.inTemp.has_data
|
|
|
- <img src="dayinside.png" alt="Inside" />
|
|
|
+ <img src="dayinside.png" alt="Well House" />
|
|
|
#end if
|
|
|
- <img src="dayinhumid.png" alt="Inside/Outside Humidity" />
|
|
|
+ <img src="dayinhumid.png" alt="Well House/Outside Humidity" />
|
|
|
#if $day.radiation.has_data
|
|
|
<img src="dayradiation.png" alt="Radiation" />
|
|
|
#end if
|