From 24c415fbaa804314b584e9a451bb5922a8b8d812 Mon Sep 17 00:00:00 2001 From: defane Date: Mon, 14 Dec 2015 22:04:34 +0100 Subject: [PATCH] Timezone support for openingTimes --- src/app/level2/Level2.php | 6 ++++-- src/app/views/openingTimes.twig | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/level2/Level2.php b/src/app/level2/Level2.php index 640743b..feabff6 100644 --- a/src/app/level2/Level2.php +++ b/src/app/level2/Level2.php @@ -3,6 +3,8 @@ namespace level2; use Silex\Application; + use \DateTime; + use \DateTimeZone; class Level2 { @@ -223,6 +225,7 @@ static public function getChartData( $app ) { $dowMap = array( 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ); + $localtime_offset = date('Z') / 3600; $chartDataQuery = 'SELECT ROUND( AVG( people ) ) FROM state @@ -235,8 +238,7 @@ $chartDataByDay[ 'name' ] = $dowMap[ $dow ]; for( $hod = 0; $hod < 24; $hod++ ) { - - $chartDataByDay[ 'data' ][ $hod ] = $app[ 'db' ]->fetchColumn( + $chartDataByDay[ 'data' ][ ($hod + $localtime_offset) % 24 ] = $app[ 'db' ]->fetchColumn( $chartDataQuery, array( $dow, diff --git a/src/app/views/openingTimes.twig b/src/app/views/openingTimes.twig index c23e88d..27c1332 100644 --- a/src/app/views/openingTimes.twig +++ b/src/app/views/openingTimes.twig @@ -18,8 +18,8 @@ {% for day in chart %} {{ day.name }} - {% for value in day.data %} - {{ value }} + {% for hour in 0..23 %} + {{ day.data[hour] }} {% endfor %} {% endfor %}