diff --git a/changelog.md b/changelog.md index bb2e4fe..4fff91d 100644 --- a/changelog.md +++ b/changelog.md @@ -727,6 +727,7 @@ See https://github.com/Daveiano/weewx-wdc/compare/v3.2.0...11eed6b3#diff-ba225fb - Bugfix: Division by zero in get_windrose_data GH-192 - Bugfix: Manifest.json does not use base_path GH-197 - Bugfix: Tool Tip out of Scope GH-194 +- Bugfix: Observations with $current N/A values are not shown anymore in stat-tiles/conditions table on day page GH-188 - Added `show_min_max` configuration to gauges config, added ordinal display for windDir gauge min/max - Only show 3 decimals for the geocode provided by weewx-forecast GH-191 - Make sidebar scrollable (if there are too many items) GH-193 diff --git a/skins/weewx-wdc/includes/body-alternative.inc b/skins/weewx-wdc/includes/body-alternative.inc index 48e1b0d..88cd962 100644 --- a/skins/weewx-wdc/includes/body-alternative.inc +++ b/skins/weewx-wdc/includes/body-alternative.inc @@ -63,15 +63,23 @@ $render_gauges($DisplayOptions['Gauges'][$context])
+ $to_bool($DisplayOptions.get('show_min_max_time_day', False))) #for $skin_obs in $DisplayOptions.get('stat_tile_observations') #if $skin_obs != 'windDir' and $skin_obs != 'windGustDir' and $skin_obs != 'rainRate' #set $skin_obs_binding = $get_data_binding($skin_obs) + #set $show_sum = $get_show_sum($skin_obs) + #set $show_min = $get_show_min($skin_obs) + #set $show_max = $get_show_max($skin_obs) + #set $use_day = $show_sum or $show_min or $show_max + ## I dont know why but $alltime($data_binding=$skin_obs_binding) crashes on the month-%Y-%m and year-%Y pages: ## 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 $context == 'day' and not $daily_archive + #if $context == 'day' and not $daily_archive and $use_day + #set $stat_tile_check = $day + #elif $context == 'day' and not $daily_archive and not $use_day #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)) diff --git a/skins/weewx-wdc/includes/conditions-table.inc b/skins/weewx-wdc/includes/conditions-table.inc index 2384a0f..2234753 100644 --- a/skins/weewx-wdc/includes/conditions-table.inc +++ b/skins/weewx-wdc/includes/conditions-table.inc @@ -63,10 +63,17 @@ #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 $show_sum = $get_show_sum($skin_obs) + #set $show_min = $get_show_min($skin_obs) + #set $show_max = $get_show_max($skin_obs) + #set $use_day = $show_sum or $show_min or $show_max + + #if $context == 'day' and not $daily_archive and $use_day + #set $context_binding = $day + #elif $context == 'day' and not $daily_archive and not $use_day #set $context_binding = $current #else - #set $context_binding = context_binded + #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'