From b47995d85ce47eda951e9cef18ca7457862293dc Mon Sep 17 00:00:00 2001
From: David Baetge <david.baetge@gmail.com>
Date: Sun, 2 Jul 2023 13:57:48 +0200
Subject: [PATCH] Updated sensor status page. Use current for batteries and
 stat tiles on today page. GH-140

---
 package.json                                  |   2 +-
 skins/weewx-wdc/includes/body-alternative.inc |   8 +-
 skins/weewx-wdc/includes/conditions-table.inc |  85 +++--
 skins/weewx-wdc/includes/stat-tile.inc        | 315 +++++++++---------
 skins/weewx-wdc/sensor-status.html.tmpl       | 114 +++++--
 test/test_install_report/Dockerfile           |   1 +
 6 files changed, 311 insertions(+), 214 deletions(-)

diff --git a/package.json b/package.json
index d4ee7d73..f9157e71 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "report": "NODE_ENV=production webpack --profile --json > stats.json; webpack-bundle-analyzer ./stats.json",
     "dev": "NODE_ENV=development webpack --watch",
     "build": "NODE_ENV=production webpack && mv skins/weewx-wdc/dist/service-worker.js skins/weewx-wdc/service-worker.js",
-    "deploy:local": "sudo rsync -vua ./skins/weewx-wdc/ /etc/weewx/skins/weewx-wdc/ && sudo cp -r ./bin/user/. /usr/share/weewx/user/ && sudo systemctl restart weewx && sudo /usr/share/weewx/wee_reports",
+    "deploy:local": "sudo rsync -vua ./skins/weewx-wdc/ /etc/weewx/skins/weewx-wdc/ && sudo cp -r ./bin/user/. /usr/share/weewx/user/ && sudo /usr/share/weewx/wee_reports",
     "serve:local": "docker run -it --rm -d -p 8080:80 --name web -v /var/www/html/weewx:/usr/share/nginx/html nginx",
     "deploy:pi": "yarn run build && sudo rsync -vua ./bin/ pi@weewx:/home/pi/bin && sudo rsync -vua --exclude 'weewx-wdc/dwd/*' --exclude 'weewx-wdc/skin.conf' ./skins/ pi@weewx:/home/pi/skins",
     "test:e2e": "yarn playwright test --config playwright.config.ts",
diff --git a/skins/weewx-wdc/includes/body-alternative.inc b/skins/weewx-wdc/includes/body-alternative.inc
index 0f29b647..48e1b0d8 100644
--- a/skins/weewx-wdc/includes/body-alternative.inc
+++ b/skins/weewx-wdc/includes/body-alternative.inc
@@ -71,7 +71,13 @@ $render_gauges($DisplayOptions['Gauges'][$context])
       ## ValueError: start time (1654034700) is greater than stop time (1640991600)
       #set $alltime_tag = $alltime($data_binding=$skin_obs_binding) if $context == 'alltime' else None
 
-      #if $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $get_custom_data_binding_obs_key($skin_obs)).has_data
+      #if $context == 'day' and not $daily_archive
+        #set $stat_tile_check = $current
+      #else
+        #set $stat_tile_check = $get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime_tag, $yesterday($data_binding=$skin_obs_binding))
+      #end if
+
+      #if $getattr($stat_tile_check, $get_custom_data_binding_obs_key($skin_obs)).has_data
         #set global $partial_obs = $skin_obs
         #include "includes/stat-tile.inc"
       #end if
diff --git a/skins/weewx-wdc/includes/conditions-table.inc b/skins/weewx-wdc/includes/conditions-table.inc
index afbe4f65..2384a0f6 100644
--- a/skins/weewx-wdc/includes/conditions-table.inc
+++ b/skins/weewx-wdc/includes/conditions-table.inc
@@ -60,7 +60,16 @@
             #set $skin_obs_binding = $get_data_binding($skin_obs)
             #set $skin_obs_key = $get_custom_data_binding_obs_key($skin_obs)
             #set $alltime_tag = None if $use_parameter_year or $use_parameter_month else $alltime($data_binding=$skin_obs_binding)
-            #if $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).has_data and not $get_show_sum($skin_obs) and $skin_obs != 'windDir' and $skin_obs != 'windGustDir'
+
+            #set $context_binded = $get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime_tag, $yesterday($data_binding=$skin_obs_binding))
+
+            #if $context == 'day' and not $daily_archive
+              #set $context_binding = $current
+            #else
+              #set $context_binding = context_binded
+            #end if
+
+            #if $getattr($context_binding, $skin_obs_key).has_data and not $get_show_sum($skin_obs) and $skin_obs != 'windDir' and $skin_obs != 'windGustDir'
               #set $show_wind_dir = 'windDir' in $stat_obs and $skin_obs == "windSpeed" and not $to_bool($DisplayOptions.get('stat_tile_winddir_ordinal', True))
               #set $show_wind_dir_ordinal = 'windDir' in $stat_obs and $skin_obs == "windSpeed" and $to_bool($DisplayOptions.get('stat_tile_winddir_ordinal', True))
               #set $show_gust_dir = 'windGustDir' in $stat_obs and $skin_obs == "windGust" and not $to_bool($DisplayOptions.get('stat_tile_winddir_ordinal', True))
@@ -73,8 +82,14 @@
                 <bx-structured-list-cell class="cell-label">$obs.label[$skin_obs]</bx-structured-list-cell>
                 <bx-structured-list-cell class="cell-value">
                   <!--prettier-ignore-->
-                  #if $context == 'day'
-                    <span>$getattr($latest($data_binding=$skin_obs_binding), $skin_obs_key).format("%." + $rounding + "f")</span>
+                  #if $context == 'day' and not $daily_archive
+                    <span>
+                      #if $skin_obs_binding != 'wx_binding'
+                        $getattr($latest($data_binding=$skin_obs_binding), $skin_obs_key).format("%." + $rounding + "f")
+                      #else
+                        $getattr($latest, $skin_obs_key).format("%." + $rounding + "f")
+                      #end if
+                    </span>
 
                     #if $show_wind_dir and $current.windDir.has_data
                       <span class="stat-wind-dir stat-detail">, $current.windDir</span>
@@ -90,11 +105,11 @@
                     #end if
                   #else
                     #if $get_show_sum($skin_obs)
-                      $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).sum.format("%." + $rounding + "f")
+                      $getattr($context_binding, $skin_obs_key).sum.format("%." + $rounding + "f")
                     #else if $get_show_max($skin_obs)
-                      $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).max.format("%." + $rounding + "f")
+                      $getattr($context_binding, $skin_obs_key).max.format("%." + $rounding + "f")
                     #else
-                        $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).avg.format("%." + $rounding + "f")
+                        $getattr($context_binding, $skin_obs_key).avg.format("%." + $rounding + "f")
 
                         #if $show_wind_dir and $getattr($get_time_span_from_context($context, $day, $week, $month, $year, $alltime, $yesterday), "windDir").has_data
                           <span class="stat-wind-dir stat-detail">, $getattr($get_time_span_from_context($context, $day, $week, $month, $year, $alltime, $yesterday), "windDir").avg</span>
@@ -110,34 +125,42 @@
                 </bx-structured-list-cell>
                 <!--prettier-ignore-->
                 <bx-structured-list-cell class="cell-min">
-                  <span>$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).min.format("%." + $rounding + "f")</span>
+                  #if $getattr($context_binded, $skin_obs_key).has_data
+                    <span>$getattr($context_binded, $skin_obs_key).min.format("%." + $rounding + "f")</span>
 
-                  #if show_min_max_time
-                    <span class="date">$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).mintime.format($min_max_time_format)</span>
+                    #if show_min_max_time
+                      <span class="date">$getattr($context_binded, $skin_obs_key).mintime.format($min_max_time_format)</span>
+                    #end if
+                  #else
+                    <span>$gettext("N/A")</span>
                   #end if
                 </bx-structured-list-cell>
                 <!--prettier-ignore-->
                 <bx-structured-list-cell class="cell-max">
-                  <span>$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).max.format("%." + $rounding + "f")</span>
-
-                  #set $windDir_binded = $getattr($get_time_span_from_context($context, $day, $week, $month, $year, $alltime, $yesterday), "windDir")
-                  #set $gustDir_binded = $getattr($get_time_span_from_context($context, $day, $week, $month, $year, $alltime, $yesterday), "windGustDir")
-
-                  #if $show_wind_dir and $windDir_binded.has_data
-                    <span class="stat-wind-dir stat-detail">, $windDir_binded.max</span>
-                  #else if $show_wind_dir_ordinal and $windDir_binded.has_data
-                    <span class="stat-wind-dir stat-detail">, $windDir_binded.max.ordinal_compass</span>
-                  #else if $show_gust_dir and $gustDir_binded.has_data
-                    <span class="stat-wind-dir stat-detail">, $gustDir_binded.max</span>
-                  #else if $show_gust_dir_ordinal and $gustDir_binded.has_data
-                    <span class="stat-wind-dir stat-detail">, $gustDir_binded.max.ordinal_compass</span>
-                  <!--Empty block for usage in MQTT-->
-                  #else if (($show_wind_dir or $show_wind_dir_ordinal) and not $windDir_binded.has_data) or (($show_gust_dir or $show_gust_dir_ordinal) and not $gustDir_binded.has_data)
-                    <span class="stat-wind-dir stat-detail"></span>
-                  #end if
+                  #if $getattr($context_binded, $skin_obs_key).has_data
+                    <span>$getattr($context_binded, $skin_obs_key).max.format("%." + $rounding + "f")</span>
+
+                    #set $windDir_binded = $getattr($get_time_span_from_context($context, $day, $week, $month, $year, $alltime, $yesterday), "windDir")
+                    #set $gustDir_binded = $getattr($get_time_span_from_context($context, $day, $week, $month, $year, $alltime, $yesterday), "windGustDir")
 
-                  #if $show_min_max_time
-                  <span class="date">$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).maxtime.format($min_max_time_format)</span>
+                    #if $show_wind_dir and $windDir_binded.has_data
+                      <span class="stat-wind-dir stat-detail">, $windDir_binded.max</span>
+                    #else if $show_wind_dir_ordinal and $windDir_binded.has_data
+                      <span class="stat-wind-dir stat-detail">, $windDir_binded.max.ordinal_compass</span>
+                    #else if $show_gust_dir and $gustDir_binded.has_data
+                      <span class="stat-wind-dir stat-detail">, $gustDir_binded.max</span>
+                    #else if $show_gust_dir_ordinal and $gustDir_binded.has_data
+                      <span class="stat-wind-dir stat-detail">, $gustDir_binded.max.ordinal_compass</span>
+                    <!--Empty block for usage in MQTT-->
+                    #else if (($show_wind_dir or $show_wind_dir_ordinal) and not $windDir_binded.has_data) or (($show_gust_dir or $show_gust_dir_ordinal) and not $gustDir_binded.has_data)
+                      <span class="stat-wind-dir stat-detail"></span>
+                    #end if
+
+                    #if $show_min_max_time
+                    <span class="date">$getattr($context_binded, $skin_obs_key).maxtime.format($min_max_time_format)</span>
+                    #end if
+                  #else
+                    <span>$gettext("N/A")</span>
                   #end if
                 </bx-structured-list-cell>
               </bx-structured-list-row>
@@ -165,13 +188,15 @@
             #set $skin_obs_binding = $get_data_binding($skin_obs)
             #set $skin_obs_key = $get_custom_data_binding_obs_key($skin_obs)
             #set $alltime_tag = None if $use_parameter_year or $use_parameter_month else $alltime($data_binding=$skin_obs_binding)
-            #if $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).has_data and $get_show_sum($skin_obs)
+            #set $context_binding = $get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime_tag, $yesterday($data_binding=$skin_obs_binding))
+
+            #if $getattr($context_binding, $skin_obs_key).has_data and $get_show_sum($skin_obs)
               #set $rounding = $str($get_rounding($skin_obs, $skin_obs_key))
               <bx-structured-list-row data-aggregation="sum" data-test="$skin_obs" data-observation="$skin_obs_key" data-unit="$get_unit_label($get_unit_for_obs($skin_obs, $skin_obs_key, $context))" data-rounding="$get_rounding($skin_obs, $skin_obs_key)">
                 <bx-structured-list-cell class="keep-cell">$obs.label[$skin_obs]</bx-structured-list-cell>
                 <!--prettier-ignore-->
                 <bx-structured-list-cell class="cell-value">
-                  $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), alltime_tag, $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).sum.format("%." + $rounding + "f")
+                  $getattr($context_binding, $skin_obs_key).sum.format("%." + $rounding + "f")
                 </bx-structured-list-cell>
               </bx-structured-list-row>
             #end if
diff --git a/skins/weewx-wdc/includes/stat-tile.inc b/skins/weewx-wdc/includes/stat-tile.inc
index 2029016e..dcc8d235 100644
--- a/skins/weewx-wdc/includes/stat-tile.inc
+++ b/skins/weewx-wdc/includes/stat-tile.inc
@@ -16,7 +16,7 @@
 #set $skin_obs_binding = $get_data_binding($partial_obs)
 #set $skin_obs_key = $get_custom_data_binding_obs_key($partial_obs)
 #set $rounding = $str($get_rounding($partial_obs, $skin_obs_key))
-
+#set $observation_binding =  $get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding))
 <script
   type="module"
   src="https://1.www.s81c.com/common/carbon/web-components/version/v1.27.0/tooltip.min.js"
@@ -55,7 +55,11 @@
               <span class="raw raw-sum">$getattr($day($data_binding=$skin_obs_binding), $skin_obs_key).sum.format("%." + $rounding + "f")</span>
               #else
               <span class="raw">
-                $getattr($latest($data_binding=$skin_obs_binding), $skin_obs_key).format("%." + $rounding + "f")
+                #if $skin_obs_binding != 'wx_binding'
+                  $getattr($latest($data_binding=$skin_obs_binding), $skin_obs_key).format("%." + $rounding + "f")
+                #else
+                  $getattr($latest, $skin_obs_key).format("%." + $rounding + "f")
+                #end if
               </span>
               #end if
 
@@ -97,31 +101,31 @@
               #end if
             #else
               #if $get_show_sum($partial_obs)
-                $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).sum.format("%." + $rounding + "f")
+                $getattr($observation_binding, $skin_obs_key).sum.format("%." + $rounding + "f")
               #else if $get_show_max($partial_obs)
-                $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).max.format("%." + $rounding + "f")
+                $getattr($observation_binding, $skin_obs_key).max.format("%." + $rounding + "f")
               #else
-                $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).avg.format("%." + $rounding + "f")
+                $getattr($observation_binding, $skin_obs_key).avg.format("%." + $rounding + "f")
 
-                #if $show_wind_dir and $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windDir").has_data
+                #if $show_wind_dir and $getattr($observation_binding, "windDir").has_data
                   <span class="stat-wind-dir stat-detail">
                     #set global $windDir_deg = $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "wind").vecdir.degree_compass
                     #include "includes/icons/wind-direction.inc"
                     $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "wind").vecdir
                   </span>
-                #else if $show_wind_dir_ordinal and $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windDir").has_data
+                #else if $show_wind_dir_ordinal and $getattr($observation_binding, "windDir").has_data
                   <span class="stat-wind-dir stat-detail">
                     #set global $windDir_deg = $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "wind").vecdir.degree_compass
                     #include "includes/icons/wind-direction.inc"
                     $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "wind").vecdir.ordinal_compass
                   </span>
-                #else if $show_gust_dir and $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windGustDir").has_data
+                #else if $show_gust_dir and $getattr($observation_binding, "windGustDir").has_data
                   <span class="stat-wind-dir stat-detail">
                     #set global $windDir_deg = $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windGustDir").avg.degree_compass
                     #include "includes/icons/wind-direction.inc"
                     $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windGustDir").avg
                   </span>
-                #else if $show_gust_dir_ordinal and $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windGustDir").has_data
+                #else if $show_gust_dir_ordinal and $getattr($observation_binding, "windGustDir").has_data
                   <span class="stat-wind-dir stat-detail">
                     #set global $windDir_deg = $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windGustDir").avg.degree_compass
                     #include "includes/icons/wind-direction.inc"
@@ -149,131 +153,44 @@
     <!-- /Main row -->
 
     <!--prettier-ignore-->
-    #if $context != 'day' and $get_show_sum($partial_obs)
-      #if $partial_obs == 'rain'
-        #set $time_span = $get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding))
-        <div class="bx--row">
-          #if $context != 'yesterday'
-            #if $context == 'alltime'
-              <div class="bx--col" data-test="rain-days">
-                <p class="stat-label">
-                  <bx-tooltip-definition
-                    alignment="center"
-                    body-text="$gettext('Time since last rain:') $time_since_last_rain.long_form"
-                    direction="top"
-                  >
-                  $gettext("Last rain")
-                  </bx-tooltip-definition>
-                </p>
-                <p class="stat-value">
-                  <!--prettier-ignore-->
-                  $last_rain.format("%x")
-                </p>
-              </div>
-            #else
-              <div class="bx--col" data-test="rain-days">
-                <p class="stat-label">$gettext("rainDays")</p>
-                <p class="stat-value">
-                  <!--prettier-ignore-->
-                  $get_climatological_day('rainDays', $time_span.start.raw, $time_span.end.raw)
-                </p>
-              </div>
-            #end if
-          #end if
-          #if $show_rain_rate
-          <div class="bx--col value-rain-rate-max" data-test="rain-rate-max">
-            <p class="stat-label">
-              #if $show_min_max_time
-              <bx-tooltip-definition
-                alignment="center"
-                body-text="$getattr($time_span, 'rainRate').maxtime.format($min_max_time_format)"
-                direction="top"
-              >
-                $gettext("Max") $obs.label.rainRate
-              </bx-tooltip-definition>
-              <!--prettier-ignore-->
-              #else
-                $gettext("Max") $obs.label.rainRate
-              #end if
-            </p>
-            <!--prettier-ignore-->
-            <p class="stat-value">
-              <span class="value" style="display: inline;">$getattr($time_span, 'rainRate').max.format("%." + $rounding + "f")</span>
-            </p>
-          </div>
-        #end if
-        </div>
-      #else
-        <div class="bx--row" data-test="avg">
-          <div class="bx--col">
-            <p class="stat-label">$gettext($label_avg)</p>
-            <p class="stat-value">
-              <!--prettier-ignore-->
-              #if $partial_obs == 'windDir'
-                $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "wind").vecdir
+    #if $getattr($observation_binding, $skin_obs_key).has_data
+      #if $context != 'day' and $get_show_sum($partial_obs)
+        #if $partial_obs == 'rain'
+          <div class="bx--row">
+            #if $context != 'yesterday'
+              #if $context == 'alltime'
+                <div class="bx--col" data-test="rain-days">
+                  <p class="stat-label">
+                    <bx-tooltip-definition
+                      alignment="center"
+                      body-text="$gettext('Time since last rain:') $time_since_last_rain.long_form"
+                      direction="top"
+                    >
+                    $gettext("Last rain")
+                    </bx-tooltip-definition>
+                  </p>
+                  <p class="stat-value">
+                    <!--prettier-ignore-->
+                    $last_rain.format("%x")
+                  </p>
+                </div>
               #else
-                $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).avg.format("%." + $rounding + "f")
+                <div class="bx--col" data-test="rain-days">
+                  <p class="stat-label">$gettext("rainDays")</p>
+                  <p class="stat-value">
+                    <!--prettier-ignore-->
+                    $get_climatological_day('rainDays', $observation_binding.start.raw, $observation_binding.end.raw)
+                  </p>
+                </div>
               #end if
-            </p>
-          </div>
-        </div>
-      <!--prettier-ignore-->
-      #end if
-    #else
-      <div class="bx--row">
-        #if $get_show_min($partial_obs)
-        <div class="bx--col value-min" data-test="min">
-          <p class="stat-label">
-            <!--prettier-ignore-->
-            #if $show_min_max_time
-            <bx-tooltip-definition
-              alignment="center"
-              body-text="$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $partial_obs).mintime.format($min_max_time_format)"
-              direction="top"
-            >
-              $gettext($label_min)
-            </bx-tooltip-definition>
-            <!--prettier-ignore-->
-            #else
-              $gettext($label_min)
             #end if
-          </p>
-          <!--prettier-ignore-->
-          <p class="stat-value">
-            <span class="value" style="display: inline;">$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).min.format("%." + $rounding + "f")</span>
-          </p>
-        </div>
-        #end if
-        #if $get_show_sum($partial_obs)
-          #if $partial_obs != 'rain'
-            <div class="bx--col value-total-week" data-test="total-week">
-              <p class="stat-label">
-                $gettext("Total week short")
-              </p>
-              <!--prettier-ignore-->
-              <p class="stat-value">
-                <span class="value" style="display: inline;">$getattr($week, $skin_obs_key).sum.format("%." + $rounding + "f")</span>
-              </p>
-            </div>
-          #end if
-          #if $show_rain_rate and not $daily_archive
-            <div class="bx--col value-rain-rate-current" data-test="rain-rate-current">
-              <p class="stat-label">
-                $obs.label.rainRate
-              </p>
-              <!--prettier-ignore-->
-              <p class="stat-value">
-                <span class="value" style="display: inline;">$getattr($current, 'rainRate')</span>
-              </p>
-            </div>
-          #end if
-          #if $show_rain_rate
+            #if $show_rain_rate
             <div class="bx--col value-rain-rate-max" data-test="rain-rate-max">
               <p class="stat-label">
                 #if $show_min_max_time
                 <bx-tooltip-definition
                   alignment="center"
-                  body-text="$getattr($day, 'rainRate').maxtime.format($min_max_time_format)"
+                  body-text="$getattr($observation_binding, 'rainRate').maxtime.format($min_max_time_format)"
                   direction="top"
                 >
                   $gettext("Max") $obs.label.rainRate
@@ -285,51 +202,149 @@
               </p>
               <!--prettier-ignore-->
               <p class="stat-value">
-                <span class="value" style="display: inline;">$getattr($day, 'rainRate').max.format("%." + $rounding + "f")</span>
+                <span class="value" style="display: inline;">$getattr($observation_binding, 'rainRate').max.format("%." + $rounding + "f")</span>
               </p>
             </div>
           #end if
+          </div>
         #else
-          <div class="bx--col value-max" data-test="max">
+          <div class="bx--row" data-test="avg">
+            <div class="bx--col">
+              <p class="stat-label">$gettext($label_avg)</p>
+              <p class="stat-value">
+                <!--prettier-ignore-->
+                #if $partial_obs == 'windDir'
+                  $getattr($observation_binding, "wind").vecdir
+                #else
+                  $getattr($observation_binding, $skin_obs_key).avg.format("%." + $rounding + "f")
+                #end if
+              </p>
+            </div>
+          </div>
+        <!--prettier-ignore-->
+        #end if
+      #else
+        <div class="bx--row">
+          #if $get_show_min($partial_obs)
+          <div class="bx--col value-min" data-test="min">
             <p class="stat-label">
               <!--prettier-ignore-->
               #if $show_min_max_time
               <bx-tooltip-definition
                 alignment="center"
-                body-text="$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $partial_obs).maxtime.format($min_max_time_format)"
+                body-text="$getattr($observation_binding, $partial_obs).mintime.format($min_max_time_format)"
                 direction="top"
               >
-                $gettext($label_max)
+                $gettext($label_min)
               </bx-tooltip-definition>
               <!--prettier-ignore-->
               #else
-                $gettext($label_max)
+                $gettext($label_min)
               #end if
             </p>
             <!--prettier-ignore-->
             <p class="stat-value">
-              <span class="value" style="display: inline;">$getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), $skin_obs_key).max.format("%." + $rounding + "f")</span>
-
-              ## TODO: Add this refactoring to all windDir/gust blocks!
-              #set $windDir_binded = $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windDir")
-              #set $gustDir_binded = $getattr($get_time_span_from_context($context, $day($data_binding=$skin_obs_binding), $week($data_binding=$skin_obs_binding), $month($data_binding=$skin_obs_binding), $year($data_binding=$skin_obs_binding), $alltime($data_binding=$skin_obs_binding), $yesterday($data_binding=$skin_obs_binding)), "windGustDir")
-
-              #if $show_wind_dir and $windDir_binded.has_data
-                <span class="stat-wind-dir stat-detail">, $windDir_binded.max</span>
-              #else if $show_wind_dir_ordinal and $windDir_binded.has_data
-                <span class="stat-wind-dir stat-detail">, $windDir_binded.max.ordinal_compass</span>
-              #else if $show_gust_dir and $gustDir_binded.has_data
-                <span class="stat-wind-dir stat-detail">, $gustDir_binded.max</span>
-              #else if $show_gust_dir_ordinal and $gustDir_binded.has_data
-                <span class="stat-wind-dir stat-detail">, $gustDir_binded.max.ordinal_compass</span>
-              <!--Empty block for usage in MQTT-->
-              #else if (($show_wind_dir or $show_wind_dir_ordinal) and not $windDir_binded.has_data) or (($show_gust_dir or $show_gust_dir_ordinal) and not $gustDir_binded.has_data)
-                <span class="stat-wind-dir stat-detail"></span>
-              #end if
+              <span class="value" style="display: inline;">$getattr($observation_binding, $skin_obs_key).min.format("%." + $rounding + "f")</span>
             </p>
           </div>
-        #end if
+          #end if
+          #if $get_show_sum($partial_obs)
+            #if $partial_obs != 'rain'
+              <div class="bx--col value-total-week" data-test="total-week">
+                <p class="stat-label">
+                  $gettext("Total week short")
+                </p>
+                <!--prettier-ignore-->
+                <p class="stat-value">
+                  <span class="value" style="display: inline;">$getattr($week, $skin_obs_key).sum.format("%." + $rounding + "f")</span>
+                </p>
+              </div>
+            #end if
+            #if $show_rain_rate and not $daily_archive
+              <div class="bx--col value-rain-rate-current" data-test="rain-rate-current">
+                <p class="stat-label">
+                  $obs.label.rainRate
+                </p>
+                <!--prettier-ignore-->
+                <p class="stat-value">
+                  <span class="value" style="display: inline;">$getattr($current, 'rainRate')</span>
+                </p>
+              </div>
+            #end if
+            #if $show_rain_rate
+              <div class="bx--col value-rain-rate-max" data-test="rain-rate-max">
+                <p class="stat-label">
+                  #if $show_min_max_time
+                  <bx-tooltip-definition
+                    alignment="center"
+                    body-text="$getattr($day, 'rainRate').maxtime.format($min_max_time_format)"
+                    direction="top"
+                  >
+                    $gettext("Max") $obs.label.rainRate
+                  </bx-tooltip-definition>
+                  <!--prettier-ignore-->
+                  #else
+                    $gettext("Max") $obs.label.rainRate
+                  #end if
+                </p>
+                <!--prettier-ignore-->
+                <p class="stat-value">
+                  <span class="value" style="display: inline;">$getattr($day, 'rainRate').max.format("%." + $rounding + "f")</span>
+                </p>
+              </div>
+            #end if
+          #else
+            <div class="bx--col value-max" data-test="max">
+              <p class="stat-label">
+                <!--prettier-ignore-->
+                #if $show_min_max_time
+                <bx-tooltip-definition
+                  alignment="center"
+                  body-text="$getattr($observation_binding, $partial_obs).maxtime.format($min_max_time_format)"
+                  direction="top"
+                >
+                  $gettext($label_max)
+                </bx-tooltip-definition>
+                <!--prettier-ignore-->
+                #else
+                  $gettext($label_max)
+                #end if
+              </p>
+              <!--prettier-ignore-->
+              <p class="stat-value">
+                <span class="value" style="display: inline;">$getattr($observation_binding, $skin_obs_key).max.format("%." + $rounding + "f")</span>
+
+                ## TODO: Add this refactoring to all windDir/gust blocks!
+                #set $windDir_binded = $getattr($observation_binding, "windDir")
+                #set $gustDir_binded = $getattr($observation_binding, "windGustDir")
+
+                #if $show_wind_dir and $windDir_binded.has_data
+                  <span class="stat-wind-dir stat-detail">, $windDir_binded.max</span>
+                #else if $show_wind_dir_ordinal and $windDir_binded.has_data
+                  <span class="stat-wind-dir stat-detail">, $windDir_binded.max.ordinal_compass</span>
+                #else if $show_gust_dir and $gustDir_binded.has_data
+                  <span class="stat-wind-dir stat-detail">, $gustDir_binded.max</span>
+                #else if $show_gust_dir_ordinal and $gustDir_binded.has_data
+                  <span class="stat-wind-dir stat-detail">, $gustDir_binded.max.ordinal_compass</span>
+                <!--Empty block for usage in MQTT-->
+                #else if (($show_wind_dir or $show_wind_dir_ordinal) and not $windDir_binded.has_data) or (($show_gust_dir or $show_gust_dir_ordinal) and not $gustDir_binded.has_data)
+                  <span class="stat-wind-dir stat-detail"></span>
+                #end if
+              </p>
+            </div>
+          #end if
+        </div>
+      #end if
+    #else
+    <div class="bx--row">
+      <div class="bx--col">
+        <p class="stat-label">
+          $gettext($label_min) / $gettext($label_max)
+        </p>
+        <p class="stat-value">
+          <span class="value" style="display: inline;">$gettext("N/A")</span>
       </div>
+    </div>
     #end if
   </div>
 </div>
diff --git a/skins/weewx-wdc/sensor-status.html.tmpl b/skins/weewx-wdc/sensor-status.html.tmpl
index 666a3545..465ef1c0 100644
--- a/skins/weewx-wdc/sensor-status.html.tmpl
+++ b/skins/weewx-wdc/sensor-status.html.tmpl
@@ -61,52 +61,101 @@
   #end for
 #end def
 
+<!--prettier-ignore-->
+#def get_battery_multi($battery_raw)
+
+#end def
+
+<!--prettier-ignore-->
+#def get_battery_binary($battery_raw, $battery)
+#if $battery_raw == 1
+<bx-inline-notification
+  style="margin-bottom: 0.5rem"
+  title="$obs.label[$battery]"
+  subtitle="$gettext('Low')"
+  kind="warning"
+  hide-close-button
+>
+</bx-inline-notification>
+#else if $battery_raw is None
+<bx-inline-notification
+  style="margin-bottom: 0.5rem"
+  title="$obs.label[$battery]"
+  subtitle="$gettext('Unknown')"
+  kind="info"
+  hide-close-button
+>
+</bx-inline-notification>
+#else
+<bx-inline-notification
+  style="margin-bottom: 0.5rem"
+  title="$obs.label[$battery]"
+  subtitle="$gettext('Ok')"
+  kind="success"
+  hide-close-button
+>
+</bx-inline-notification>
+<!--prettier-ignore-->
+#end if
+#end def
+
+<!--prettier-ignore-->
+#def get_battery_multi($battery_raw, $battery)
+#if $battery_raw <= 1
+<bx-inline-notification
+  style="margin-bottom: 0.5rem"
+  title="$obs.label[$battery]"
+  subtitle="$gettext('Low')"
+  kind="warning"
+  hide-close-button
+>
+</bx-inline-notification>
+#else if $battery_raw <= 5
+<bx-inline-notification
+  style="margin-bottom: 0.5rem"
+  title="$obs.label[$battery]"
+  subtitle="$gettext('OK')"
+  kind="info"
+  hide-close-button
+>
+</bx-inline-notification>
+#else if $battery_raw == 6
+<bx-inline-notification
+  style="margin-bottom: 0.5rem"
+  title="$obs.label[$battery]"
+  subtitle="$gettext('DC')"
+  kind="success"
+  hide-close-button
+>
+</bx-inline-notification>
+<!--prettier-ignore-->
+#end if
+#end def
+
 <!--prettier-ignore-->
 #def batteries($sensor_batteries, $layout)
-#set $recent=$span($day_delta=1, boundary='midnight')
+## Some Ecowitt sensors emit a battery state other than 1 or 2 (https://github.com/gjr80/weewx-gw1000/wiki/Sensor-battery-states).
+#set $batteries_multi = ['wh41_ch1_batt', 'wh41_ch2_batt', 'wh41_ch3_batt', 'wh41_ch4_batt', 'wh45_batt', 'wh55_ch1_batt', 'wh55_ch2_batt', 'wh55_ch3_batt', 'wh55_ch4_batt', 'wh57_batt']
 #if $layout == 'alternative'
-#set $classes = "bx--col-sm-4 bx--col-md-8 bx--col-lg-12 bx--col-xlg-6 bx--col-max-4"
+  #set $classes = "bx--col-sm-4 bx--col-md-8 bx--col-lg-12 bx--col-xlg-6 bx--col-max-4"
 #else
-#set $classes = "bx--col-sm-4 bx--col-md-8 bx--col-lg-12 bx--col-xlg-12 bx--col-max-6"
+  #set $classes = "bx--col-sm-4 bx--col-md-8 bx--col-lg-12 bx--col-xlg-12 bx--col-max-6"
 #end if
 <!--prettier-ignore-->
 <script type="module" src="https://1.www.s81c.com/common/carbon/web-components/version/v1.21.0/notification.min.js"></script>
 <!--prettier-ignore-->
 #for $battery in $sensor_batteries
-  #if $getattr($recent, $battery).has_data
+  #if $getattr($current, $battery).has_data
 <!--prettier-ignore-->
 <div class="$classes">
     #set $battery_raw = $getVar('current.%s.raw' % $battery)
 
-    #if $battery_raw == 1
-      <bx-inline-notification
-        style="margin-bottom: .5rem"
-        title="$obs.label[$battery]"
-        subtitle="$gettext('Low')"
-        kind="warning"
-        hide-close-button
-      >
-      </bx-inline-notification>
-    #else if $battery_raw is None
-      <bx-inline-notification
-        style="margin-bottom: .5rem"
-        title="$obs.label[$battery]"
-        subtitle="$gettext('Unknown')"
-        kind="info"
-        hide-close-button
-      >
-      </bx-inline-notification>
+    #if $battery in $batteries_multi
+      $get_battery_multi($battery_raw, $battery)
     #else
-      <bx-inline-notification
-        style="margin-bottom: .5rem"
-        title="$obs.label[$battery]"
-        subtitle="$gettext('Ok')"
-        kind="success"
-        hide-close-button
-      >
-      </bx-inline-notification>
+      $get_battery_binary($battery_raw, $battery)
     #end if
-  </div>
+</div>
 <!--prettier-ignore-->
 #end if
 #end for
@@ -143,6 +192,7 @@
               #set global $stat_obs = $sensor_stat_tile_observations
               #include 'includes/conditions-table.inc'
 
+              <!--prettier-ignore-->
               <div class="bx--row">
                 $batteries($sensor_batteries, $layout)
               </div>
@@ -179,7 +229,7 @@
               #set $binding = $get_data_binding($obs)
               #set $alltime_tag = $alltime($data_binding=$binding) if $context == 'alltime' else None
 
-              #if $getattr($get_time_span_from_context($context, $day($data_binding=$binding), $week($data_binding=$binding), $month($data_binding=$binding), $year($data_binding=$binding), $alltime_tag, $yesterday($data_binding=$binding)), $get_custom_data_binding_obs_key($obs)).has_data
+              #if $getattr($current, $get_custom_data_binding_obs_key($obs)).has_data
                 #set global $partial_obs = $obs
                 #include "includes/stat-tile.inc"
               #end if
diff --git a/test/test_install_report/Dockerfile b/test/test_install_report/Dockerfile
index f8706530..83b71058 100644
--- a/test/test_install_report/Dockerfile
+++ b/test/test_install_report/Dockerfile
@@ -92,6 +92,7 @@ COPY src/cmon-extensions.py /tmp
 
 RUN sed -i -e 's/device_type = acurite-bridge/device_type = ecowitt-client\n    port = 9877\n    address = 0.0.0.0/g' weewx.conf &&\
     sed -i -z -e 's/skin = Seasons\n        enable = true/skin = Seasons\n        enable = false/g' weewx.conf &&\
+    sed -i -z -e 's/skin = cmon/skin = cmon\n        enable = false/g' weewx.conf &&\
     sed -i -z -e 's/skin = forecast/skin = forecast\n        enable = false/g' weewx.conf
 
 ADD src/weewx-db_06_23_2022_08_00.tar ./archive