Merge branch 'develop'

MyEMS · May 21, 2024 · 4efd4c5 · 4efd4c5
2 parents 59544c8 + 265a673
commit 4efd4c5
Show file tree

Hide file tree

Showing 13 changed files with 568 additions and 710 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
+### Changed
+### Fixed
+### Removed
+
+## [v4.5.0] - 2024-05-21
+### Added
 - added new protocols dtu-rtu, dtu-tcp, dtu-mqtt and mqtt-zhongxian
 - added latest value to data source points table in myems-admin
 - added menus for plan functions in database
@@ -18,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - fixed issues of optional svg textarea for equipment and combined equipment in myems-admin
 - fixed translation issue for zh_CN in Excel exporter 
 ### Removed
--
+- None
 
 ## [v4.4.0] - 2024-04-17
 ### Added
@@ -1674,7 +1680,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/v4.4.0...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v4.5.0...HEAD
+[4.5.0]: https://github.com/MyEMS/myems/compare/v4.5.0...v4.4.0
 [4.4.0]: https://github.com/MyEMS/myems/compare/v4.4.0...v4.3.0
 [4.3.0]: https://github.com/MyEMS/myems/compare/v4.3.0...v4.2.0
 [4.2.0]: https://github.com/MyEMS/myems/compare/v4.2.0...v4.1.0

diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql
@@ -1966,7 +1966,7 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '4.5.0RC', '2024-05-18');
+(1, '4.5.0', '2024-05-21');
 
 COMMIT;
 

diff --git a/database/upgrade/upgrade4.5.0RC.sql → database/upgrade/upgrade4.5.0.sql b/database/upgrade/upgrade4.5.0RC.sql → database/upgrade/upgrade4.5.0.sql
@@ -352,6 +352,6 @@ CREATE INDEX `tbl_energy_storage_power_station_discharge_hourly_index_1`
  (`energy_storage_power_station_id`, `start_datetime_utc`);
 
 -- UPDATE VERSION NUMBER
-UPDATE `myems_system_db`.`tbl_versions` SET version='4.5.0RC', release_date='2024-05-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='4.5.0', release_date='2024-05-21' WHERE id=1;
 
 COMMIT;
diff --git a/myems-admin/views/common/footer-login.html b/myems-admin/views/common/footer-login.html
@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v4.4.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v4.5.0 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>
diff --git a/myems-admin/views/common/footer.html b/myems-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}} v4.4.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v4.5.0</strong>
     </div>
 </div>
diff --git a/myems-aggregation/version.txt b/myems-aggregation/version.txt
@@ -1 +1 @@
-4.4.0
+4.5.0
diff --git a/myems-api/core/version.py b/myems-api/core/version.py
@@ -14,8 +14,8 @@ def on_options(req, resp, id_):
 
     @staticmethod
     def on_get(req, resp):
-        result = {"version": 'MyEMS v4.4.0',
-                  "release-date": '2024-04-17',
+        result = {"version": 'MyEMS v4.5.0',
+                  "release-date": '2024-05-21',
                   "licensed-to": 'COMMUNITY',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)

diff --git a/myems-cleaning/version.txt b/myems-cleaning/version.txt
@@ -1 +1 @@
-4.4.0
+4.5.0
diff --git a/myems-modbus-tcp/version.txt b/myems-modbus-tcp/version.txt
@@ -1 +1 @@
-4.4.0
+4.5.0
diff --git a/myems-normalization/version.txt b/myems-normalization/version.txt
@@ -1 +1 @@
-4.4.0
+4.5.0