Merge pull request #2574 from daniel-windsor/forecase-ignore-today

modules/default/weather/forecast.njk

@@ -5,9 +5,9 @@
         {% set forecast = forecast.slice(0, numSteps) %}
         {% for f in forecast %}
             <tr {% if config.colored %}class="colored"{% endif %} {% if config.fade %}style="opacity: {{ currentStep | opacity(numSteps) }};"{% endif %}>
-                {% if (currentStep == 0) %}
+                {% if (currentStep == 0) and config.ignoreToday == false %}
                     <td class="day">{{ "TODAY" | translate }}</td>
-                {% elif (currentStep == 1) %}
+                {% elif (currentStep == 1) and config.ignoreToday == false %}
                     <td class="day">{{ "TOMORROW" | translate }}</td>
                 {% else %}
                     <td class="day">{{ f.date.format('ddd') }}</td>

modules/default/weather/weather.js

@@ -33,6 +33,7 @@ Module.register("weather", {
 		showIndoorHumidity: false,
 		maxNumberOfDays: 5,
 		maxEntries: 5,
+    ignoreToday: false,
 		fade: true,
 		fadePoint: 0.25, // Start on 1/4th of the list.
 		initialLoadDelay: 0, // 0 seconds delay
@@ -129,10 +130,16 @@ Module.register("weather", {
 
 	// Add all the data to the template.
 	getTemplateData: function () {
+    const forecast = this.weatherProvider.weatherForecast()
+
+    if (this.config.ignoreToday) {
+      forecast.splice(0, 1)
+    }
+    
 		return {
 			config: this.config,
 			current: this.weatherProvider.currentWeather(),
-			forecast: this.weatherProvider.weatherForecast(),
+			forecast: forecast,
 			hourly: this.weatherProvider.weatherHourly(),
 			indoor: {
 				humidity: this.indoorHumidity,
@@ -261,7 +268,7 @@ Module.register("weather", {
 
 		this.nunjucksEnvironment().addFilter(
 			"calcNumEntries",
-			function (dataArray) {
+			function (dataArray) {       
 				return Math.min(dataArray.length, this.config.maxEntries);
 			}.bind(this)
 		);