Bug fixes mostly with ET

Fixed bug in handling Evapotranspiration (ET) values. ET is calculated by WeeWx if your station has certain equipment. The skin will now be able to display iET if there is data.

index.html.tmpl

@@ -7,16 +7,16 @@
     <!-- Google verification tag -->
     <meta name="google-site-verification" content="skDuSC68YDlkfq2GfylRvmzM4WE5RgCKZIV275lKZ1A" />
     #if $Extras.has_key('cwop')
-    <meta name="description" content="A $station.hardware weather station reporting current weather conditions from $station.location ($Extras.cwop). This web site is powered by WeeWx. ">
+    <meta name="description" content="A $station.hardware weather station reporting current weather conditions from the Century Farm Subdivision in $station.location ($Extras.cwop). This web site is powered by WeeWx. ">
     #else
-    <meta name="description" content="A $station.hardware weather station reporting current weather conditions from $station.location. This web site is powered by WeeWx. ">
+    <meta name="description" content="A $station.hardware weather station reporting current weather conditions from the Century Farm Subdivision in $station.location. This web site is powered by WeeWx. ">
     #end if
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="profile" href="http://gmpg.org/xfn/11" />
     #if $Extras.has_key('web_url')
     <link rel="canonical" href="$Extras.web_url"/>
     #end if
-    <title>Current Weather Conditions for $station.location</title>
+    <title>$station.location Current Weather Conditions</title>
     <!-- Open Graph -->
     #if $Extras.has_key('cwop')
     <meta property="og:site_name" content="$station.location Weather Station ($Extras.cwop)" />
@@ -188,18 +188,18 @@
                 <td>Rain Rate</td>
                 <td>$current.rainRate</td>
               </tr>
-	      #if $day.inTemp.has_data
+              #if $day.inTemp.has_data
               <tr>
                 <td>Inside Temperature</td>
                 <td>$current.inTemp</td>
               </tr>
-	      #end if
-	      #if $day.inHumidity.has_data
+              #end if
+              #if $day.inHumidity.has_data
               <tr>
                 <td>Inside Humidity</td>
                 <td>$current.inHumidity</td>
               </tr>
-	      #end if
+              #end if
               #if $day.extraTemp1.has_data
               <tr>
                 <td>Pond Temperature</td>
@@ -212,10 +212,10 @@
                 <td>$current.UV</td>
               </tr>
               #end if
-              #if $day.ET.has_data
+              #if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
               <tr>
                 <td>Evapotranspiration</td>
-                <td>$current.ET</td>
+                <td>$current.ET.format(format_string="%.5f")</td>
               </tr>
               #end if
               #if $day.radiation.has_data
@@ -230,12 +230,12 @@
                 <td>$current.illuminance</td>
               </tr>
               #end if
-	      #if $day.lightning_strike_count.has_data
+	            #if $day.lightning_strike_count.has_data
               <tr>
                 <td>Lightning Strikes</td>
                 <td>$current.lightning_strike_count</td>
               </tr>
-	      <tr>
+	            <tr>
                 <td>Average Strike Distance</td>
                 <td>$current.lightning_avg_distance</td>
               </tr>
@@ -373,16 +373,16 @@
                 <td>$day.UV.maxtime</td>
               </tr>
               #end if
-              #if $day.ET.has_data
+              #if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$day.ET.max</td>
+                <td>$day.ET.max.format(format_string="%.5f")</td>
                 <td>$day.ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$day.ET.min</td>
-                <td>$day.ET.mintime</td>
+                <td>Today's Evapotranspiration</td>
+                <td>$day.ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $day.radiation.has_data
@@ -554,16 +554,16 @@
                 <td>$days_ago($days_ago=$n).UV.maxtime</td>
               </tr>
               #end if
-              #if $days_ago($days_ago=$n).ET.has_data
+              #if $days_ago($days_ago=$n).ET.has_data and $days_ago($days_ago=$n).ET.sum.raw is not None and $days_ago($days_ago=$n).ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$days_ago($days_ago=$n).ET.max</td>
+                <td>$days_ago($days_ago=$n).ET.max.format(format_string="%.5f")</td>
                 <td>$days_ago($days_ago=$n).ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$days_ago($days_ago=$n).ET.min</td>
-                <td>$days_ago($days_ago=$n).ET.mintime</td>
+                <td>Total Evapotranspiration</td>
+                <td>$days_ago($days_ago=$n).ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $days_ago($days_ago=$n).radiation.has_data

month.html.tmpl

@@ -182,7 +182,7 @@
                 <td>$month.wind.vecdir</td>
                 <td></td>
               </tr>
-	      #if $month.inTemp.has_data
+              #if $month.inTemp.has_data
               <tr>
                 <td>High Inside Temperature</td>
                 <td>$month.inTemp.max</td>
@@ -213,16 +213,16 @@
                 <td>$month.UV.maxtime</td>
               </tr>
               #end if
-              #if $month.ET.has_data
+              #if $month.ET.has_data and $month.ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$month.ET.max</td>
+                <td>$month.ET.max.format(format_string="%.5f")</td>
                 <td>$month.ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$month.ET.min</td>
-                <td>$month.ET.mintime</td>
+                <td>Evapotranspiration Total</td>
+                <td>$month.ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $month.radiation.has_data
@@ -373,12 +373,17 @@
                 <td>$month($months_ago=12).UV.maxtime</td>
               </tr>
               #end if
-              #if $month($months_ago=12).ET.has_data
+              #if $month($months_ago=12).ET.has_data and $month($months_ago=12).ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$month($months_ago=12).ET.max</td>
+                <td>$month($months_ago=12).ET.max.format(format_string="%.5f")</td>
                 <td>$month($months_ago=12).ET.maxtime</td>
               </tr>
+              <tr>
+                <td>Evapotranspiration Total</td>
+                <td>$month($months_ago=12).ET.sum</td>
+                <td></td>
+              </tr>
               #end if
               #if $month($months_ago=12).radiation.has_data
               <tr>

summary.html.tmpl

@@ -115,6 +115,10 @@
 			<tr><td>Highest Gust</td><td>$alltime.windGust.max</td><td>$alltime.windGust.maxtime</td></tr>
 			<tr><td colspan="3"><br><b>Wind Chill</b></td></tr>
 			<tr><td>Lowest</td><td>$alltime.windchill.min</td><td>$alltime.windchill.mintime</td></tr>
+			#if $alltime.ET.has_data
+			<tr><td colspan="3"><br><b>Evapotranspiration</b></td></tr>
+			<tr><td>Highest</td><td>$alltime.ET.max.format(format_string="%.5f")</td><td>$alltime.ET.maxtime</td></tr>
+			#end if
 			#if $alltime.radiation.has_data
 			<tr><td colspan="3"><br><b>Solar Radiation</b></td></tr>
 			<tr><td>Highest</td><td>$alltime.radiation.max</td><td>$alltime.radiation.maxtime</td></tr>
@@ -180,7 +184,7 @@
                 </div>
 		#end if
 
-		#if $month.lightning_strike_counts.has_data
+		#if $month.lightning_strike_count.has_data
 		<div class="card">
                     <h1><i class="fas fa-bolt m-orange" ></i> Total Lightning Strikes </h1>
 			<div class="tablefix">

week.html.tmpl

@@ -85,8 +85,7 @@
             <li><a href="about.html" >About</a></li>
             <li><a href="RSS/weewx_rss.xml" ><i class="fas fa-rss" ></i></a></li>
             #if $Extras.has_key('twitter_url')
-            <li><a href=$Extras.twitter_url><i class="fab fa-twitter" ></i></a></li>
-            #end if
+            <li><a href=$Extras.twitter_url><i class="fab fa-twitter" ></i></a></li>
            #end if
           </ul>
         </nav>
       </div>
@@ -213,16 +212,16 @@
                 <td>$week.UV.maxtime</td>
               </tr>
               #end if
-              #if $week.ET.has_data
+              #if $week.ET.has_data and $week.ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$week.ET.max</td>
+                <td>$week.ET.max.format(format_string="%.5f")</td>
                 <td>$week.ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$week.ET.min</td>
-                <td>$week.ET.mintime</td>
+                <td>Evapotranspiration Total</td>
+                <td>$week.ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $week.radiation.has_data
@@ -370,16 +369,16 @@
                 <td>$yesterday.UV.maxtime</td>
               </tr>
               #end if
-              #if $yesterday.ET.has_data
+              #if $yesterday.ET.has_data and $yesterday.ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$yesterday.ET.max</td>
+                <td>$yesterday.ET.max.format(format_string="%.5f")</td>
                 <td>$yesterday.ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$yesterday.ET.min</td>
-                <td>$yesterday.ET.mintime</td>
+                <td>Evapotranspiration Total</td>
+                <td>$yesterday.ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $yesterday.radiation.has_data
@@ -530,16 +529,16 @@
                 <td>$month.UV.maxtime</td>
               </tr>
               #end if
-              #if $month.ET.has_data
+              #if $month.ET.has_data and $month.ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$month.ET.max</td>
+                <td>$month.ET.max.format(format_string="%.5f")</td>
                 <td>$month.ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$month.ET.min</td>
-                <td>$month.ET.mintime</td>
+                <td>Evapotranspiration Total</td>
+                <td>$month.ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $month.radiation.has_data

year.html.tmpl

@@ -203,16 +203,16 @@
                 <td>$year.UV.maxtime</td>
               </tr>
               #end if
-              #if $year.ET.has_data
+              #if $year.ET.has_data and $year.ET.sum.raw > 0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$year.ET.max</td>
+                <td>$year.ET.max.format(format_string="%.5f")</td>
                 <td>$year.ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$year.ET.min</td>
-                <td>$year.ET.mintime</td>
+                <td>Evapotranspiration Total</td>
+                <td>$year.ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $year.radiation.has_data
@@ -244,7 +244,7 @@
                 <td>$rainyear.rainRate.max</td>
                 <td>$rainyear.rainRate.maxtime</td>
               </tr>
-	      #if $year($years_ago=1).rain.sum.string != "   N/A"
+              #if $year($years_ago=1).rain.sum.string != "   N/A"
               <tr>
                 <td>$year($years_ago=1).dateTime.format("%Y") Rain Total</td>
                 <td>$year($years_ago=1).rain.sum</td>
@@ -255,10 +255,10 @@
                 <td>$year($years_ago=1).rainRate.max</td>
                 <td>$year($years_ago=1).rainRate.maxtime</td>
               </tr>
-	      #end if
+              #end if
             </table>
           </div>
-      #if $year.lightning_strike_count.has_data
+          #if $year.lightning_strike_count.has_data
           <div class="card" >
             <h1><i class="fas fa-bolt m-orange" ></i> Total Lightning Strikes</h1>
             <table class="tablespacer">
@@ -266,16 +266,16 @@
                 <td>Lightning Strikes for $year.dateTime.format("%Y")</td>
                 <td>$year.lightning_strike_count.sum</td>
               </tr>
-	      #if $year($years_ago=1).lightning_strike_count.sum.string != "   N/A"
+          #if $year($years_ago=1).lightning_strike_count.sum.string != "   N/A"
               <tr>
                 <td>Lightning Strikes for $year($years_ago=1).dateTime.format("%Y")</td>
                 <td>$year($years_ago=1).lightning_strike_count.sum</td>
               </tr>
-	      #end if
+          #end if
             </table>
           </div>
       #end if
-	  #if $year($years_ago=1).outTemp.max.string != "   N/A"
+      #if $year($years_ago=1).outTemp.max.string != "   N/A"
           <div class="card" >
             <h1><i class="far fa-calendar-alt m-rot" ></i> Last Calendar Year ($year($years_ago=1).dateTime.format("%Y"))</h1>
             <table class="tablespacer">
@@ -354,7 +354,7 @@
                 <td>$year($years_ago=1).wind.vecdir</td>
                 <td></td>
               </tr>
-	      #if $year($years_ago=1).inTemp.has_data
+              #if $year($years_ago=1).inTemp.has_data
               <tr>
                 <td>High Inside Temperature</td>
                 <td>$year($years_ago=1).inTemp.max</td>
@@ -365,7 +365,7 @@
                 <td>$year($years_ago=1).inTemp.min</td>
                 <td>$year($years_ago=1).inTemp.mintime</td>
               </tr>
-	      #end if
+              #end if
               #if $year($years_ago=1).extraTemp1.has_data
               <tr>
                 <td>High Pond Temp</td>
@@ -385,16 +385,16 @@
                 <td>$year($years_ago=1).UV.maxtime</td>
               </tr>
               #end if
-              #if $year($years_ago=1).ET.has_data
+              #if $year($years_ago=1).ET.has_data and $year($years_ago=1).ET.sum.raw >0.0
               <tr>
                 <td>High Evapotranspiration</td>
-                <td>$year($years_ago=1).ET.max</td>
+                <td>$year($years_ago=1).ET.max.format(format_string="%.5f")</td>
                 <td>$year($years_ago=1).ET.maxtime</td>
               </tr>
               <tr>
-                <td>Low Evapotranspiration</td>
-                <td>$year($years_ago=1).ET.min</td>
-                <td>$year($years_ago=1).ET.mintime</td>
+                <td>Total Evapotranspiration</td>
+                <td>$year($years_ago=1).ET.sum</td>
+                <td></td>
               </tr>
               #end if
               #if $year($years_ago=1).radiation.has_data
@@ -413,7 +413,7 @@
               #end if
             </table>
           </div>
-	  #end if
+        #end if
         </div>
         <div class="right" >
           <div class="card cc graphs" >