Merge branch 'develop'

CHANGELOG.md

@@ -16,6 +16,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
+## [v1.7.0] -   2022-01-28
+### Added
+- added new database myems_carbon_db
+- added alternative uuid parameter to reports of combined equipment, equipment, meter, shopfloor, store and tenant
+- added meter carbon dioxide emission report to api
+- added meter carbon dioxide emission aggregation procedure
+- added virtual meter carbon dioxide emssion aggregation procedure
+- added offline meter carbon dioxide emission aggregation procedure
+
+### Changed
+- updated architecture images in README
+- updated components images in docs
+
+### Fixed
+- fixed select statements issue in tenant reports.
+- fixed fraction numerator and denominator issue in combinedequipmentefficiency and equipmentefficiency reports
+- fixed issue of config in aggregation service
+- fixed issue of carbon_dioxide_emmision_factor in aggregation serivce
+- fixed isssues in README
+
+### Removed
+-   None.
+
 ## [v1.6.1] -   2022-01-18
 ### Added
 - added docker image immigration to readme.
@@ -646,7 +669,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.6.1...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.7.0...HEAD
+[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
 [v1.5.1]: https://github.com/MyEMS/myems/compare/v1.5.0...v1.5.1

admin/views/common/footer-login.html

@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.6.1 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.7.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.6.1</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.7.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.6.1', '2022-01-18');
+(1, '1.7.0', '2022-01-28');
 
 COMMIT;

myems-api/core/version.py

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

web/package.json

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

web/src/config.js

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