updated version to v1.1.0

CHANGELOG.md

@@ -5,18 +5,41 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
-- added equipmentefficiency report api.
+- None.
 
 ### Changed
 - None.
 
 ### Fixed
-- added historical database close and disconnect at the end of reports.
+- None.
 
 ### Removed
 - None.
 
 
+## [v1.1.0] - 2021-03-18
+### Added
+- added excel exporter of equipmentefficiency report.
+- added excel exporter of conbinedequipmentefficiency report in API.
+- added 'optional' tips to meter,virtual meter and offline meter setting in admin UI.
+- added Optional key to translation in admin UI.
+- added cominbedequipmentefficiency report to api and web.
+- added equipmentefficiency report api.
+
+### Changed
+- updated cost file controller in admin UI
+- updated user login session expire time to 8 hours.
+- changed web UI and API to set contact of space is optional.
+
+### Fixed
+- fixed http headers issues of offlinemeterfile, knowledgefile and costfile in admin UI
+- changed float datatype to Decimal datatype for offline meter normalization.
+- fixed issue of add space in web UI.
+- added historical database close and disconnect at the end of reports.
+
+### Removed
+- None.
+
 ## [v1.0.8] - 2021-03-11
 ### Added
 - added excel exporter of combinedequipmentstatistics report
@@ -27,7 +50,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - added excel exporter of equipmentload report
 
 ### Changed
-- None.
+- Changed default reporting range in EnergyFlowDiagram.
 
 ### Fixed
 - None.
@@ -96,7 +119,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.0.8...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.1.0...HEAD
+[v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.8...v1.1.0
 [v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.7...v1.0.8
 [v1.0.7]: https://github.com/MyEMS/myems/compare/v1.0.6...v1.0.7
 [v1.0.6]: https://github.com/MyEMS/myems/compare/v1.0.5...v1.0.6

admin/views/common/footer-login.html

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

database/myems_system_db.sql

@@ -2249,6 +2249,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.0.5', '2021-02-23');
+(1, '1.1.0', '2021-03-18');
 
 COMMIT;

database/upgrade1.1.0.sql

@@ -0,0 +1,3 @@
+
+-- UPDATE VERSION NUMBER
+UPDATE myems_system_db.tbl_versions SET version='1.1.0', release_date='2021-03-18' WHERE id=1;

myems-api/core/version.py

@@ -14,8 +14,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS 1.0.8 (Community Edition)',
-                  "release-date": '202103011',
+        result = {"version": 'MyEMS 1.1.0 (Community Edition)',
+                  "release-date": '202103018',
                   "website": "https://myems.io"}
         resp.body = json.dumps(result)
 

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.28",

web/src/config.js

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