diff --git a/CHANGELOG.md b/CHANGELOG.md index d42ff0b3..e160c8a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added +- None. + +### Changed +- None. + +### Fixed +- None. + +### Removed +- None. + +## [v1.0.7] - 2021-03-07 +### Added +- added excel exporter of storeload report +- added excel exporter of spaceincome report +- added excel exporter of equipmentsaving report +- added excel exporter of combinedequipmentsaving report +- added excel exporter of combinedequipmentload report +- added excel exporter of spaceoutput report +- added excel exporter of combinedequipmentoutput +- added excel exporter of combinedequipmentcost report +- added excel exporter of shopfloorcost report +- added excel exporter of shopfloorload report +- added excel exporter of combinedequipmentenergycategory report - added excel exporter of combinedequipmentitem report. - added excel exporter of equipmentenergyitem report. - added excel exporter of equipmentenergycategory report. @@ -53,7 +77,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.5...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.0.7...HEAD +[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 [v1.0.5]: https://github.com/MyEMS/myems/releases/tag/v1.0.5 diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index bf7d36fa..3ceedced 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 249a0ba3..d5534c93 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.0.5 + {{'MY_EMS_NAME' | translate}} V1.0.7
diff --git a/database/upgrade1.0.7.sql b/database/upgrade1.0.7.sql new file mode 100644 index 00000000..9778bd4e --- /dev/null +++ b/database/upgrade1.0.7.sql @@ -0,0 +1,3 @@ + +-- UPDATE VERSION NUMBER +UPDATE myems_system_db.tbl_versions SET version='1.0.7', release_date='2021-03-07' WHERE id=1; diff --git a/myems-api/core/version.py b/myems-api/core/version.py index 080efd2a..041ded6e 100644 --- a/myems-api/core/version.py +++ b/myems-api/core/version.py @@ -14,8 +14,8 @@ class VersionItem: @staticmethod def on_get(req, resp): - result = {"version": 'MyEMS 1.0.6 (Community Edition)', - "release-date": '20210227', + result = {"version": 'MyEMS 1.0.7 (Community Edition)', + "release-date": '20210307', "website": "https://myems.io"} resp.body = json.dumps(result) diff --git a/web/src/config.js b/web/src/config.js index 4323db40..423bd3fa 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,4 +1,4 @@ -export const version = '1.0.5'; +export const version = '1.0.7'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; //export const APIBaseURL = 'http://127.0.0.1:8000';