Merge branch 'master' into develop

CHANGELOG.md

@@ -16,6 +16,35 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 - None.
 
+## [v1.1.3] - 2021-05-25
+### Added
+- added Combined Equipment Batch Analysis Report
+- added Shopfloor Batch Analysis Report
+- added Store Batch Analysis Report
+- added Tenant Batch Analysis Report
+- implemented virtual point calculating in myems-normalization service
+- added is_virtual to tbl_points in database
+- added gateway process to myems-modbus-tcp service
+- added gateway process to myems-bacnet service
+- added procedure to update last seen datetime of data source in myems-modbus service
+- added last seen datetime to data source setting in Admin UI
+- added last seen datetime to Gateway Setting in Admin UI
+- added excel exporter of spaceefficiency report in API
+
+### Changed
+- updated Dashboard in web to display energy data of this year
+- updated tbl_expressions in database
+- added start value and end value to metertracking report
+- updated comments and log messages in myems-modbust-tcp service
+- improved theme of energyflowdiagram in Web UI
+
+### Fixed
+- updated metertracking report to reduce duplicated meters
+- fixed detailed value missing issue in SpaceEfficiency report in Web UI
+
+### Removed
+- None.
+
 ## [v1.1.2] - 2021-04-23
 ### Added
 - added assoicated parameters data to excel exporter of shopfloorstatistics in API
@@ -227,7 +256,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.1.2...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.1.3...HEAD
+[v1.1.3]: https://github.com/MyEMS/myems/compare/v1.1.2...v1.1.3
 [v1.1.2]: https://github.com/MyEMS/myems/compare/v1.1.1...v1.1.2
 [v1.1.1]: https://github.com/MyEMS/myems/compare/v1.1.0...v1.1.1
 [v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.8...v1.1.0

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.1.2</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.1.3</strong>
     </div>
 </div>

database/myems_system_db.sql

@@ -2250,6 +2250,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.1.2', '2021-04-23');
+(1, '1.1.3', '2021-05-25');
 
 COMMIT;

database/upgrade1.1.3.sql

@@ -7,4 +7,4 @@ ALTER TABLE myems_system_db.tbl_expressions MODIFY COLUMN equation LONGTEXT NOT
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.3', release_date='2021-05-05' WHERE id=1;
+UPDATE myems_system_db.tbl_versions SET version='1.1.3', release_date='2021-05-25' WHERE id=1;

web/package.json

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

web/src/config.js

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