Merge branch 'develop'

MyEMS · Feb 11, 2024 · 8a43317 · 8a43317
2 parents 6694670 + fa3ff32
commit 8a43317
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 34 deletions.
diff --git a/myems-api/core/combinedequipment.py b/myems-api/core/combinedequipment.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/command.py b/myems-api/core/command.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/distributionsystem.py b/myems-api/core/distributionsystem.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/energystoragepowerstation.py b/myems-api/core/energystoragepowerstation.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json
@@ -1663,7 +1663,8 @@ def on_post(req, resp):
                             cursor.close()
                             cnx.close()
                             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.ERROR',
-                                                   description='API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS')
+                                                   description=
+                                                   'API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS')
 
                     query = (" SELECT id "
                              " FROM tbl_meters_points "
@@ -1809,7 +1810,8 @@ def on_post(req, resp, id_):
                             cursor.close()
                             cnx.close()
                             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.ERROR',
-                                                   description='API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS')
+                                                   description=
+                                                   'API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS')
 
                     query = (" SELECT id "
                              " FROM tbl_meters_points "

diff --git a/myems-api/core/microgrid.py b/myems-api/core/microgrid.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/photovoltaicpowerstation.py b/myems-api/core/photovoltaicpowerstation.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/point.py b/myems-api/core/point.py
@@ -1,5 +1,5 @@
 import falcon
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import mysql.connector
 import simplejson as json
 from core.useractivity import user_logger, admin_control

diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/space.py b/myems-api/core/space.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json
@@ -89,7 +89,6 @@ def on_get(req, resp):
         result = list()
         if rows_spaces is not None and len(rows_spaces) > 0:
             for row in rows_spaces:
-                timezone = timezone_dict.get(row[5], None)
                 contact = contact_dict.get(row[8], None)
                 cost_center = cost_center_dict.get(row[9], None)
                 parent_space = space_dict.get(row[3], None)
@@ -98,7 +97,7 @@ def on_get(req, resp):
                                "uuid": row[2],
                                "parent_space": parent_space,
                                "area": row[4],
-                               "timezone": timezone,
+                               "timezone": timezone_dict.get(row[5], None),
                                "is_input_counted": bool(row[6]),
                                "is_output_counted": bool(row[7]),
                                "contact": contact,
@@ -383,15 +382,14 @@ def on_get(req, resp, id_):
                                    description='API.SPACE_NOT_FOUND')
         else:
             parent_space = space_dict.get(row[3], None)
-            timezone = timezone_dict.get(row[5], None)
             contact = contact_dict.get(row[8], None)
             cost_center = cost_center_dict.get(row[9], None)
             meta_result = {"id": row[0],
                            "name": row[1],
                            "uuid": row[2],
                            "parent_space_id": parent_space,
                            "area": row[4],
-                           "timezone": timezone,
+                           "timezone": timezone_dict.get(row[5], None),
                            "is_input_counted": bool(row[6]),
                            "is_output_counted": bool(row[7]),
                            "contact": contact,
@@ -804,7 +802,6 @@ def on_get(req, resp, id_):
 
         if rows_spaces is not None and len(rows_spaces) > 0:
             for row in rows_spaces:
-                timezone = timezone_dict.get(row[5], None)
                 contact = contact_dict.get(row[8], None)
                 cost_center = cost_center_dict.get(row[9], None)
                 parent_space = space_dict.get(row[3], None)
@@ -813,7 +810,7 @@ def on_get(req, resp, id_):
                                "uuid": row[2],
                                "parent_space": parent_space,
                                "area": row[4],
-                               "timezone": timezone,
+                               "timezone": timezone_dict.get(row[5], None),
                                "is_input_counted": bool(row[6]),
                                "is_output_counted": bool(row[7]),
                                "contact": contact,
@@ -3589,15 +3586,14 @@ def on_post(req, resp, id_):
                                    description='API.SPACE_NOT_FOUND')
         else:
             parent_space = space_dict.get(row[3], None)
-            timezone = timezone_dict.get(row[5], None)
             contact = contact_dict.get(row[8], None)
             cost_center = cost_center_dict.get(row[9], None)
             meta_result = {"id": row[0],
                            "name": row[1],
                            "uuid": row[2],
                            "parent_space_id": parent_space,
                            "area": row[4],
-                           "timezone": timezone,
+                           "timezone": timezone_dict.get(row[5], None),
                            "is_input_counted": bool(row[6]),
                            "is_output_counted": bool(row[7]),
                            "contact": contact,

diff --git a/myems-api/core/store.py b/myems-api/core/store.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/virtualpowerplant.py b/myems-api/core/virtualpowerplant.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/windfarm.py b/myems-api/core/windfarm.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/core/workingcalendar.py b/myems-api/core/workingcalendar.py
@@ -1,5 +1,5 @@
 import falcon
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import mysql.connector
 import simplejson as json
 from core.useractivity import admin_control, access_control, api_key_control

diff --git a/myems-api/reports/energystoragepowerstationdetails.py b/myems-api/reports/energystoragepowerstationdetails.py
@@ -1,6 +1,5 @@
 import re
-from datetime import datetime, timedelta, timezone
-from decimal import Decimal
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/reports/energystoragepowerstationreporting.py b/myems-api/reports/energystoragepowerstationreporting.py
@@ -1,6 +1,5 @@
 import re
-from datetime import datetime, timedelta, timezone
-from decimal import Decimal
+from datetime import datetime, timedelta
 import falcon
 import mysql.connector
 import simplejson as json

diff --git a/myems-api/reports/offlinemeterinput.py b/myems-api/reports/offlinemeterinput.py
@@ -95,11 +95,11 @@ def on_post(req, resp):
                 add_values = (" INSERT INTO tbl_offline_meter_hourly "
                               "             (offline_meter_id, start_datetime_utc, actual_value) "
                               " VALUES  ")
-                sum = actual_value * 24
+                sum_24hours = actual_value * 24
                 last_date_utc = end_datetime_utc - timedelta(minutes=config.minutes_to_count)
                 while start_datetime_utc < end_datetime_utc:
-                    if start_datetime_utc == last_date_utc and sum != daily_value:
-                        actual_value = daily_value - sum + actual_value
+                    if start_datetime_utc == last_date_utc and sum_24hours != daily_value:
+                        actual_value = daily_value - sum_24hours + actual_value
                     add_values += " (" + str(offline_meter_id) + ","
                     add_values += "'" + start_datetime_utc.isoformat()[0:19] + "',"
                     add_values += str(actual_value) + "), "