Merge branch 'develop'

MyEMS · May 31, 2024 · 8e6be3d · 8e6be3d
2 parents 130f3db + 35fc07c
commit 8e6be3d
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 21 deletions.
diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql
@@ -473,6 +473,7 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_energy_storage_power_stations`
   `cost_center_id` BIGINT NOT NULL,
   `svg` LONGTEXT NOT NULL,
   `is_cost_data_displayed` BOOL NOT NULL,
+  `phase_of_lifecycle` VARCHAR(255) NOT NULL,
   `description` VARCHAR(255),
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_energy_storage_power_stations_index_1`
@@ -856,6 +857,7 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_microgrids` (
   `serial_number` VARCHAR(255) NOT NULL,
   `svg` LONGTEXT NOT NULL,
   `is_cost_data_displayed` BOOL NOT NULL,
+  `phase_of_lifecycle` VARCHAR(255) NOT NULL,
   `description` VARCHAR(255),
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_microgrids_index_1` ON `myems_system_db`.`tbl_microgrids` (`name`);

diff --git a/database/upgrade/upgrade4.6.0RC.sql b/database/upgrade/upgrade4.6.0RC.sql
@@ -26,6 +26,9 @@ ALTER TABLE myems_system_db.tbl_energy_storage_containers_power_conversion_syste
 ALTER TABLE myems_system_db.tbl_energy_storage_containers_power_conversion_systems ADD `today_discharge_energy_point_id` BIGINT NOT NULL AFTER `rated_output_power`;
 ALTER TABLE myems_system_db.tbl_energy_storage_containers_power_conversion_systems ADD `today_charge_energy_point_id` BIGINT NOT NULL AFTER `rated_output_power`;
 
+ALTER TABLE myems_system_db.tbl_energy_storage_power_stations ADD `phase_of_lifecycle` VARCHAR(255) NOT NULL AFTER `is_cost_data_displayed`;
+ALTER TABLE myems_system_db.tbl_microgrids ADD `phase_of_lifecycle` VARCHAR(255) NOT NULL AFTER `is_cost_data_displayed`;
+
 -- UPDATE VERSION NUMBER
 UPDATE `myems_system_db`.`tbl_versions` SET version='4.6.0RC', release_date='2024-06-18' WHERE id=1;
 

diff --git a/myems-api/reports/energystoragepowerstationdashboard.py b/myems-api/reports/energystoragepowerstationdashboard.py
@@ -82,13 +82,13 @@ def on_get(req, resp):
             for row in rows_spaces:
                 space_dict[row[0]] = row[1]
         print(space_dict)
-        # Get energy storage power station
+        # Get energy storage power stations
         query = (" SELECT m.id, m.name, m.uuid, "
                  "        m.address, m.postal_code, m.latitude, m.longitude, "
-                 "        m.rated_capacity, m.rated_power, m.description "
+                 "        m.rated_capacity, m.rated_power, m.description, m.phase_of_lifecycle "
                  " FROM tbl_energy_storage_power_stations m, tbl_energy_storage_power_stations_users mu "
                  " WHERE m.id = mu.energy_storage_power_station_id AND mu.user_id = %s "
-                 " ORDER BY name ")
+                 " ORDER BY m.phase_of_lifecycle, m.id ")
         cursor_system_db.execute(query, (user['id'],))
         rows_energy_storage_power_stations = cursor_system_db.fetchall()
 
@@ -125,6 +125,7 @@ def on_get(req, resp):
                                "rated_capacity": row[7],
                                "rated_power": row[8],
                                "description": row[9],
+                               "phase_of_lifecycle": row[10],
                                "status": 'online' if is_online else 'offline'}
                 energy_storage_power_station_list.append(meta_result)
         ################################################################################################################

diff --git a/myems-api/reports/energystoragepowerstationdetails.py b/myems-api/reports/energystoragepowerstationdetails.py
@@ -104,15 +104,15 @@ def on_get(req, resp):
         if energy_storage_power_station_id is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE id = %s ")
             cursor_system.execute(query, (energy_storage_power_station_id,))
             row = cursor_system.fetchone()
         elif energy_storage_power_station_uuid is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE uuid = %s ")
             cursor_system.execute(query, (energy_storage_power_station_uuid,))
@@ -138,6 +138,7 @@ def on_get(req, resp):
                            "cost_center": cost_center_dict.get(row[10], None),
                            "svg": row[11],
                            "description": row[12],
+                           "phase_of_lifecycle": row[13],
                            "qrcode": 'energystoragepowerstation:' + row[2]}
 
         point_list = list()

diff --git a/myems-api/reports/energystoragepowerstationitembilling.py b/myems-api/reports/energystoragepowerstationitembilling.py
@@ -84,15 +84,15 @@ def on_get(req, resp):
         if energy_storage_power_station_id is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE id = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_id,))
             row = cursor_system_db.fetchone()
         elif energy_storage_power_station_uuid is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE uuid = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_uuid,))
@@ -116,7 +116,9 @@ def on_get(req, resp):
                 "longitude": row[6],
                 "rated_capacity": row[7],
                 "rated_power": row[8],
-                "description": row[9]}
+                "description": row[9],
+                "phase_of_lifecycle": row[10]
+            }
 
         ################################################################################################################
         # Step 3: query charge billing data in 7 days

diff --git a/myems-api/reports/energystoragepowerstationitemcarbon.py b/myems-api/reports/energystoragepowerstationitemcarbon.py
@@ -84,15 +84,15 @@ def on_get(req, resp):
         if energy_storage_power_station_id is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE id = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_id,))
             row = cursor_system_db.fetchone()
         elif energy_storage_power_station_uuid is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE uuid = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_uuid,))
@@ -116,7 +116,8 @@ def on_get(req, resp):
                 "longitude": row[6],
                 "rated_capacity": row[7],
                 "rated_power": row[8],
-                "description": row[9]}
+                "description": row[9],
+                "phase_of_lifecycle": row[10]}
 
         ################################################################################################################
         # Step 3: query charge billing data in 7 days

diff --git a/myems-api/reports/energystoragepowerstationitemdashboard.py b/myems-api/reports/energystoragepowerstationitemdashboard.py
@@ -82,15 +82,15 @@ def on_get(req, resp):
         if energy_storage_power_station_id is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE id = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_id,))
             row = cursor_system_db.fetchone()
         elif energy_storage_power_station_uuid is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE uuid = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_uuid,))
@@ -114,7 +114,8 @@ def on_get(req, resp):
                 "longitude": row[6],
                 "rated_capacity": row[7],
                 "rated_power": row[8],
-                "description": row[9]}
+                "description": row[9],
+                "phase_of_lifecycle": row[10]}
 
         ################################################################################################################
         # Step 3: query charge energy data

diff --git a/myems-api/reports/energystoragepowerstationitemenergy.py b/myems-api/reports/energystoragepowerstationitemenergy.py
@@ -84,15 +84,15 @@ def on_get(req, resp):
         if energy_storage_power_station_id is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE id = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_id,))
             row = cursor_system_db.fetchone()
         elif energy_storage_power_station_uuid is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE uuid = %s ")
             cursor_system_db.execute(query, (energy_storage_power_station_uuid,))
@@ -116,7 +116,8 @@ def on_get(req, resp):
                 "longitude": row[6],
                 "rated_capacity": row[7],
                 "rated_power": row[8],
-                "description": row[9]}
+                "description": row[9],
+                "phase_of_lifecycle": row[10]}
 
         ################################################################################################################
         # Step 3: query charge energy data in 7 days

diff --git a/myems-api/reports/energystoragepowerstationlist.py b/myems-api/reports/energystoragepowerstationlist.py
@@ -88,10 +88,10 @@ def on_get(req, resp):
         # get energy storage power stations
         query = (" SELECT m.id, m.name, m.uuid, "
                  "        m.address, m.postal_code, m.latitude, m.longitude, m.rated_capacity, m.rated_power, "
-                 "        m.contact_id, m.cost_center_id, m.description "
+                 "        m.contact_id, m.cost_center_id, m.description, m.phase_of_lifecycle "
                  " FROM tbl_energy_storage_power_stations m, tbl_energy_storage_power_stations_users mu "
                  " WHERE m.id = mu.energy_storage_power_station_id AND mu.user_id = %s "
-                 " ORDER BY id ")
+                 " ORDER BY m.phase_of_lifecycle, m.id ")
         cursor_system_db.execute(query, (user_id, ))
         rows_energy_storage_power_stations = cursor_system_db.fetchall()
 
@@ -255,6 +255,7 @@ def on_get(req, resp):
                                "contact": contact_dict.get(row[9], None),
                                "cost_center": cost_center_dict.get(row[10], None),
                                "description": row[11],
+                               "phase_of_lifecycle": row[12],
                                "qrcode": 'energystoragepowerstation:' + row[2],
                                "is_online": is_online,
                                "pcs_run_state": pcs_run_state,

diff --git a/myems-api/reports/energystoragepowerstationreporting.py b/myems-api/reports/energystoragepowerstationreporting.py
@@ -228,15 +228,15 @@ def on_get(req, resp):
         if energy_storage_power_station_id is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE id = %s ")
             cursor_system.execute(query, (energy_storage_power_station_id,))
             row = cursor_system.fetchone()
         elif energy_storage_power_station_uuid is not None:
             query = (" SELECT id, name, uuid, "
                      "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                     "        contact_id, cost_center_id, svg, description "
+                     "        contact_id, cost_center_id, svg, description, phase_of_lifecycle "
                      " FROM tbl_energy_storage_power_stations "
                      " WHERE uuid = %s ")
             cursor_system.execute(query, (energy_storage_power_station_uuid,))
@@ -262,6 +262,7 @@ def on_get(req, resp):
                            "cost_center": cost_center_dict.get(row[10], None),
                            "svg": row[11],
                            "description": row[12],
+                           "phase_of_lifecycle": row[13],
                            "qrcode": 'energy_storage_power_station:' + row[2]}
 
         point_list = list()