Merge branch 'develop'

CHANGELOG.md

@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - aligned timestamps of parameters for microgrid details report
 - aligned timestamps of parameters for energy storage power station details report
+- removed @staticmethod from __init__ methods in myems-api
 ### Removed
 
 ## [v4.7.0] - 2024-07-08

myems-api/core/apikey.py

@@ -9,8 +9,7 @@
 
 
 class ApiKeyCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes ApiKeyCollection"""
  pass
 
@@ -104,8 +103,7 @@ def on_post(req, resp):
 
 
 class ApiKeyItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes ApiKeyItem"""
  pass
 

myems-api/core/combinedequipment.py

@@ -8,8 +8,7 @@
 
 
 class CombinedEquipmentCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """ Initializes CombinedEquipmentCollection"""
  pass
 
@@ -197,8 +196,7 @@ def on_post(req, resp):
 
 
 class CombinedEquipmentItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes CombinedEquipmentItem"""
  pass
 
@@ -596,8 +594,7 @@ def on_post(req, resp, id_):
 
 
 class CombinedEquipmentEquipmentCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes CombinedEquipmentEquipmentCollection"""
  pass
 
@@ -714,8 +711,7 @@ def on_post(req, resp, id_):
 
 
 class CombinedEquipmentEquipmentItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes CombinedEquipmentEquipmentItem"""
  pass
 
@@ -776,8 +772,7 @@ def on_delete(req, resp, id_, eid):
 
 
 class CombinedEquipmentParameterCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes CombinedEquipmentParameterCollection"""
  pass
 
@@ -1110,8 +1105,7 @@ def on_post(req, resp, id_):
 
 
 class CombinedEquipmentParameterItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CombinedEquipmentParameterItem"""
  pass
 
@@ -1504,8 +1498,7 @@ def on_put(req, resp, id_, pid):
 
 
 class CombinedEquipmentMeterCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CombinedEquipmentMeterCollection"""
  pass
 
@@ -1643,8 +1636,7 @@ def on_post(req, resp, id_):
 
 
 class CombinedEquipmentMeterItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CombinedEquipmentMeterItem"""
  pass
 
@@ -1705,8 +1697,7 @@ def on_delete(req, resp, id_, mid):
 
 
 class CombinedEquipmentOfflineMeterCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CombinedEquipmentOfflineMeterCollection"""
  pass
 
@@ -1845,8 +1836,7 @@ def on_post(req, resp, id_):
 
 
 class CombinedEquipmentOfflineMeterItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CombinedEquipmentOfflineMeterItem"""
  pass
 
@@ -1907,8 +1897,7 @@ def on_delete(req, resp, id_, mid):
 
 
 class CombinedEquipmentVirtualMeterCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CombinedEquipmentVirtualMeterCollection"""
  pass
 
@@ -2046,8 +2035,7 @@ def on_post(req, resp, id_):
 
 
 class CombinedEquipmentVirtualMeterItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CombinedEquipmentVirtualMeterItem"""
  pass
 
@@ -2108,8 +2096,7 @@ def on_delete(req, resp, id_, mid):
 
 
 class CombinedEquipmentCommandCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes Class"""
  pass
 
@@ -2224,8 +2211,7 @@ def on_post(req, resp, id_):
 
 
 class CombinedEquipmentCommandItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes Class"""
  pass
 
@@ -2286,8 +2272,7 @@ def on_delete(req, resp, id_, cid):
 
 
 class CombinedEquipmentExport:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes CombinedEquipmentExport"""
  pass
 
@@ -2580,8 +2565,7 @@ def on_get(req, resp, id_):
 
 
 class CombinedEquipmentImport:
- @staticmethod
- def __init__():
+ def __init__(self):
  """ Initializes CombinedEquipmentImport"""
  pass
 
@@ -2970,8 +2954,7 @@ def on_post(req, resp):
 
 
 class CombinedEquipmentClone:
- @staticmethod
- def __init__():
+ def __init__(self):
  """Initializes CombinedEquipmentClone"""
  pass
 

myems-api/core/command.py

@@ -11,8 +11,7 @@
 
 
 class CommandCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CommandCollection"""
  pass
 
@@ -137,8 +136,7 @@ def on_post(req, resp):
 
 
 class CommandItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CommandItem"""
  pass
 
@@ -397,8 +395,7 @@ def on_put(req, resp, id_):
 
 
 class CommandSend:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CommandSend"""
  pass
 
@@ -488,8 +485,7 @@ def on_put(req, resp, id_):
 
 
 class CommandExport:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CommandItem"""
  pass
 
@@ -535,8 +531,7 @@ def on_get(req, resp, id_):
 
 
 class CommandImport:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CommandCollection"""
  pass
 
@@ -627,8 +622,7 @@ def on_post(req, resp):
 
 
 class CommandClone:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CommandItem"""
  pass
 

myems-api/core/contact.py

@@ -8,8 +8,7 @@
 
 
 class ContactCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes ContactCollection"""
  pass
 
@@ -128,8 +127,7 @@ def on_post(req, resp):
 
 
 class ContactItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes ContactItem"""
  pass
 

myems-api/core/costcenter.py

@@ -7,8 +7,7 @@
 
 
 class CostCenterCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CostCenterCollection"""
  pass
 
@@ -112,8 +111,7 @@ def on_post(req, resp):
 
 
 class CostCenterItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CostCenterItem"""
  pass
 
@@ -384,8 +382,7 @@ def on_put(req, resp, id_):
 
 
 class CostCenterTariffCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CostCenterTariffCollection"""
  pass
 
@@ -495,8 +492,7 @@ def on_post(req, resp, id_):
 
 
 class CostCenterTariffItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CostCenterTariffItem"""
  pass
 

myems-api/core/costfile.py

@@ -9,8 +9,7 @@
 
 
 class CostFileCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CostFileCollection"""
  pass
 
@@ -146,8 +145,7 @@ def on_post(req, resp):
 
 
 class CostFileItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CostFileItem"""
  pass
 
@@ -234,8 +232,7 @@ def on_delete(req, resp, id_):
 
 
 class CostFileRestore:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes CostFileRestore"""
  pass
 

myems-api/core/datarepairfile.py

@@ -9,8 +9,7 @@
 
 
 class DataRepairFileCollection:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes DataRepairFileCollection"""
  pass
 
@@ -146,8 +145,7 @@ def on_post(req, resp):
 
 
 class DataRepairFileItem:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes DataRepairFileItem"""
  pass
 
@@ -232,8 +230,7 @@ def on_delete(req, resp, id_):
 
 
 class DataRepairFileRestore:
- @staticmethod
- def __init__():
+ def __init__(self):
  """"Initializes DataRepairFileRestore"""
  pass