Skip to content

Commit

Permalink
Merge branch '3.x' into 198-mqtt-day-reset
Browse files Browse the repository at this point in the history
  • Loading branch information
Daveiano committed Nov 1, 2023
2 parents 6d89e52 + 9cd7cf1 commit b270a40
Show file tree
Hide file tree
Showing 15 changed files with 622 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Ignore artifacts:
dist
dist
skins/weewx-wdc/includes/stat-tile.inc
3 changes: 3 additions & 0 deletions bin/user/weewx_wdc.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,9 @@ def get_locale(self):
if report_lang == "it":
return 'it-IT'

if report_lang == "nl":
return 'nl-NL'

return 'en-US'

def getValueHelper(self, value_vt):
Expand Down
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,11 @@ See https://github.com/Daveiano/weewx-wdc/compare/v3.2.0...11eed6b3#diff-ba225fb
- 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
- Bugfix: Day Mix/Max Values in Tiles Do Not reset at Midnight GH-198
- Bugfix: Fixed a bug where markers where not shown if multiple were added in a single unit chart GH-216
- 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
- Make icon/logo user configurable GH-205
- Enhancement to the All Time Statistics: Show climatological days per month and per year. GH-196
- Added NL translation, thanks to user @dystechnic
- Added configurable 'Clickable' tiles GH-211
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ If you like the look and feel of the skin please consider having a look at the o
- Day, week, month, year and all-time pages
- Archive and NOAA Reports
- Almanac
- Translated for DE, EN and IT
- Translated for DE, EN, IT and NL
- Tabular representation with Carbon Data Tables
- Climatological days
- Calendar charts for rain days and average day temperature
Expand Down
27 changes: 27 additions & 0 deletions skins/weewx-wdc/includes/stat-tile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@

<div class="bx--col-sm-4 bx--col-md-4 bx--col-lg-6 bx--col-xlg-3 bx--col-max-2">
<!--prettier-ignore-->
#if "stat_tile_links" in $DisplayOptions and $partial_obs in $DisplayOptions["stat_tile_links"]
#set $open_new_tab = "_blank" if $to_bool($DisplayOptions["stat_tile_links"][$partial_obs]["open_new_tab"]) else "_self"
<a class="stat-tile-link" href='$DisplayOptions["stat_tile_links"][$partial_obs]["link"]' target='$open_new_tab'>
#end if
<div
class="bx--tile stat-tile"
data-test="$partial_obs"
Expand All @@ -36,6 +40,26 @@
>
<!-- Main row -->
<div class="bx--row">

#if "stat_tile_links" in $DisplayOptions and $partial_obs in $DisplayOptions["stat_tile_links"]
<svg
class="icon-link"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 32 32"
>
<polygon
points="10 6 10 8 22.59 8 6 24.59 7.41 26 24 9.41 24 22 26 22 26 6 10 6"
/>
<rect
id="_Transparent_Rectangle_"
data-name="&lt;Transparent Rectangle&gt;"
class="cls-1"
width="32"
height="32"
/>
</svg>
#end if

<div class="bx--col">
<p class="label">$obs.label[$partial_obs]</p>
<!--prettier-ignore-->
Expand Down Expand Up @@ -347,4 +371,7 @@
</div>
#end if
</div>
#if "stat_tile_links" in $DisplayOptions and $partial_obs in $DisplayOptions["stat_tile_links"]
</a>
#end if
</div>
Loading

0 comments on commit b270a40

Please sign in to comment.