updated version number to v1.6.0

CHANGELOG.md

@@ -16,6 +16,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
+## [v1.6.0] -   2021-12-31
+### Added
+-   added energy output and input to combined equipment efficiency report
+-   added energy output and input to equipment efficiency report
+-   added offline meter billing procedure to aggregation service
+-   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 bind-mount upload file folder to containers of myems-api and admin
+
+### Changed
+-   updated dependencies in web ui
+-   updated react-countup to v6.1.0 in web ui
+-   updated Meter RealtimeChart in web ui
+-   updated web for latest Node.js version
+-   updated get messages by date range in admin and api
+-   updated get emailmessages api in postman and readme
+-   updated config.py in myems-aggregation service
+
+### Fixed
+-   None
+
+### Removed
+-   None.
+
 ## [v1.5.1] -   2021-12-18
 ### Added
 -   Added lock/unlock user function if user failed login with wrong password.
@@ -602,8 +628,9 @@ 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.5.1...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.6.0...HEAD
-[v1.5.0]: https://github.com/MyEMS/myems/compare/v1.5.0...v1.5.1
+[v1.6.0]: https://github.com/MyEMS/myems/compare/v1.5.1...v1.6.0
+[v1.5.1]: https://github.com/MyEMS/myems/compare/v1.5.0...v1.5.1
 [v1.5.0]: https://github.com/MyEMS/myems/compare/v1.4.0...v1.5.0
 [v1.4.0]: https://github.com/MyEMS/myems/compare/v1.3.4...v1.4.0
 [v1.3.4]: https://github.com/MyEMS/myems/compare/v1.3.3...v1.3.4

admin/views/common/footer-login.html

@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.5.1 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.6.0 <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.5.1</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.6.0</strong>
     </div>
 </div>

database/install/myems_system_db.sql

@@ -1246,6 +1246,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.5.1', '2021-12-18');
+(1, '1.6.0', '2021-12-31');
 
 COMMIT;

database/upgrade/upgrade1.6.0.sql

@@ -0,0 +1,6 @@
+START TRANSACTION;
+
+-- UPDATE VERSION NUMBER
+UPDATE myems_system_db.tbl_versions SET version='1.6.0', release_date='2021-12-31' WHERE id=1;
+
+COMMIT;

myems-api/core/version.py

@@ -15,8 +15,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS v1.5.1',
+        result = {"version": 'MyEMS v1.6.0',
-                  "release-date": '2021-12-18',
+                  "release-date": '2021-12-31',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)
 

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",

web/src/config.js

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