remove fixed user timezone

Author: TrystanLea

apps/OpenEnergyMonitor/myheatpump/myheatpump_controller.php

@@ -14,9 +14,16 @@
 
 function myheatpump_app_controller($route,$app,$appconfig,$apikey)
 {
-    global $path, $session, $settings, $mysqli, $redis;
+    global $path, $session, $settings, $mysqli, $redis, $user;
     $v = 1;
 
+    if (!$user_timezone = $user->get_timezone($session['userid'])) {
+        $user_timezone = 'Europe/London';
+    }
+    if (is_numeric($user_timezone)) $user_timezone = "Europe/London";
+    // if timezone UTC set to Europe/London
+    if ($user_timezone == "UTC") $user_timezone = "Europe/London";
+
     require_once "Modules/feed/feed_model.php";
     $settings['feed']['max_datapoints'] = 100000;
     $settings['feed']['max_datapoints'] = 1200000;
@@ -25,7 +32,7 @@ function myheatpump_app_controller($route,$app,$appconfig,$apikey)
     require_once "Modules/app/apps/OpenEnergyMonitor/myheatpump/myheatpump_process.php";
     require_once "Modules/app/apps/OpenEnergyMonitor/myheatpump/myheatpump_waft.php";
     require_once "Modules/app/apps/OpenEnergyMonitor/myheatpump/myheatpump_model.php";
-    $myheatpump = new MyHeatPump($mysqli,$redis,$feed,$appconfig);
+    $myheatpump = new MyHeatPump($mysqli,$redis,$feed,$appconfig, $user_timezone);
 
     if ($route->action == "view" || $route->action == "") {
         $route->format = "html";
@@ -128,7 +135,7 @@ function myheatpump_app_controller($route,$app,$appconfig,$apikey)
 
         if (!$start || !$end) {
             $date = new DateTime();
-            $date->setTimezone(new DateTimeZone("Europe/London"));
+            $date->setTimezone(new DateTimeZone($user_timezone));
             $date->setTime(0,0,0);
             $end = $date->getTimestamp();
             $date->modify("-1 day");
@@ -212,7 +219,7 @@ function myheatpump_app_controller($route,$app,$appconfig,$apikey)
         if (!$start || !$end) {
             $date = new DateTime();
             // Europe/London is UTC+1
-            $date->setTimezone(new DateTimeZone('Europe/London'));
+            $date->setTimezone(new DateTimeZone($user_timezone));
             // Set end to midnight start of today
             $date->setTime(0, 0, 0);
             $end = $date->getTimestamp();

apps/OpenEnergyMonitor/myheatpump/myheatpump_model.php

@@ -7,13 +7,15 @@ class MyHeatPump {
     private $feed;
     private $appconfig;
     private $schema;
+    private $user_timezone;
 
     // constructor
-    function __construct($mysqli,$redis,$feed,$appconfig) {
+    function __construct($mysqli,$redis,$feed,$appconfig,$user_timezone = 'Europe/London') {
         $this->mysqli = $mysqli;
         $this->redis = $redis;
         $this->feed = $feed;
         $this->appconfig = $appconfig;
+        $this->user_timezone = $user_timezone;
 
         // Load schema
         $schema = array();
@@ -184,7 +186,7 @@ public function process_daily($id, $timeout = 3) {
 
         // Calculate start and end time aligned to midnight
         $date = new DateTime();
-        $date->setTimezone(new DateTimeZone('Europe/London'));
+        $date->setTimezone(new DateTimeZone($this->user_timezone));
 
         $date->setTimestamp($end_time);
         $date->modify("midnight");
@@ -217,7 +219,7 @@ public function process_daily($id, $timeout = 3) {
         while ($time<$end) {
 
             // Get stats for the day
-            $stats = get_heatpump_stats($this->feed,$app,$time,$time+(3600*24),$starting_power);
+            $stats = get_heatpump_stats($this->feed,$app,$time,$time+(3600*24),$starting_power,$this->user_timezone);
 
             // Translate for database field compatibility
             $row = $this->format_flat_keys($stats);

apps/OpenEnergyMonitor/myheatpump/myheatpump_process.php

@@ -140,20 +140,19 @@ function auto_detect_cooling($data, $interval) {
     return $data_heatpump_cooling;
 }
 
-function get_heatpump_stats($feed,$app,$start,$end,$starting_power) {
+function get_heatpump_stats($feed,$app,$start,$end,$starting_power,$timezone = 'Europe/London') {
 
     // --------------------------------------------------------------------------------------------------------------    
     // Validate params
     // --------------------------------------------------------------------------------------------------------------
     if ($end===null || $start===null) {
         $date = new DateTime();
-        $date->setTimezone(new DateTimeZone("Europe/London"));
+        $date->setTimezone(new DateTimeZone($timezone));
         $date->modify("midnight");
         $end = $date->getTimestamp();
         $date->modify("-30 day");
         $start = $date->getTimestamp();
     } else {
-        $timezone = 'Europe/London';
         $start = convert_time($start,$timezone);
         $end = convert_time($end,$timezone);
     }
@@ -187,7 +186,7 @@ function get_heatpump_stats($feed,$app,$start,$end,$starting_power) {
     foreach ($feeds as $key) {
         $data[$key] = false;
         if (isset($app->config->$key) && $app->config->$key>0) {   
-            $data[$key] = $feed->get_data($app->config->$key,$start,$end-$interval,$interval,1,"Europe/London","notime");
+            $data[$key] = $feed->get_data($app->config->$key,$start,$end-$interval,$interval,1,$timezone,"notime");
             $data[$key] = remove_null_values($data[$key],$interval);
         }
     }

module.json

@@ -1,6 +1,6 @@
 {
     "name"         : "App",
-    "version"      : "3.1.3",
+    "version"      : "3.1.4",
     "location"     : "/var/www/emoncms/Modules",
     "branches_available": ["stable","master"]
 }