Fixes #17 and closes #18.

jacroe · Oct 7, 2012 · 2462156 · 2462156
1 parent 2df2db0
commit 2462156
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/alice.sql b/alice.sql
@@ -51,8 +51,11 @@ INSERT INTO `a_modules` (`name`, `value`, `lastchanged`) VALUES
 ('weather_hiTemp', '100', '2012-01-01 06:00:00'),
 ('weather_loTemp', '0', '2012-01-01 06:00:00'),
 ('weather_fcastToday', 'Clear', '2012-01-01 06:00:00'),
+('weather_fcastTonight', 'Clear', '2012-01-01 06:00:00'),
 ('weather_fcastTomorrow', 'Clear', '2012-01-01 06:00:00'),
+('weather_fcastTomorrowNight', 'Clear', '2012-01-01 06:00:00'),
 ('weather_fcastNextday', 'Clear', '2012-01-01 06:00:00'),
+('weather_fcastNextdayNight', 'Clear', '2012-01-01 06:00:00'),
 ('weather_icon', 'sunny', '2012-01-01 06:00:00'),
 ('email_count', '0', '2012-01-01 06:00:00'),
 ('location_city', 'Hattiesburg', '2012-01-01 06:00:00');

diff --git a/inc/templates/weather.tpl b/inc/templates/weather.tpl
@@ -21,9 +21,16 @@
 <h2>Forecast</h2>
 <table class="table table-bordered table-condensed">
 <tbody>
+{{if $smarty.now|date_format:"%H" < 18}}
 <tr><td><strong>Today</strong></td><td>{{$weather.fcastToday}}</td></tr>
+{{/if}}
+<tr><td><strong>Tonight</strong></td><td>{{$weather.fcastTonight}}</td></tr>
 <tr><td><strong>Tomorrow</strong></td><td>{{$weather.fcastTomorrow}}</td></tr>
+<tr><td><strong>Tomorrow night</strong></td><td>{{$weather.fcastTomorrowNight}}</td></tr>
+{{if $smarty.now|date_format:"%H" >= 18}}
 <tr><td><strong>{{$nextDay}}</strong></td><td>{{$weather.fcastNextday}}</td></tr>
+{{/if}}
+{{* <tr><td><strong>{{$nextDay}} night</strong></td><td>{{$weather.fcastNextdayNight}}</td></tr> *}}
 </tbody>
 </table>
 </div>

diff --git a/modules/weather.php b/modules/weather.php
@@ -15,8 +15,11 @@ function alice_weather_get($loc)
 	"hiTemp"=>"{$jsonWeather->forecast->simpleforecast->forecastday[0]->high->fahrenheit}", 
 	"loTemp"=>"{$jsonWeather->forecast->simpleforecast->forecastday[0]->low->fahrenheit}",
 	"fcastToday"=>"{$jsonWeather->forecast->txt_forecast->forecastday[0]->fcttext}",
-	"fcastTomorrow"=>"{$jsonWeather->forecast->txt_forecast->forecastday[1]->fcttext}",
-	"fcastNextday"=>"{$jsonWeather->forecast->txt_forecast->forecastday[2]->fcttext}",
+	"fcastTonight"=>"{$jsonWeather->forecast->txt_forecast->forecastday[1]->fcttext}",
+	"fcastTomorrow"=>"{$jsonWeather->forecast->txt_forecast->forecastday[2]->fcttext}",
+	"fcastTomorrowNight"=>"{$jsonWeather->forecast->txt_forecast->forecastday[3]->fcttext}",
+	"fcastNextday"=>"{$jsonWeather->forecast->txt_forecast->forecastday[4]->fcttext}",
+	"fcastNextdayNight"=>"{$jsonWeather->forecast->txt_forecast->forecastday[5]->fcttext}",
 	"icon"=>$icon);
 }
 function alice_weather_getRadar($loc)

diff --git a/recipes/daily-email.php b/recipes/daily-email.php
@@ -11,7 +11,7 @@
 	$smarty->assign("date", date('l, F j, Y '));
 	$smarty->assign("city", $l['city']);
 	$smarty->assign("state", $l['state']);
-	$smarty->assign("weather", $w['fcastFull']);
+	$smarty->assign("weather", $w['fcastToday']);
 	$smarty->assign("clothes", alice_clothes($w));
 
 	$body = $smarty->fetch('dailyEmail.tpl');