Merge branch 'develop'

MyEMS · Dec 8, 2023 · 5b0de16 · 5b0de16
2 parents ba0a90d + b0458ae
commit 5b0de16
Show file tree

Hide file tree

Showing 13 changed files with 699 additions and 654 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Added
+### Changed
+### Fixed
+### Removed
+
+## [v3.12.0] - 2023-12-08
+
 ### Added
 - added charge time and discharge time settings to power conversion system of microgrid
 - added nominal voltage to microgrid battery in database, myems-api and myems-admin
@@ -1506,7 +1513,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/v3.11.0...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v3.12.0...HEAD
+[3.12.0]: https://github.com/MyEMS/myems/compare/v3.12.0...v3.11.0
 [3.11.0]: https://github.com/MyEMS/myems/compare/v3.11.0...v3.10.0
 [3.10.0]: https://github.com/MyEMS/myems/compare/v3.10.0...v3.9.0
 [3.9.0]: https://github.com/MyEMS/myems/compare/v3.9.0...v3.8.0

diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql
@@ -1733,7 +1733,7 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '3.12.0RC', '2023-12-01');
+(1, '3.12.0', '2023-12-08');
 
 COMMIT;
 

diff --git a/database/upgrade/upgrade3.12.0RC.sql → database/upgrade/upgrade3.12.0.sql b/database/upgrade/upgrade3.12.0RC.sql → database/upgrade/upgrade3.12.0.sql
@@ -51,6 +51,6 @@ VALUES
 (1302,'Microgrid Reporting','/microgrid/reporting',1300,1);
 
 -- UPDATE VERSION NUMBER
-UPDATE `myems_system_db`.`tbl_versions` SET version='3.12.0RC', release_date='2023-12-01' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='3.12.0', release_date='2023-12-08' 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}} v3.11.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v3.12.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}} v3.11.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v3.12.0</strong>
     </div>
 </div>
diff --git a/myems-aggregation/version.txt b/myems-aggregation/version.txt
@@ -1 +1 @@
-3.11.0
+3.12.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 v3.11.0',
-                  "release-date": '2023-11-03',
+        result = {"version": 'MyEMS v3.12.0',
+                  "release-date": '2023-12-08',
                   "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 @@
-3.11.0
+3.12.0
diff --git a/myems-modbus-tcp/version.txt b/myems-modbus-tcp/version.txt
@@ -1 +1 @@
-3.11.0
+3.12.0
diff --git a/myems-normalization/version.txt b/myems-normalization/version.txt
@@ -1 +1 @@
-3.11.0
+3.12.0
diff --git a/myems-web/package-lock.json b/myems-web/package-lock.json
diff --git a/myems-web/package.json b/myems-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "private": true,
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",

diff --git a/myems-web/src/config.js b/myems-web/src/config.js
@@ -1,4 +1,4 @@
-export const version = '3.11.0';
+export const version = '3.12.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';