Merge branch 'develop' of gitee.com:myems/myems into develop

CHANGELOG.md

@@ -16,6 +16,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
+## [v1.7.1] -   2022-02-11
+### Added
+- added myems_carbon_db to recalculating script
+
+### Changed
+- updated mysql-connector-python version in README
+- updated installation guide in README
+- updated docs
+- updated comment of tbl_web_messages in database
+- updated database upgrade scripts
+- Bump node-sass from 6.0.1 to 7.0.0 in Web
+- updated Web Message actions in API and Notification Page in Web UI
+- updated POSTMAN file
+
+### Fixed
+- fixed issue of Notification in Web UI
+- fixed issue of tbl_users in database
+
+### Removed
+-   None.
+
 ## [v1.7.0] -   2022-01-28
 ### Added
 - added new database myems_carbon_db
@@ -65,7 +86,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 -   added virtual meter billing procedure to aggregation service
 -   added PUT actions to text/wechat/email messages in api
 -   added POST actions to create new email/wechat/text messages
--   added locl/unlock user who faied login some times to admin and api
+-   added lock/unlock user who failed login some times to admin and api
 -   added bind-mount upload file folder to containers of myems-api and admin
 
 ### Changed
@@ -247,7 +268,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 -   changed cost file upload datetime formatter from timestamp to strftime
 -   updated translation of Admin UI
 -   updated database README
--   updated demo databse for database ingestion service
+-   updated demo database for database ingestion service
 -   updated distibutionssystem point value timeout value to 30 minutes
 -   updated Admin UI to make error messages more specific
 -   updated translations of KGCE & KGCO2E in Admin UI
@@ -423,7 +444,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 -   fixed base period cost units issue of Dashboard API
 -   fixed selected meter issues in onSearchMeter of Web UI
 -   fixed wrong HTTP Status Code issues in API
--   fixed Child Space Share Pie issue in excel exporter of spaceenergycategory
+-   fixed Child Space Share Pie issue in Excel exporter of spaceenergycategory
 
 ### Removed
 -   Drop table tbl_sms_recipients from myems_fdd_db
@@ -448,7 +469,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 -   updated Dashboard in web to display energy data of this year
 -   updated tbl_expressions in database
 -   added start value and end value to metertracking report
--   updated comments and log messages in myems-modbust-tcp service
+-   updated comments and log messages in myems-modbus-tcp service
 -   improved theme of energyflowdiagram in Web UI
 
 ### Fixed
@@ -520,7 +541,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 -   fixed issues in excel exporters of combinedequipment in API
 -   added parameters validator to statistics_hourly_data_by_period in API
 -   added code to validate parameters of averaging_hourly_data_by_period in API
--   fixed issue in excel exporter of equipmentincome in API
+-   fixed issue in Excel exporter of equipmentincome in API
 -   fixed unit issue in CombinedEquipmentCost report in API
 
 
@@ -669,7 +690,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
-[Unreleased]: https://github.com/MyEMS/myems/compare/v1.7.0...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.7.1...HEAD
+[v1.7.1]: https://github.com/MyEMS/myems/compare/v1.7.0...v1.7.1
 [v1.7.0]: https://github.com/MyEMS/myems/compare/v1.6.1...v1.7.0
 [v1.6.1]: https://github.com/MyEMS/myems/compare/v1.6.0...v1.6.1
 [v1.6.0]: https://github.com/MyEMS/myems/compare/v1.5.1...v1.6.0

admin/views/common/footer-login.html

@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.7.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.7.1 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>

admin/views/common/footer.html

@@ -3,6 +3,6 @@
         <strong><a href="https://myems.io">https://myems.io</a></strong>
     </div>
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.7.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.7.1</strong>
     </div>
 </div>

database/install/myems_billing_baseline_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_billing_baseline_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_billing_baseline_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_billing_baseline_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_billing_baseline_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_billing_baseline_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_billing_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_billing_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_billing_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_billing_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_billing_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_billing_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_carbon_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_carbon_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_carbon_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_carbon_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_carbon_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_carbon_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_energy_baseline_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_energy_baseline_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_energy_baseline_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_energy_baseline_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_energy_baseline_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_energy_baseline_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_energy_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_energy_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_energy_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_energy_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_energy_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_energy_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_energy_model_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_energy_model_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_energy_model_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_energy_model_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_energy_model_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_energy_model_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_fdd_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_fdd_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_fdd_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_fdd_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_fdd_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_fdd_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------
@@ -123,7 +123,7 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_web_messages` (
   `priority` VARCHAR(128) NOT NULL COMMENT 'CRITICAL, HIGH, MEDIUM, LOW',
   `message` LONGTEXT NOT NULL,
   `created_datetime_utc` DATETIME NOT NULL,
-  `status` VARCHAR(32) NOT NULL COMMENT 'new, acknowledged, timeout',
+  `status` VARCHAR(32) NOT NULL COMMENT 'new, acknowledged, read',
   `reply` LONGTEXT NULL,
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_web_messages_index_1` ON  `myems_fdd_db`.`tbl_web_messages`  (`user_id`, `status`, `created_datetime_utc`);

database/install/myems_historical_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_historical_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_historical_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_historical_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_historical_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_historical_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_reporting_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_reporting_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_reporting_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_reporting_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_reporting_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_reporting_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------

database/install/myems_system_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_system_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_system_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_system_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_system_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_system_db` ;
 
 
@@ -1246,6 +1246,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.7.0', '2022-01-28');
+(1, '1.7.1', '2022-02-11');
 
 COMMIT;

database/install/myems_user_db.sql

@@ -4,7 +4,7 @@
 -- Schema myems_user_db
 -- ---------------------------------------------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS `myems_user_db` ;
-CREATE DATABASE IF NOT EXISTS `myems_user_db` ;
+CREATE DATABASE IF NOT EXISTS `myems_user_db` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci' ;
 USE `myems_user_db` ;
 
 -- ---------------------------------------------------------------------------------------------------------------------
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_users` (
   `privilege_id` BIGINT NULL,
   `account_expiration_datetime_utc` DATETIME NOT NULL,
   `password_expiration_datetime_utc` DATETIME NOT NULL,
-  `failed_login_count` INT NOT NULL,
+  `failed_login_count` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`));
 
   -- --------------------------------------------------------------------------------------------------------------------

database/upgrade/upgrade1.0.1.sql

@@ -1,6 +1,10 @@
--- 
+-- ---------------------------------------------------------------------------------------------------------------------
--- WARNING: BACUP YOUR DATABASE BEFORE UPGRADE
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
--- 
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.0 TO 1.0.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_fdd_db`.`tbl_rules`
@@ -41,4 +45,6 @@ CREATE INDEX `tbl_web_messages_index_1` ON  `myems_fdd_db`.`tbl_web_messages`  (
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.1', release_date='2021-01-28' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.1', release_date='2021-01-28' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.2.sql

@@ -1,6 +1,10 @@
--- 
+-- ---------------------------------------------------------------------------------------------------------------------
--- WARNING: BACUP YOUR DATABASE BEFORE UPGRADE
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
--- 
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.1 TO 1.0.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- MySQL:
 ALTER TABLE myems_system_db.tbl_meters CHANGE parent_meter_id master_meter_id bigint NULL;
@@ -9,4 +13,6 @@ ALTER TABLE myems_system_db.tbl_meters CHANGE parent_meter_id master_meter_id bi
 ALTER TABLE myems_system_db.tbl_meters CHANGE parent_meter_id master_meter_id;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.2', release_date='2021-01-29' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.2', release_date='2021-01-29' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.3.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.2 TO 1.0.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 ALTER TABLE myems_fdd_db.tbl_web_messages MODIFY COLUMN user_id bigint NOT NULL;
 
 CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_notifications` (
@@ -12,4 +20,6 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_notifications` (
 CREATE INDEX `tbl_notifications_index_1` ON  `myems_user_db`.`tbl_notifications`  (`user_id`, `created_datetime_utc`, `status`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.3', release_date='2021-02-07' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.3', release_date='2021-02-07' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.5.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.3 TO 1.0.5
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.5', release_date='2021-02-23' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.5', release_date='2021-02-23' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.6.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.5 TO 1.0.6
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.6', release_date='2021-02-27' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.6', release_date='2021-02-27' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.7.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.6 TO 1.0.7
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.7', release_date='2021-03-07' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.7', release_date='2021-03-07' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.8.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.7 TO 1.0.8
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.8', release_date='2021-03-11' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.8', release_date='2021-03-11' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.0.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.8 TO 1.1.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.0', release_date='2021-03-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.0', release_date='2021-03-18' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.1.sql

@@ -1,6 +1,15 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.0 TO 1.1.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.1', release_date='2021-03-31' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.1', release_date='2021-03-31' WHERE id=1;
 
 ALTER TABLE myems_fdd_db.tbl_rules ADD last_run_datetime_utc DATETIME NULL;
 ALTER TABLE myems_fdd_db.tbl_rules ADD next_run_datetime_utc DATETIME NULL;
+
+COMMIT;

database/upgrade/upgrade1.1.2.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.1 TO 1.1.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.2', release_date='2021-04-23' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.2', release_date='2021-04-23' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.3.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.2 TO 1.1.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 -- UPDATE POINT TABLE
 ALTER TABLE myems_system_db.tbl_points MODIFY COLUMN low_limit decimal(18,3) NOT NULL;
 ALTER TABLE myems_system_db.tbl_points ADD is_virtual BOOL DEFAULT FALSE NOT NULL AFTER is_trend;
@@ -7,4 +15,6 @@ ALTER TABLE myems_system_db.tbl_expressions MODIFY COLUMN equation LONGTEXT NOT
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.3', release_date='2021-05-25' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.3', release_date='2021-05-25' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.4.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.3 TO 1.1.4
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 DROP TABLE myems_fdd_db.tbl_sms_recipients;
 
@@ -22,4 +29,6 @@ RENAME TABLE myems_historical_db.tbl_offline_cost_files TO myems_historical_db.t
 ALTER TABLE myems_historical_db.tbl_offline_cost_files TO myems_historical_db.tbl_cost_files;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.4', release_date='2021-07-19' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.4', release_date='2021-07-19' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.5.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.4 TO 1.1.5
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.5', release_date='2021-07-20' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.5', release_date='2021-07-20' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.6.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.5 TO 1.1.6
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_system_db`.`tbl_menus`
@@ -107,4 +114,6 @@ VALUES
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.6', release_date='2021-08-02' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.6', release_date='2021-08-02' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.0.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.6 TO 1.2.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 UPDATE myems_system_db.tbl_menus SET route='/monitoring/spaceequipments' WHERE id=1001;
 UPDATE myems_system_db.tbl_menus SET route='/monitoring/combinedequipments' WHERE id=1002;
 UPDATE myems_system_db.tbl_menus SET route='/monitoring/tenantequipments' WHERE id=1003;
@@ -6,4 +14,6 @@ UPDATE myems_system_db.tbl_menus SET route='/monitoring/shopfloorequipments' WHE
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.0', release_date='2021-08-08' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.0', release_date='2021-08-08' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.1.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.0 TO 1.2.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 ALTER TABLE myems_fdd_db.tbl_email_messages ADD rule_id BIGINT NOT NULL AFTER id;
 ALTER TABLE myems_fdd_db.tbl_text_messages_outbox ADD rule_id BIGINT NOT NULL AFTER id;
 ALTER TABLE myems_fdd_db.tbl_web_messages ADD rule_id BIGINT NOT NULL AFTER id;
@@ -5,4 +13,6 @@ ALTER TABLE myems_fdd_db.tbl_wechat_messages_outbox ADD rule_id BIGINT NOT NULL
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.1', release_date='2021-08-19' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.1', release_date='2021-08-19' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.2.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.1 TO 1.2.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 DROP TABLE IF EXISTS `myems_user_db`.`tbl_logs` ;
 
 CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_logs` (
@@ -12,4 +20,6 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_logs` (
 CREATE INDEX `tbl_logs_index_1` ON  `myems_user_db`.`tbl_logs`  (`user_uuid`, `request_datetime_utc`, `request_method`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.2', release_date='2021-08-28' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.2', release_date='2021-08-28' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.3.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.2 TO 1.2.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_reporting_db`.`tbl_reports`
@@ -18,4 +25,6 @@ CREATE TABLE IF NOT EXISTS `myems_reporting_db`.`tbl_reports` (
 CREATE INDEX `tbl_reports_index_1` ON  `myems_reporting_db`.`tbl_reports` (`name`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.3', release_date='2021-09-04' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.3', release_date='2021-09-04' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.0.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.3 TO 1.3.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 DROP TABLE IF EXISTS `myems_fdd_db`.`tbl_gsm_modems` ;
 
@@ -6,4 +13,6 @@ ALTER TABLE `myems_user_db`.`tbl_users` ADD `password_expiration_datetime_utc` D
 ALTER TABLE `myems_user_db`.`tbl_users` ADD `account_expiration_datetime_utc` DATETIME NOT NULL DEFAULT '2099-12-31 16:00:00' AFTER privilege_id;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.0', release_date='2021-09-24' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.0', release_date='2021-09-24' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.1.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.0 TO 1.3.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.1', release_date='2021-10-15' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.1', release_date='2021-10-15' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.2.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.1 TO 1.3.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.2', release_date='2021-10-22' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.2', release_date='2021-10-22' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.3.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.2 TO 1.3.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 -- PLEASE CHECK YOUR DATABASE TABLES BELOW, IF rule_id IS MISSING, THEN RUN BELOW STATEMENTS
 -- IF rule_id EXISTS, THEN IGNORE THESE STATEMENTS
 ALTER TABLE myems_fdd_db.tbl_email_messages ADD rule_id BIGINT NOT NULL AFTER id;
@@ -7,4 +15,6 @@ ALTER TABLE myems_fdd_db.tbl_wechat_messages_outbox ADD rule_id BIGINT NOT NULL
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.3', release_date='2021-10-30' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.3', release_date='2021-10-30' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.4.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.3 TO 1.3.4
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 -- PLEASE CHECK YOUR DATABASE TABLE myems_system_db.tbl_gateway,
 -- If the tbl_gateways is empty
 -- then run the statement below to insert the default gateway data
@@ -8,14 +14,13 @@
 -- This gateway's token is used by myems-modbus-tcp service
 -- ---------------------------------------------------------------------------------------------------------------------
 START TRANSACTION;
-USE `myems_system_db`;
 
 INSERT INTO `myems_system_db`.`tbl_gateways`
 (`id`, `name`, `uuid`, `token`,  `last_seen_datetime_utc`)
 VALUES
 (1, 'MyEMS Gateway 1', 'dc681938-5053-8660-98ed-266c58227231', '983427af-1c35-42ba-8b4d-288675550225', null);
 
-COMMIT;
-
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.4', release_date='2021-11-06' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.4', release_date='2021-11-06' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.4.0.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.4 TO 1.4.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 -- NOTE: BACKUP YOUR DATABASE AND SOURCE CODE FIRST
 -- THIS UPGRADE MAY CAUSE DATA LOSS AND BREAK YOUR MYEMS SYSTEM
 
@@ -55,6 +61,6 @@ CREATE INDEX `tbl_virtual_meters_index_2` ON `myems_system_db`.`tbl_virtual_mete
 CREATE INDEX `tbl_virtual_meters_index_3` ON `myems_system_db`.`tbl_virtual_meters` (`energy_item_id`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.4.0', release_date='2021-11-14' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.4.0', release_date='2021-11-14' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.5.0.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.4.0 TO 1.5.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
@@ -311,6 +317,6 @@ CREATE INDEX `tbl_virtual_meter_8760_index_1` ON  `myems_energy_model_db`.`tbl_v
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.5.0', release_date='2021-12-12' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.5.0', release_date='2021-12-12' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.5.1.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.5.0 TO 1.5.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 ALTER TABLE `myems_user_db`.`tbl_users` ADD `failed_login_count` INT NOT NULL DEFAULT 0 AFTER password_expiration_datetime_utc;
@@ -17,6 +23,6 @@ ALTER TABLE `myems_system_db`.`tbl_data_sources` MODIFY COLUMN `connection` LONG
 ALTER TABLE `myems_system_db`.`tbl_points` MODIFY COLUMN `address` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format';
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.5.1', release_date='2021-12-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.5.1', release_date='2021-12-18' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.6.0.sql

@@ -1,6 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.5.1 TO 1.6.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.6.0', release_date='2021-12-31' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.6.0', release_date='2021-12-31' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.6.1.sql

@@ -1,6 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.6.0 TO 1.6.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.6.1', release_date='2022-01-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.6.1', release_date='2022-01-18' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.7.0.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.6.1 TO 1.7.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 CREATE DATABASE IF NOT EXISTS `myems_carbon_db` ;
@@ -163,6 +169,6 @@ CREATE TABLE IF NOT EXISTS `myems_carbon_db`.`tbl_virtual_meter_hourly` (
 CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON  `myems_carbon_db`.`tbl_virtual_meter_hourly`   (`virtual_meter_id`, `start_datetime_utc`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.7.0', release_date='2022-01-28' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.7.0', release_date='2022-01-28' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.7.1.sql

@@ -0,0 +1,18 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.7.0 TO 1.7.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
+ALTER TABLE `myems_user_db`.`tbl_users`
+MODIFY COLUMN `failed_login_count` int(11) NOT NULL DEFAULT 0 AFTER `password_expiration_datetime_utc`;
+
+ALTER TABLE `myems_fdd_db`.`tbl_web_messages`
+MODIFY COLUMN `status` varchar(32) NOT NULL COMMENT 'new, acknowledged, read' AFTER `created_datetime_utc`;
+
+-- UPDATE VERSION NUMBER
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.7.1', release_date='2022-02-11' WHERE id=1;
+
+COMMIT;

myems-api/MyEMS.postman_collection.json

@@ -9574,7 +9574,7 @@
 					"name": "Web Message",
 					"item": [
 						{
-							"name": "GET Web Messages by Date Range",
+							"name": "GET Web Messages by Datetime Range",
 							"request": {
 								"method": "GET",
 								"header": [
@@ -9631,7 +9631,7 @@
 									},
 									{
 										"key": "Token",
-										"value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c",
+										"value": "9bcd171e4f4169f1f45791aeadc8f90cfe8694be92f21af7bf95673f8cc910ca7a91bfd4a577d48d0720155de497eb02baab614be5c6c83891f1a856f9cf666a",
 										"type": "text",
 										"description": "Login to get a valid token"
 									}
@@ -9717,7 +9717,7 @@
 							"response": []
 						},
 						{
-							"name": "PUT Update an Web Message TODO",
+							"name": "PUT Update a Web Message (Acknowledge)",
 							"request": {
 								"method": "PUT",
 								"header": [
@@ -9729,7 +9729,7 @@
 									},
 									{
 										"key": "Token",
-										"value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c",
+										"value": "9bcd171e4f4169f1f45791aeadc8f90cfe8694be92f21af7bf95673f8cc910ca7a91bfd4a577d48d0720155de497eb02baab614be5c6c83891f1a856f9cf666a",
 										"type": "text",
 										"description": "Login to get a valid token"
 									}
@@ -9751,6 +9751,41 @@
 							},
 							"response": []
 						},
+						{
+							"name": "PUT Update a Web Message (Mark As Read)",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "User-UUID",
+										"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
+										"type": "text",
+										"description": "Any admin users' UUID"
+									},
+									{
+										"key": "Token",
+										"value": "9bcd171e4f4169f1f45791aeadc8f90cfe8694be92f21af7bf95673f8cc910ca7a91bfd4a577d48d0720155de497eb02baab614be5c6c83891f1a856f9cf666a",
+										"type": "text",
+										"description": "Login to get a valid token"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\"data\":{\"status\":\"read\"}}"
+								},
+								"url": {
+									"raw": "{{base_url}}/webmessages/1",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"webmessages",
+										"1"
+									]
+								}
+							},
+							"response": []
+						},
 						{
 							"name": "DELETE a Web Message by ID",
 							"request": {

myems-api/README.md

@@ -2144,21 +2144,45 @@ Result in JSON
 | message       | string    | Web Message Body                          |
 | created_datetime| float   | Web Message Created Datetime (POSIX timestamp *   1000)|
 | status        | string    | Status ('new', 'acknowledged', 'timeout') | 
-| reply         | string    | User's Reply text, allow null             |
+| reply         | string    | User's Reply text, required for 'acknowledged' status, otherwise allow null |
 ```bash
-curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessages/{id}
+curl --location --request GET '{{base_url}}/webmessages/{id}' \
+--header 'User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4' \
+--header 'Token: 24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c'
 ```
 *   GET Web Messages by Datetime Range
 ```bash
-curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessages?startdatetime={startdatetime}&enddatetime={enddatetime}
+curl --location --request GET '{{base_url}}/webmessages?startdatetime=2021-12-11T00:00:00&enddatetime=2021-12-21T00:00:00' \
+--header 'User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4' \
+--header 'Token: 9ac434f394c735092cfeb083612e533ca33ca6db4815ebb0c3ff47896d7eaa610e7dc312c04279253f817d65d1ef379378d4a5d07150faee5f6d899adb8b7ca7'
 ```
 *   GET New Web Messages
 ```bash
-curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessagesnew
+curl --location --request GET '{{base_url}}/webmessagesnew' \
+--header 'User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4' \
+--header 'Token: 9bcd171e4f4169f1f45791aeadc8f90cfe8694be92f21af7bf95673f8cc910ca7a91bfd4a577d48d0720155de497eb02baab614be5c6c83891f1a856f9cf666a'
 ```
-*   DELETE a Web Message by ID
+* PUT Update a Web Message (Acknowledge)
 ```bash
-curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/webmessages/{id}
+curl --location --request PUT '{{base_url}}/webmessages/{id}' \
+--header 'User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4' \
+--header 'Token: 9bcd171e4f4169f1f45791aeadc8f90cfe8694be92f21af7bf95673f8cc910ca7a91bfd4a577d48d0720155de497eb02baab614be5c6c83891f1a856f9cf666a' \
+--header 'Content-Type: text/plain' \
+--data-raw '{"data":{"status":"acknowledged", "reply":"this is my reply"}}'
+```
+* PUT Update a Web Message (Mark As Read)
+```bash
+curl --location --request PUT '{{base_url}}/webmessages/{id}' \
+--header 'User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4' \
+--header 'Token: 9bcd171e4f4169f1f45791aeadc8f90cfe8694be92f21af7bf95673f8cc910ca7a91bfd4a577d48d0720155de497eb02baab614be5c6c83891f1a856f9cf666a' \
+--header 'Content-Type: text/plain' \
+--data-raw '{"data":{"status":"read"}}'
+```
+* DELETE a Web Message by ID
+```bash
+curl --location --request DELETE '{{base_url}}/webmessages/{id}' \
+--header 'User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4' \
+--header 'Token: 24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c'
 ```
 
 ### Wechat Message

myems-api/core/version.py

@@ -15,8 +15,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS v1.7.0',
+        result = {"version": 'MyEMS v1.7.1',
-                  "release-date": '2022-01-28',
+                  "release-date": '2022-02-11',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)
 

myems-api/core/webmessage.py

@@ -367,17 +367,21 @@ class WebMessageItem:
         if 'status' not in new_values['data'].keys() or \
                 not isinstance(new_values['data']['status'], str) or \
                 len(str.strip(new_values['data']['status'])) == 0 or \
-                str.strip(new_values['data']['status']) not in ('new', 'acknowledged', 'timeout'):
+                str.strip(new_values['data']['status']) not in ('new', 'acknowledged', 'read'):
             raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
                                    description='API.INVALID_STATUS')
         status = str.strip(new_values['data']['status'])
 
-        if 'reply' not in new_values['data'].keys() or \
+        # reply is required for 'acknowledged' status
-                not isinstance(new_values['data']['reply'], str) or \
+        if status == 'acknowledged' and \
-                len(str.strip(new_values['data']['reply'])) == 0:
+            ('reply' not in new_values['data'].keys() or
+                not isinstance(new_values['data']['reply'], str) or
+                len(str.strip(new_values['data']['reply'])) == 0):
             raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
                                    description='API.INVALID_REPLY')
-        reply = str.strip(new_values['data']['reply'])
+            reply = str.strip(new_values['data']['reply'])
+        else:
+            reply = None
 
         # Verify User Session
         token = req.headers.get('TOKEN')

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",
@@ -35,7 +35,7 @@
     "leaflet.tilelayer.colorfilter": "^1.2.5",
     "lodash": "^4.17.20",
     "moment": "^2.28.0",
-    "node-sass": "^6.0.1",
+    "node-sass": "^7.0.0",
     "plyr": "^3.6.2",
     "prism-react-renderer": "^0.1.7",
     "prism-themes": "^1.4.0",

web/src/components/MyEMS/Notification/Notification.js

@@ -128,7 +128,7 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
 
   const subjectFormatter = (dataField, { url }) => (
     <Fragment>
-      <a href={`${url}`}>{dataField}</a>
+      <span>{dataField}</span>
     </Fragment>
   );
 
@@ -143,16 +143,16 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
     let icon = '';
     let text = '';
     switch (status) {
+      case 'acknowledged':
+        color = 'success';
+        icon = 'envelope-open';
+        text = t('Notification Acknowledged');
+        break;
       case 'read':
         color = 'success';
         icon = 'envelope-open';
         text = t('Notification Read');
         break;
-      case 'unread':
-        color = 'primary';
-        icon = 'envelope';
-        text = t('Notification Unread');
-        break;
       default:
         color = 'primary';
         icon = 'envelope';
@@ -175,9 +175,9 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
       </DropdownToggle>
       <DropdownMenu right className="border py-2">
         <DropdownItem onClick={() => handleRead(id)}>{t('Notification Mark As Read')}</DropdownItem>
-        <DropdownItem onClick={() => console.log('Archive: ', id)}>{t('Notification Archive')}</DropdownItem>
+        <DropdownItem onClick={() => handleAcknowledged(id)}>{t('Notification Mark As Acknowledged')}</DropdownItem>
         <DropdownItem divider />
-        <DropdownItem onClick={() => console.log('Delete: ', id)} className="text-danger">{t('Notification Delete')}</DropdownItem>
+        <DropdownItem onClick={() => handledelete(id)} className="text-danger">{t('Notification Delete')}</DropdownItem>
       </DropdownMenu>
     </UncontrolledDropdown>
   );
@@ -260,8 +260,7 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
       },
       body: JSON.stringify({
         "data": {
-          "status": 'acknowledged',
+          "status": 'read'
-          "reply": 'ok'
         }
       }),
     }).then(response => {
@@ -283,6 +282,71 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
     });
   };
 
+  const handleAcknowledged = (id, ) => {
+    console.log('Mark As Acknowledged: ', id)
+    let isResponseOK = false;
+    fetch(APIBaseURL + '/webmessages/' + id, {
+      method: 'PUT',
+      headers: {
+        "Content-type": "application/json",
+        "User-UUID": getCookieValue('user_uuid'),
+        "Token": getCookieValue('token')
+      },
+      body: JSON.stringify({
+        "data": {
+          "status": 'acknowledged',
+          "reply": 'OK'
+        }
+      }),
+    }).then(response => {
+      if (response.ok) {
+        isResponseOK = true;
+        return null;
+      } else {
+        return response.json();
+      }
+    }).then(json => {
+      console.log(isResponseOK);
+      if (isResponseOK) {
+
+      } else {
+        toast.error(json.description)
+      }
+    }).catch(err => {
+      console.log(err);
+    });
+  };
+
+  const handledelete = (id, ) => {
+    console.log('Delete: ', id)
+    let isResponseOK = false;
+    fetch(APIBaseURL + '/webmessages/' + id, {
+      method: 'DELETE',
+      headers: {
+        "Content-type": "application/json",
+        "User-UUID": getCookieValue('user_uuid'),
+        "Token": getCookieValue('token')
+      },
+      body: null,
+    }).then(response => {
+      if (response.ok) {
+        isResponseOK = true;
+        return null;
+      } else {
+        return response.json();
+      }
+    }).then(json => {
+      console.log(isResponseOK);
+      if (isResponseOK) {
+
+      } else {
+        toast.error(json.description)
+      }
+    }).catch(err => {
+      console.log(err);
+    });
+  };
+
 
   return (
     <Fragment>
@@ -294,7 +358,7 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
               <CustomInput type="select" id="bulk-select">
                 <option>{t('Bulk actions')}</option>
                 <option value="MarkAsRead">{t('Notification Mark As Read')}</option>
-                <option value="Archive">{t('Notification Archive')}</option>
+                <option value="MarkAsAcknowledged">{t('Notification Mark As Acknowledged')}</option>
                 <option value="Delete">{t('Notification Delete')}</option>
               </CustomInput>
               <Button color="falcon-default" size="sm" className="ml-2">

web/src/components/navbar/NotificationDropdown.js

@@ -95,8 +95,7 @@ const NotificationDropdown = ({ t }) => {
       },
       body: JSON.stringify({
         "data": {
-          "status": 'acknowledged',
+          "status": 'read'
-          "reply": 'ok'
         }
       }),
       }).then(response => {

web/src/config.js

@@ -1,4 +1,4 @@
-export const version = '1.7.0';
+export const version = '1.7.1';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';

web/src/i18n.js

@@ -315,8 +315,10 @@ const resources = {
       'Notification Message': 'Message',
       'Notification Status': 'Status',
       'Notification Mark As Read': 'Mark As Read',
+      'Notification Mark As Acknowledged': 'Acknowledge',
       'Notification Unread': 'Unread',
       'Notification Read': 'Read',
+      'Notification Acknowledged': 'Acknowledged',
       'Notification Archive': 'Archive',
       'Notification Delete': 'Delete',
       'Notification Apply': 'Apply',
@@ -1101,8 +1103,10 @@ const resources = {
       'Notification Message': 'Nachricht',
       'Notification Status': 'Status',
       'Notification Mark As Read': 'Mark as read',
+      'Notification Mark As Acknowledged': 'Bestätigen',
       'Notification Unread': 'Ungelesene',
       'Notification Read': 'Lesen',
+      'Notification Acknowledged': 'Anerkannt',
       'Notification Archive': 'Archiv',
       'Notification Delete': 'Löschen',
       'Notification Apply': 'Anwenden',
@@ -1864,8 +1868,10 @@ const resources = {
       'Notification Message': '内容',
       'Notification Status': '状态',
       'Notification Mark As Read': '标记为已读',
+      'Notification Mark As Acknowledged': '确认',
       'Notification Unread': '未读',
       'Notification Read': '已读',
+      'Notification Acknowledged': '已确认',
       'Notification Archive': '存档',
       'Notification Delete': '删除',
       'Notification Apply': '应用',