Merge branch 'develop'

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - added `myems_historical_db`.`tbl_text_value_latest` in database
 - added columns to `myems_fdd_db`.`tbl_web_messages` in database
 ### Changed
+- updated notification in myems-web
 - updated dockerfiles to reduce images size
 - updated command actions in myems-api
 - changed all DECIMAL(18, 3) to DECIMAL(21, 6) in database

database/demo-cn/myems_system_db.sql

@@ -671,15 +671,13 @@ START TRANSACTION;
 INSERT INTO `myems_system_db`.`tbl_tariffs_timeofuses`
 (`tariff_id`, `start_time_of_day`, `end_time_of_day`, `peak_type`, `price`)
 VALUES
--- '2020TimeOfUse1-6'
 (1, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (1, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (1, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (1, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (1, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (1, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (1, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2020TimeOfUse7-9'
 (2, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (2, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (2, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -689,23 +687,20 @@ VALUES
 (2, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (2, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (2, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2020TimeOfUse10-12'
 (3, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (3, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (3, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (3, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (3, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (3, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (3, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse1-6'
 (4, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (4, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (4, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (4, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (4, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (4, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (4, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse7-9'
 (5, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (5, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (5, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -715,23 +710,20 @@ VALUES
 (5, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (5, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (5, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse10-12'
 (6, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (6, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (6, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (6, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (6, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (6, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (6, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse1-6'
 (7, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (7, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (7, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (7, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (7, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (7, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (7, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse7-9'
 (8, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (8, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (8, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -741,23 +733,20 @@ VALUES
 (8, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (8, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (8, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse10-12'
 (9, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (9, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (9, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (9, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (9, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (9, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (9, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse1-6'
 (10, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (10, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (10, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (10, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (10, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (10, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (10, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse7-9'
 (11, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (11, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (11, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -767,19 +756,14 @@ VALUES
 (11, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (11, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (11, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse10-12'
 (12, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (12, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (12, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (12, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (12, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (12, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (12, '22:00:00', '23:59:59', 'offpeak', 0.345),
-
--- 'Water'
 (13, '00:00:00', '23:59:59', 'midpeak', 5.95),
-
--- 'Natural Gas'
 (14, '00:00:00', '23:59:59', 'midpeak', 3.50);
 COMMIT;
 

database/demo-de/myems_system_db.sql

@@ -675,15 +675,13 @@ START TRANSACTION;
 INSERT INTO `myems_system_db`.`tbl_tariffs_timeofuses`
 (`tariff_id`, `start_time_of_day`, `end_time_of_day`, `peak_type`, `price`)
 VALUES
--- '2020TimeOfUse1-6'
 (1, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (1, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (1, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (1, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (1, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (1, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (1, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2020TimeOfUse7-9'
 (2, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (2, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (2, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -693,23 +691,20 @@ VALUES
 (2, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (2, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (2, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2020TimeOfUse10-12'
 (3, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (3, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (3, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (3, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (3, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (3, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (3, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse1-6'
 (4, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (4, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (4, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (4, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (4, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (4, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (4, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse7-9'
 (5, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (5, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (5, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -719,23 +714,20 @@ VALUES
 (5, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (5, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (5, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse10-12'
 (6, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (6, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (6, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (6, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (6, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (6, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (6, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse1-6'
 (7, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (7, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (7, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (7, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (7, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (7, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (7, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse7-9'
 (8, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (8, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (8, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -745,23 +737,20 @@ VALUES
 (8, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (8, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (8, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse10-12'
 (9, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (9, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (9, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (9, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (9, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (9, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (9, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse1-6'
 (10, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (10, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (10, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (10, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (10, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (10, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (10, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse7-9'
 (11, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (11, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (11, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -771,19 +760,14 @@ VALUES
 (11, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (11, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (11, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse10-12'
 (12, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (12, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (12, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (12, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (12, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (12, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (12, '22:00:00', '23:59:59', 'offpeak', 0.345),
-
--- 'Water'
 (13, '00:00:00', '23:59:59', 'midpeak', 5.95),
-
--- 'Natural Gas'
 (14, '00:00:00', '23:59:59', 'midpeak', 3.50);
 COMMIT;
 

database/demo-en/myems_system_db.sql

@@ -674,15 +674,13 @@ START TRANSACTION;
 INSERT INTO `myems_system_db`.`tbl_tariffs_timeofuses`
 (`tariff_id`, `start_time_of_day`, `end_time_of_day`, `peak_type`, `price`)
 VALUES
--- '2020TimeOfUse1-6'
 (1, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (1, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (1, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (1, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (1, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (1, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (1, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2020TimeOfUse7-9'
 (2, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (2, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (2, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -692,23 +690,20 @@ VALUES
 (2, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (2, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (2, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2020TimeOfUse10-12'
 (3, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (3, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (3, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (3, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (3, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (3, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (3, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse1-6'
 (4, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (4, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (4, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (4, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (4, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (4, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (4, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse7-9'
 (5, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (5, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (5, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -718,23 +713,20 @@ VALUES
 (5, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (5, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (5, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2021TimeOfUse10-12'
 (6, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (6, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (6, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (6, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (6, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (6, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (6, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse1-6'
 (7, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (7, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (7, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (7, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (7, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (7, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (7, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse7-9'
 (8, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (8, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (8, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -744,23 +736,20 @@ VALUES
 (8, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (8, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (8, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2022TimeOfUse10-12'
 (9, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (9, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (9, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (9, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (9, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (9, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (9, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse1-6'
 (10, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (10, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (10, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (10, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (10, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (10, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (10, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse7-9'
 (11, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (11, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (11, '08:00:00', '10:59:59', 'offpeak', 1.159),
@@ -770,19 +759,14 @@ VALUES
 (11, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (11, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (11, '22:00:00', '23:59:59', 'offpeak', 0.345),
--- '2023TimeOfUse10-12'
 (12, '00:00:00', '05:59:59', 'offpeak', 0.345),
 (12, '06:00:00', '07:59:59', 'midpeak', 0.708),
 (12, '08:00:00', '10:59:59', 'onpeak', 1.159),
 (12, '11:00:00', '17:59:59', 'midpeak', 0.708),
 (12, '18:00:00', '20:59:59', 'onpeak', 1.159),
 (12, '21:00:00', '21:59:59', 'midpeak', 0.708),
 (12, '22:00:00', '23:59:59', 'offpeak', 0.345),
-
--- 'Water'
 (13, '00:00:00', '23:59:59', 'midpeak', 5.95),
-
--- 'Natural Gas'
 (14, '00:00:00', '23:59:59', 'midpeak', 3.50);
 COMMIT;
 

myems-web/src/components/MyEMS/EnergyStoragePowerStation/CollectionDashboard.js

@@ -413,13 +413,13 @@ setDischargeEnergyLabels([
         <CardSummary rate={''} title={t('Total Rated Power')} footunit={'mW'} color="ratedPower">
           {1 && <CountUp end={totalRatedPower/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
-        <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'mWh'} color="ratedCapacity">
+        <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'MWH'} color="ratedCapacity">
           {1 && <CountUp end={totalRatedCapacity/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
-        <CardSummary rate={''} title={t('Total Charge')} footunit={'mWh'} color="electricity">
+        <CardSummary rate={''} title={t('Total Charge')} footunit={'MWH'} color="electricity">
           {1 && <CountUp end={totalCharge/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
-        <CardSummary rate={''} title={t('Total Discharge')} footunit={'mWh'} color="electricity">
+        <CardSummary rate={''} title={t('Total Discharge')} footunit={'MWH'} color="electricity">
           {1 && <CountUp end={totalDischarge/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Revenue')} footunit={currency} color="income">

myems-web/src/components/MyEMS/EnergyStoragePowerStation/Dashboard.js

@@ -413,13 +413,13 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
         <CardSummary rate={''} title={t('Total Rated Power')} footunit={'mW'} color="ratedPower">
           {1 && <CountUp end={totalRatedPower/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
-        <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'mWh'} color="ratedCapacity">
+        <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'MWH'} color="ratedCapacity">
           {1 && <CountUp end={totalRatedCapacity/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
-        <CardSummary rate={''} title={t('Total Charge')} footunit={'mWh'} color="electricity">
+        <CardSummary rate={''} title={t('Total Charge')} footunit={'MWH'} color="electricity">
           {1 && <CountUp end={totalCharge/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
-        <CardSummary rate={''} title={t('Total Discharge')} footunit={'mWh'} color="electricity">
+        <CardSummary rate={''} title={t('Total Discharge')} footunit={'MWH'} color="electricity">
           {1 && <CountUp end={totalDischarge/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Revenue')} footunit={currency} color="income">

myems-web/src/components/MyEMS/EnergyStoragePowerStation/ItemDashboard.js

@@ -610,16 +610,16 @@ const ItemDashboard = ({ setRedirect, setRedirectUrl, t }) => {
       </div>
       <div style={{ visibility: resultDataHidden ? 'hidden' : 'visible', display: resultDataHidden ? 'none': ''  }}>
         <div className="card-deck">
-          <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'mWh'} color="ratedCapacity">
+          <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'MWH'} color="ratedCapacity">
             {1 && <CountUp end={totalRatedCapacity/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
           </CardSummary>
           <CardSummary rate={''} title={t('Total Rated Power')} footunit={'mW'} color="ratedPower">
             {1 && <CountUp end={totalRatedPower/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
           </CardSummary>
-          <CardSummary rate={''} title={t('Total Charge')} footunit={'mWh'} color="electricity">
+          <CardSummary rate={''} title={t('Total Charge')} footunit={'MWH'} color="electricity">
             {1 && <CountUp end={totalCharge/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
           </CardSummary>
-          <CardSummary rate={''} title={t('Total Discharge')} footunit={'mWh'} color="electricity">
+          <CardSummary rate={''} title={t('Total Discharge')} footunit={'MWH'} color="electricity">
             {1 && <CountUp end={totalDischarge/1000.0} duration={2} prefix="" separator="," decimal="." decimals={3} />}
           </CardSummary>
           <CardSummary rate={''} title={t('Total Revenue')} footunit={currency} color="income">