diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fed5137..bce0e22e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. +## [v1.3.2] - 2021-10-22 +### Added +- added associated equipments data to combinedequipmentefficiency report. +- added Pie Charts of TCE/TCO2E to excelexporters of equipmentenergycategory, combinedequipmentenergycategory and storeenergycategory. +- added Pie charts of TCE and TCO2E to excel exporter of shopfloorenergycategory report. +- added validation for area of shopfloor, space, store and tenant in API. + +### Changed +- reformatted excel exporters of shopfloor reports. +- reformatted excel exporters of store reports. +- reformatted excel exporters of tenant reports +- reformatted excel exporters of equipment reports +- renamed parameter worksheet names in excel exporters. +- updated database demo data in German. +- updated Database Demo in English. + +### Fixed +- fixed PEP8 warnings. +- fixed warnings in Excel exporters. + +### Removed +- Remove Child Space Data Section from EquipmentEnergyCategory Excel Exporter. +- deleted unused comments from excelexporters. + ## [v1.3.1] - 2021-10-15 ### Added @@ -480,7 +504,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.1...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.3.2...HEAD +[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 [v1.2.3]: https://github.com/MyEMS/myems/compare/v1.2.2...v1.2.3 diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index 1887ad57..8406c030 100644 --- a/admin/views/common/footer-login.html +++ b/admin/views/common/footer-login.html @@ -1,5 +1,5 @@ diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html index 4a21f443..c8efa71d 100644 --- a/admin/views/common/footer.html +++ b/admin/views/common/footer.html @@ -3,6 +3,6 @@ https://myems.io
- {{'MY_EMS_NAME' | translate}} v1.3.1 + {{'MY_EMS_NAME' | translate}} v1.3.2
diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql index de3dad2d..f57e84db 100644 --- a/database/install/myems_system_db.sql +++ b/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.0', '2021-09-24'); +(1, '1.3.2', '2021-10-22'); COMMIT; diff --git a/database/upgrade/upgrade1.3.2.sql b/database/upgrade/upgrade1.3.2.sql new file mode 100644 index 00000000..3a5fbd31 --- /dev/null +++ b/database/upgrade/upgrade1.3.2.sql @@ -0,0 +1,3 @@ + +-- UPDATE VERSION NUMBER +UPDATE myems_system_db.tbl_versions SET version='1.3.2', release_date='2021-10-22' WHERE id=1; diff --git a/web/package-lock.json b/web/package-lock.json index 238e8748..c8982440 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "myems", - "version": "1.3.1", + "version": "1.3.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "myems", - "version": "1.3.1", + "version": "1.3.2", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", "@fortawesome/fontawesome-svg-core": "^1.2.30", diff --git a/web/package.json b/web/package.json index 8d1c839a..e16896a4 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "myems", - "version": "1.3.1", + "version": "1.3.2", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", diff --git a/web/src/config.js b/web/src/config.js index 52e994ac..15f122e8 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,4 +1,4 @@ -export const version = '1.3.1'; +export const version = '1.3.2'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; //export const APIBaseURL = 'http://127.0.0.1:8000';