Added stale_age for month and year tamplates. More easy deactivation …

…of tables. [GH-14]

bin/user/diagram_util.py

@@ -147,7 +147,7 @@ def get_rounding(self, observation):
         if observation == 'UV' or observation == 'cloudbase':
             return 0
 
-        if observation == 'ET':
+        if observation == 'ET' or observation == 'rain':
             return 2
 
         return 1

bin/user/table_util.py

@@ -13,6 +13,7 @@ def __init__(self, generator):
         SearchList.__init__(self, generator)
         self.unit = UnitInfoHelper(generator.formatter, generator.converter)
         self.obs = ObsInfoHelper(generator.skin_dict)
+        self.diagram_util = DiagramUtil(SearchList)
 
     def get_table_aggregate_interval(self, observation, precision):
         """
@@ -25,7 +26,6 @@ def get_table_aggregate_interval(self, observation, precision):
         Returns:
             int: aggregate_interval
         """
-        #return 3600 * 72  # 1 day
         if precision == 'day':
             return 900 * 8  # 2 hours
 
@@ -83,19 +83,18 @@ def get_table_rows(self, obs, period, precision):
         """
         carbon_values = []
 
-        diagramUtil = DiagramUtil(SearchList)
-
+        # TODO: Get values directly from DB?
         for observation in obs:
             if getattr(period, observation).has_data:
                 series = getattr(period, observation).series(
-                    aggregate_type=diagramUtil.get_aggregate_type(observation),
+                    aggregate_type=self.diagram_util.get_aggregate_type(observation),
                     aggregate_interval=self.get_table_aggregate_interval(
                         observation,
                         precision
                     ),
                     time_series='start',
                     time_unit='unix_epoch'
-                ).round(diagramUtil.get_rounding(observation))
+                ).round(self.diagram_util.get_rounding(observation))
 
                 for start, data in zip(series.start, series.data):
                     cs_time = datetime.fromtimestamp(start.raw)

changelog.md

@@ -90,3 +90,7 @@
 - Bugfix: Added forecast_util.py in install.py, see https://github.com/Daveiano/weewx-interceptor-docker/issues/1
 
 # Next
+
+- Updated rain rounding in diagrams
+- Make Data Tables easy to deactivate, see readme
+- Generate month and year pages less frequently

readme.md

@@ -86,6 +86,8 @@ If you like the look and feel of the skin please consider having a look into the
 
 ### Installation
 
+**Requires weewx >= 4.5**
+
 **Please note:** For installation, please use the generated zip archive from a release, eg. https://github.com/Daveiano/weewx-wdc/releases/download/v1.2.0/weewx-wdc-v1.2.0.zip.
 Don't download the repository directly and don't use the GitHub generated zip and tar.gz archives that come alongside the release. Always use the zip archive named **weewx-wdc-vX.X.X.zip**
 
@@ -222,6 +224,8 @@ SKIN_VERSION = 1.0.0-beta2
 `climatological_days` E.g. Rain days (days with precipitation) or Summer days (Temp > 25°C). Leave empty to disable. When activated a rain days calendar chart and an averge temperature calendar chart is shown alongside.
 
 `table_tile_observations` Defines which observations should be shown in the data table component.
+Simply comment this out or leave empty to hide the tables at all pages:
+`#table_tile_observations = outTemp, outHumidity, barometer, ...`
 
 `stat_tile_observations` Define which observations should be shown in the stat tiles (at the top of each page).
 

skins/weewx-wdc/index.html.tmpl

@@ -78,10 +78,12 @@
             #end for
           </div>
 
+          #if 'table_tile_observations' in $DisplayOptions
           <div class="bx--row">
             <!-- prettier-ignore -->
             #include "includes/data-table-tile.inc"
           </div>
+          #end if
         </div>
       </section>
     </main>

skins/weewx-wdc/month-%Y-%m.html.tmpl

@@ -77,10 +77,12 @@
             #end for
           </div>
 
+          #if 'table_tile_observations' in $DisplayOptions
           <div class="bx--row">
             <!-- prettier-ignore -->
             #include "includes/data-table-tile.inc"
           </div>
+          #end if
         </div>
       </section>
     </main>

skins/weewx-wdc/month.html.tmpl

@@ -76,10 +76,12 @@
             #end for
           </div>
 
+          #if 'table_tile_observations' in $DisplayOptions
           <div class="bx--row">
             <!-- prettier-ignore -->
             #include "includes/data-table-tile.inc"
           </div>
+          #end if
         </div>
       </section>
     </main>

skins/weewx-wdc/skin.conf

@@ -66,16 +66,20 @@ SKIN_VERSION = 1.2.2
         [[[NOAA_month]]]
             encoding = normalized_ascii
             template = NOAA/NOAA-%Y-%m.txt.tmpl
+            stale_age = 3600 # Every hour
         [[[summary_month]]]
             template = month-%Y-%m.html.tmpl
+            stale_age = 3600 # Every hour
 
     [[SummaryByYear]]
         # Reports that summarize "by year"
         [[[NOAA_year]]]
             encoding = normalized_ascii
             template = NOAA/NOAA-%Y.txt.tmpl
+            stale_age = 3600 # Every hour
         [[[summary_year]]]
             template = year-%Y.html.tmpl
+            stale_age = 3600 # Every hour
 
     # Reports that show statistics "to date", such as day-to-date,
     # week-to-date, month-to-date, etc.
@@ -91,9 +95,11 @@ SKIN_VERSION = 1.2.2
 
         [[[year]]]
             template = year.html.tmpl
+            stale_age = 3600 # Every hour
 
         [[[statistics]]]
             template = statistics.html.tmpl
+            stale_age = 43200 # Twice a day
 
         [[[celestial]]]
             template = celestial.html.tmpl

skins/weewx-wdc/statistics.html.tmpl

@@ -78,10 +78,13 @@
             #end for
           </div>
 
+          <!-- prettier-ignore -->
+          #if 'table_tile_observations' in $DisplayOptions and len($DisplayOptions.get('table_tile_observations', [])) > 0
           <div class="bx--row">
             <!-- prettier-ignore -->
             #include "includes/data-table-tile.inc"
           </div>
+          #end if
         </div>
       </section>
     </main>

skins/weewx-wdc/week.html.tmpl

@@ -83,10 +83,12 @@
             #end for
           </div>
 
+          #if 'table_tile_observations' in $DisplayOptions
           <div class="bx--row">
             <!-- prettier-ignore -->
             #include "includes/data-table-tile.inc"
           </div>
+          #end if
         </div>
       </section>
     </main>

skins/weewx-wdc/year-%Y.html.tmpl

@@ -84,10 +84,12 @@
             #end for
           </div>
 
+          #if 'table_tile_observations' in $DisplayOptions
           <div class="bx--row">
             <!-- prettier-ignore -->
             #include "includes/data-table-tile.inc"
           </div>
+          #end if
         </div>
       </section>
     </main>

skins/weewx-wdc/year.html.tmpl

@@ -75,10 +75,12 @@
             #end for
           </div>
 
+          #if 'table_tile_observations' in $DisplayOptions
           <div class="bx--row">
             <!-- prettier-ignore -->
             #include "includes/data-table-tile.inc"
           </div>
+          #end if
         </div>
       </section>
     </main>