Merge branch 'develop'

CHANGELOG.md

@@ -16,6 +16,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
+## [v1.3.3] -   2021-10-30
+### Added
+-   added missing rule_id in myems_fdd_db.
+
+### Changed
+-   updated package.json in web ui
+-   updated README and database test procedure
+-   added validation of offline meter hourly values to myems-normalization service
+-   updated offline meter data template file
+-   added new period type 'weekly' to meterenergy and aggregate_hourly_data_by_period in API
+-   updated comments in aggregate_hourly_data_by_period of API
+-   updated myems-api installation.
+
+### Fixed
+-   fixed NoneType error in myems-cleaning service
+-   fixed warnings in myems-aggregation service
+-   fixed detailed data sort issues in Web UI
+
+### Removed
+-   removed duplicate entry in i18n of Web UI
+-   removed unused import from API.
+
 ## [v1.3.2] -   2021-10-22
 ### Added
 -   added associated equipments data to combinedequipmentefficiency report.
@@ -504,7 +526,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.3.2...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.3.3...HEAD
+[v1.3.3]: https://github.com/MyEMS/myems/compare/v1.3.2...v1.3.3
 [v1.3.2]: https://github.com/MyEMS/myems/compare/v1.3.1...v1.3.2
 [v1.3.1]: https://github.com/MyEMS/myems/compare/v1.3.0...v1.3.1
 [v1.3.0]: https://github.com/MyEMS/myems/compare/v1.2.3...v1.3.0

admin/views/common/footer-login.html

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

database/install/myems_system_db.sql

@@ -1243,6 +1243,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.3.2', '2021-10-22');
+(1, '1.3.3', '2021-10-30');
 
 COMMIT;

database/upgrade/upgrade1.3.3.sql

@@ -7,4 +7,4 @@ ALTER TABLE myems_fdd_db.tbl_wechat_messages_outbox ADD rule_id BIGINT NOT NULL
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.3', release_date='2021-10-29' WHERE id=1;
+UPDATE myems_system_db.tbl_versions SET version='1.3.3', release_date='2021-10-30' WHERE id=1;

myems-api/core/version.py

@@ -15,8 +15,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS v1.3.2',
-                  "release-date": '2021-10-22',
+        result = {"version": 'MyEMS v1.3.3',
+                  "release-date": '2021-10-30',
                   "website": "https://myems.io"}
         resp.body = json.dumps(result)
 

web/README.md

@@ -29,7 +29,7 @@ npx -v
 *   Download all the necessary dependencies into the node_modules directory.
 ```bash
 cd myems/web
-sudo npm i --unsafe-perm=true --allow-root
+sudo npm i --unsafe-perm=true --allow-root --legacy-peer-deps
 ```
 *   If you modified any scss files then you need to compile SCSS, else you can safely ignore this step.
 Run below command in your project directory to compile scss.

web/package.json

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

web/src/config.js

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