evapotranspiration graph

dist/install.py

@@ -8,7 +8,7 @@ def loader():
 class BasicInstaller(ExtensionInstaller):
     def __init__(self):
         super(BasicInstaller, self).__init__(
-            version="1.11",
+            version="1.12",
             name='neowx-material',
             description='The most versatile and modern weewx skin',
             author="Neoground GmbH",
@@ -42,6 +42,7 @@ def __init__(self):
                     'skins/neowx-material/year-%Y.html.tmpl',
                     'skins/neowx-material/year.html.tmpl',
                     'skins/neowx-material/yesterday.html.tmpl',
+                    'skins/neowx-material/history.html.tmpl',
                     'skins/neowx-material/archive/NOAA-%Y.txt.tmpl',
                     'skins/neowx-material/archive/NOAA-%Y-%m.txt.tmpl',
                     'skins/neowx-material/css/bootstrap.min.css',
@@ -140,5 +141,7 @@ def __init__(self):
                     'skins/neowx-material/weather-icons/font/weathericons-regular-webfont.ttf',
                     'skins/neowx-material/weather-icons/font/weathericons-regular-webfont.woff',
                     'skins/neowx-material/weather-icons/font/weathericons-regular-webfont.woff2']),
+                   ('bin/user',
+                    ['bin/user/historygenerator.py']),
             ]
             )

dist/readme.txt

@@ -49,7 +49,10 @@
 | 1) copy files to the weeWX skins directory                              |
 |    > cp -rp skins/neowx-material /home/weewx/skins                      |
 |                                                                         |
-| 2) in the weeWX configuration file, add / change a report and set       |
+| 3) copy /bin/user/historygenerator.py to                                |
+|              $WEEWX_ROOT/user. default: /usr/share/weewx/user           |
+|                                                                         |
+| 3) in the weeWX configuration file, add / change a report and set       |
 |    neowx-material as its skin                                           |
 |    [StdReport]                                                          |
 |        ...                                                              |

src/almanac.html.tmpl

@@ -1,4 +1,27 @@
 #encoding UTF-8
+#set $now = $current.dateTime.raw
+#set $yesterday = $now - 24*3600
+#set $today_dayluminosity = $almanac.sun.set.raw -  $almanac.sun.rise.raw                                                                                   
+#set $yesterday_dayluminosity = $almanac($almanac_time=$yesterday).sun.set.raw - $almanac($almanac_time=$yesterday).sun.rise.raw                            
+#set $difference_pre = $today_dayluminosity - $yesterday_dayluminosity
+#set $difference = $difference_pre//60
+#set $seconds = $almanac.sun.set.raw - $almanac.sun.rise.raw
+#set $hours = $seconds //3600
+#set $seconds %= 3600
+#set $minutes = $seconds//60
+#set $seconds %= 60
+#set $dayluminosity_str = "%d hours, %d minutes, %d seconds" % ($hours, $minutes, $seconds)                                                                 
+#set $difference = $today_dayluminosity - $yesterday_dayluminosity
+#if $difference
+    #set $delta = abs($difference)
+    #set $amt_str = "%s%d seconds" % (str(int($delta) // 60) + ' minutes, ' if ($delta // 60) > 0 else '', $delta % 60 if ($delta // 60) > 0 else $delta)
+    #if $difference > 0
+        #set $delta_str = "%s more than yesterday" % $amt_str
+    #else
+        #set $delta_str = "%s less than yesterday" % $amt_str
+    #end if
+    #set $dayluminosity_str = "%s" % ($dayluminosity_str)
+#end if
 ## +-------------------------------------------------------------------------+
 ## |    almanac.html.tmpl                Template file for "almanac" page    |
 ## +-------------------------------------------------------------------------+
@@ -51,7 +74,12 @@
                                       title="End civil twilight">$almanac(horizon=-6).sun(use_center=1).set</span>
                             </div>
                         </div>
-
+                        <h6 class="h6-responsive $Extras.color-text"> Today's Total Luminosity</h6>
+                        <div class="row">
+                            <div class="col">
+                                $dayluminosity_str ($delta_str)
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>

src/footer.inc

@@ -21,10 +21,18 @@
                     <tr>
                         <td>$Extras.Translations[$Extras.language].hardware:</td>
                         <td>$station.hardware</td>
+                        <td>&nbsp</td>
+                        <td>&nbsp</td>
+                        <td>$Extras.Translations[$Extras.language].station_uptime:</td>
+                        <td>$station.uptime.long_form</td>
                     </tr>
                     <tr>
                         <td>$Extras.Translations[$Extras.language].altitude:</td>
                         <td>$station.altitude</td>
+                        <td>&nbsp</td>
+                        <td>&nbsp</td>
+                        <td>$Extras.Translations[$Extras.language].server_uptime:</td>
+                        <td>$station.os_uptime.long_form</td>
                     </tr>
                     #if $Extras.Footer.show_telemetry == "yes"
                     <tr>

src/graph_line_archive_config.inc

@@ -0,0 +1,80 @@
+#encoding UTF-8
+## +-----------------------------------------------------------------------------------+
+## |    graph_line_archive_config.inc             JS config for default line charts    |
+## +-----------------------------------------------------------------------------------+
+
+chart: {
+    type: 'line',
+    zoom: {
+        enabled: false,
+        type: 'x',  
+        autoScaleYaxis: false,
+    },
+},
+
+dataLabels: {
+    enabled: false
+},
+
+stroke: {
+    width: 0,
+},
+
+plotOptions: {
+    line: {
+      borderRadius: 2,
+    }
+},
+
+fill: {
+    opacity: 0.7
+},
+
+markers: {
+    size: 4,
+    strokeWidth: 1,
+    strokeOpacity: 0.5,
+    strokeDashArray: 0,
+    fillOpacity: 0.7,
+    shape: "circle",
+    radius: 1,
+},
+
+xaxis: {
+    type: 'datetime',
+    tickAmount: 8,
+    trim: true,
+    labels: {
+        hideOverlappingLabels: true,
+        tickAmount: 8,
+        rotateAlways: false,
+        hideOverlappingLabels: true,
+        showDuplicates: false,
+        trim: true,
+        formatter: function(val, timestamp) {
+            return moment.unix(timestamp).format("$Extras.Formatting.datetime_graph_archive");
+        }
+    }
+},
+
+grid: {
+    show: true,
+    strokeDashArray: 0,
+    position: 'back',
+    xaxis: {
+        lines: {
+            show: false
+        }
+    },
+    yaxis: {
+        lines: {
+            show: true
+        }
+    },
+},
+
+tooltip: {
+    x: {
+        format: "$Extras.Formatting.datetime_graph_tooltip"
+    }
+},

src/graph_line_config.inc

@@ -0,0 +1,80 @@
+#encoding UTF-8
+## +---------------------------------------------------------------------------+
+## |    graph_line_config.inc             JS config for default line charts    |
+## +---------------------------------------------------------------------------+
+
+chart: {
+    type: 'line',
+    zoom: {
+        enabled: false,
+        type: 'x',  
+        autoScaleYaxis: false,
+    },
+},
+
+dataLabels: {
+    enabled: false
+},
+
+stroke: {
+    width: 0,
+},
+
+plotOptions: {
+    line: {
+      borderRadius: 2,
+    }
+},
+
+fill: {
+    opacity: 0.7
+},
+
+markers: {
+    size: 4,
+    strokeWidth: 1,
+    strokeOpacity: 0.5,
+    strokeDashArray: 0,
+    fillOpacity: 0.7,
+    shape: "circle",
+    radius: 1,
+},
+
+xaxis: {
+    type: 'datetime',
+    tickAmount: 8,
+    trim: true,
+    labels: {
+        hideOverlappingLabels: true,
+        tickAmount: 8,
+        rotateAlways: false,
+        hideOverlappingLabels: true,
+        showDuplicates: false,
+        trim: true,
+        formatter: function(val, timestamp) {
+            return moment.unix(timestamp).format("$Extras.Formatting.datetime_graph_label");
+        }
+    }
+},
+
+grid: {
+    show: true,
+    strokeDashArray: 0,
+    position: 'back',
+    xaxis: {
+        lines: {
+            show: false
+        }
+    },
+    yaxis: {
+        lines: {
+            show: true
+        }
+    },
+},
+
+tooltip: {
+    x: {
+        format: "$Extras.Formatting.datetime_graph_tooltip"
+    }
+},

src/head.inc

@@ -24,6 +24,19 @@
 ## Tap highlighting
 <meta name="msapplication-tap-highlight" content="no">
 
+## Google Analytics
+#if $Extras.Header.google_analytics_enable == "yes"
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=$Extras.Header.google_analytics_id"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '$Extras.Header.google_analytics_id');
+</script>
+#end if
+
 ## Favicons / mobile icons
 <link href="img/icon-16.ico" rel="shortcut icon" type="image/x-icon">
 <link href="img/icon-16.png" rel="icon" type="image/png" sizes="16x16">

src/header.inc

@@ -17,7 +17,11 @@
             #end if
             <span>
                 <strong>$station.location</strong><br>
+                #if $active_nav == 'archive'
+                <span class="font-small"></span>
+                #else 
                 <span class="font-small">$current.dateTime</span>
+                #end if
             </span>
         </span>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
@@ -98,7 +102,15 @@
                     </li>
                     #end if
                 #end if
-
+                #if $active_nav == 'history'
+                    <li class="nav-item active mr-3">
+                        <a class="nav-link" href="history.html">$Extras.Translations[$Extras.language].history</a>
+                    </li>
+                #else
+                    <li class="nav-item mr-3">
+                        <a class="nav-link" href="history.html">$Extras.Translations[$Extras.language].history</a>
+                    </li>
+                #end if
                 #if $Extras.Header.almanac_nav_link == "yes"
                     #if $active_nav == 'almanac'
                     <li class="nav-item active mr-3">
@@ -126,7 +138,7 @@
             </ul>
         </div>
 
-        #if $active_nav != 'archive' and $Extras.Header.show_almanac == "yes"
+        #if $Extras.Header.show_almanac == "yes"
             #if $almanac.hasExtras
             <ul class="navbar-nav nav-flex-icons" style="line-height: 1.75; padding-top: .5rem">
                 <li class="nav-item mr-4 text-white">