Merge branch 'develop'

MyEMS · May 20, 2024 · 7948783 · 7948783
2 parents 9cb97d5 + 4b025ee
commit 7948783
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/myems-api/reports/energystoragepowerstationdashboard.py b/myems-api/reports/energystoragepowerstationdashboard.py
@@ -95,7 +95,7 @@ def on_get(req, resp):
         energy_storage_power_station_list = list()
         if rows_energy_storage_power_stations is not None and len(rows_energy_storage_power_stations) > 0:
             for row in rows_energy_storage_power_stations:
-                # get gateway latest seen datetime to determine if it is online
+                # get data source latest seen datetime to determine if it is online
                 query = (" SELECT tds.last_seen_datetime_utc "
                          " FROM tbl_energy_storage_power_stations_containers tespsc, "
                          "      tbl_energy_storage_containers_batteries tescb, "

diff --git a/myems-api/reports/energystoragepowerstationlist.py b/myems-api/reports/energystoragepowerstationlist.py
@@ -99,7 +99,7 @@ def on_get(req, resp):
         if rows_energy_storage_power_stations is not None and len(rows_energy_storage_power_stations) > 0:
             for row in rows_energy_storage_power_stations:
                 energy_storage_power_station_id = row[0]
-                # get gateway latest seen datetime to determine if it is online
+                # get data source latest seen datetime to determine if it is online
                 query = (" SELECT tds.last_seen_datetime_utc   "
                          " FROM tbl_energy_storage_power_stations_containers tespsesc, "
                          "      tbl_energy_storage_containers_power_conversion_systems tescpcs, "

diff --git a/myems-api/reports/microgriddashboard.py b/myems-api/reports/microgriddashboard.py
@@ -170,7 +170,7 @@ def on_get(req, resp):
         microgrid_list = list()
         if rows_microgrids is not None and len(rows_microgrids) > 0:
             for row in rows_microgrids:
-                # get gateway latest seen datetime to determine if it is online
+                # get data source latest seen datetime to determine if it is online
                 query = (" SELECT tds.last_seen_datetime_utc "
                          " FROM tbl_microgrids_batteries mb, tbl_points p, tbl_data_sources tds, tbl_gateways tg "
                          " WHERE  microgrid_id  = %s "

diff --git a/myems-api/reports/microgridlist.py b/myems-api/reports/microgridlist.py
@@ -99,8 +99,7 @@ def on_get(req, resp):
         if rows_microgrids is not None and len(rows_microgrids) > 0:
             for row in rows_microgrids:
                 microgrid_id = row[0]
-
-                # get gateway latest seen datetime to determine if it is online
+                # get data source latest seen datetime to determine if it is online
                 query = (" SELECT tg.last_seen_datetime_utc "
                          " FROM tbl_microgrids_batteries mb, tbl_points p, tbl_data_sources tds, tbl_gateways tg "
                          " WHERE  microgrid_id  = %s "

diff --git a/myems-web/src/i18n.js b/myems-web/src/i18n.js
@@ -13723,7 +13723,7 @@ const resources = {
       'Switch between styles for your vertical navbar': '切換垂直導航欄的樣式',
       Language: '語⾔',
       'Switch between languages': '切換語⾔',
-      'language-zh_CN': '簡體中⽂',
+      'language-zh_CN': '简体中文',
       'language-en': 'English',
       'language-de': 'Deutsch',
       'language-fr': 'Français',