f396564bc2
added access control to email server setting
2021-11-17 23:02:35 +08:00
9937d0d051
added access control to email server
2021-11-17 22:58:24 +08:00
cda9381ec1
added access control to POST/PUT/DELETE of storetype in api
2021-11-17 13:32:23 +08:00
9d17baff1c
added access control to tenanttype POST/PUT/DELETE actions in api
2021-11-16 21:42:41 +08:00
aac085d160
added access control to timezone PUT action in api
2021-11-16 21:20:26 +08:00
a9cbee6cd1
updated Dockerfile of myems-api
2021-11-15 21:22:11 +08:00
ef7c602508
upgraded version number to v1.4.0
...
Upgrade procedure for this change:
1. Stop the myems-normalization service or container.
2. Backup your database.
3. Upgrade myems/admin, myems/myems-api, and myems/myems-normalization source code,
and keep previous .env files unchanged.
4. Run database/upgrade/upgrade1.4.0.sql to merge expression into virtual meter
5. Check the virtual meters in Admin UI.
6. Start the myems-normalization service or container.
2021-11-14 17:15:17 +08:00
6856423ed1
Merged expression table into virtual meter table in database
2021-11-14 16:40:58 +08:00
0c22efbe2f
updated excel exporters to make them print friendly
2021-11-11 22:45:45 +08:00
8f8bc8a969
added access control to actions of user in api
2021-11-10 18:12:30 +08:00
dd279ba548
added access control to actions of user in api
2021-11-10 18:04:15 +08:00
72484ea920
added access control to GET all users in API
2021-11-10 16:19:46 +08:00
5c900e9a82
fixed issue in on_delete of gateway in API
2021-11-10 12:25:05 +08:00
5d0679d60a
recovered usage of falcon_cors middleware in API
2021-11-09 21:50:05 +08:00
6051c05221
Resolved ERROR:PUT method not found
2021-11-09 13:55:43 +08:00
5cd0363acd
CORS Method not found when submit a PUT request
2021-11-08 18:13:15 +08:00
738f91d181
modified falcon.API to falcon.App and CORS to falcon.CORSmiddleware
2021-11-08 09:37:26 +08:00
e2234902a2
updated version number to v1.3.4
2021-11-06 15:44:05 +08:00
7595d87b96
added installation on docker to readme of admin ui
2021-11-05 19:04:34 +08:00
753b2a86ce
added installation on docker to README
2021-11-05 17:52:22 +08:00
df91f3b170
added installation on docker to README of myems-api
2021-11-05 16:42:06 +08:00
cfe749e44d
added weekly to i18n of Web UI
2021-11-04 21:18:50 +08:00
2c748d2eee
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
2021-11-04 20:24:51 +08:00
bffef535ea
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
2021-11-04 19:50:44 +08:00
67f22d2dd3
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
2021-11-04 19:49:23 +08:00
caa65ef136
Added the time scale of weekly in statistics_hourly_data_by_period
2021-11-04 16:24:23 +08:00
88e33fa9c6
Added the time scale of weekly
2021-11-03 11:09:48 +08:00
4a44727a0a
Added the time scale of weekly
2021-11-03 11:00:17 +08:00
3fc620b596
Added the time scale of weekly
2021-11-03 10:32:16 +08:00
62ad53d430
Merge remote-tracking branch 'upstream/develop' into develop
2021-11-02 17:03:08 +08:00
8d421975c5
updated Dockerfiles
2021-11-01 14:52:33 +08:00
9ea6c505a5
Added the time scale of weekly to all required files
2021-11-01 11:28:07 +08:00
913061987d
updated README
2021-10-30 18:53:35 +08:00
70151b020f
updated version number to v1.3.3
2021-10-30 16:11:12 +08:00
ff30e3a805
updated README and database test procedure
2021-10-30 13:30:46 +08:00
f3cda07639
added new period type 'weekly' to meterenergy and aggregate_hourly_data_by_period in API
...
Merge branch 'PR76' into develop
2021-10-28 21:53:41 +08:00
5f285d7939
updated commments in aggregate_hourly_data_by_period of API
2021-10-28 21:53:24 +08:00
8353ca2b88
updated myems-api installation
2021-10-28 12:23:27 +08:00
0c1a2d9ab8
Modified comments
2021-10-27 10:05:35 +08:00
fedcb71d3f
Modified comments
2021-10-27 09:54:59 +08:00
21901667cb
simplified code
2021-10-27 09:51:34 +08:00
88eb2dfc07
simplified code
2021-10-27 09:29:33 +08:00
7f212e209d
Added the time scale of weekly to meterenergy
2021-10-26 19:35:10 +08:00
c20600d7fe
removed unused import from API
2021-10-25 20:06:58 +08:00
545d16660d
fixed detailed data sort issues in Web UI
2021-10-24 16:30:52 +08:00
c2725a9023
reformatted excel exporters of shopfloor reports
2021-10-22 16:12:29 +08:00
3d6bceb4db
reformatted excel exporters of store reports
2021-10-22 13:13:44 +08:00
f968f17de3
reformatted excel exporters of tenant reports
2021-10-21 21:23:48 +08:00
d9a0fe53b5
reformatted excel exporters of equipment reports
2021-10-21 20:56:28 +08:00
20b05f769d
Remove Child Space Data Section from EquipmentEnergyCategory Excel Exporter
2021-10-20 17:50:46 +08:00
05110a1efe
added associated equipments data to combinedequipmentefficiency report
...
Merge branch 'PR72' into develop
2021-10-20 15:56:37 +08:00
087815c219
fixed PEP8 warnings
2021-10-20 15:56:27 +08:00
e65cd550a2
deleted unused comments from excelexporters
2021-10-20 15:10:40 +08:00
f4166091b7
Added Associated Equpment Data to CombinedEquipmentEfficiency Report in web UI and API
2021-10-20 13:45:19 +08:00
14dddada7f
Added Pie Charts of TCE/TCO2E
2021-10-20 10:37:33 +08:00
67191817ef
added Pie charts of TCE and TCO2E to excel exporter of shopfloorenergycategory report
...
Merge branch 'PR70' into develop
2021-10-19 19:06:22 +08:00
4616712828
cleared unused comments
2021-10-19 19:06:02 +08:00
32256396ac
added validation for area of shopfloor, space, store and tenant in API
2021-10-19 18:45:17 +08:00
d6f24b6e8d
Added Pie Charts of TCE/TCO2E to ShopfloorEnergycategory Excel Exporter
2021-10-19 13:51:21 +08:00
f128c477b7
fixed warnings in excel exporters
2021-10-18 14:48:55 +08:00
cf26d8c700
Rename All Parameter Worksheet Names in Excel Exporters
2021-10-18 10:57:35 +08:00
3936b7c2e7
updated version number to v1.3.1
2021-10-15 16:31:00 +08:00
7eb5effd6a
updated README files
2021-10-15 14:30:17 +08:00
55b5024619
renamed example.env files and fixed typos in config
2021-10-15 13:32:43 +08:00
b2ac741fdc
fixed worksheet name error in combined equipment efficiency excel exporter
2021-10-13 22:22:33 +08:00
3c3016f8e1
updated maximum load value according to MINUTES_TO_COUNT in tenantbatch report
2021-10-13 21:58:36 +08:00
f729744960
Merge remote-tracking branch 'upstream/develop' into develop
2021-10-13 13:23:18 +08:00
b97c16fbb9
updated config.py files to move all variables to .env files via Python Decouple
2021-10-12 18:39:42 +08:00
8b765f43d5
Error When Opening CombinedEquipmentEfficiency Excel Report
2021-10-12 14:56:39 +08:00
2d91cecec9
added maximum load data
2021-10-12 14:27:37 +08:00
515125a169
Merge remote-tracking branch 'origin/develop' into develop
2021-10-11 17:18:06 +08:00
cef1f9ad67
1
2021-10-11 17:17:28 +08:00
443623424f
updated README
2021-10-11 16:53:56 +08:00
f3a36d4a74
modfiy the doc for docker-compose
2021-10-11 16:53:56 +08:00
00d36b331e
updated format of excel exporters
2021-10-11 16:53:56 +08:00
5ea4c7a83b
updated format of excel exporters
2021-10-11 16:53:56 +08:00
bfd6d8956a
updated format of excel exporters
2021-10-11 16:53:55 +08:00
2d5810db51
updated format of excel exporters
2021-10-11 16:53:55 +08:00
d41739b06b
updated format of excel exporters
2021-10-11 16:53:55 +08:00
0975db800d
reformatted excel exporters
2021-10-11 16:53:55 +08:00
89f764869d
reformatted excel exporter of spaceenergycategory
2021-10-11 16:53:55 +08:00
e55ea48ef5
fixed NoneType issues in ExcelExporters
2021-10-11 16:53:55 +08:00
60d772ee1b
changed name font from Constantia to Arial in excel exporters
2021-10-11 16:53:55 +08:00
fc18eeb32c
fixed PEP8 warnings and update version number to v1.3.0
2021-10-11 16:53:55 +08:00
3cbecd9d14
replaced Chinese with English in Excel Exporters of API
2021-10-11 16:53:55 +08:00
c65a24682c
removed gsmmodem and aliyun sms api from API & Admin UI
2021-10-11 16:53:55 +08:00
2539b129e5
changed start&end datetime formater for tariff from timestamp to strftime
2021-10-11 16:53:55 +08:00
022c6f49d4
changed lease start&end datetime formater for tenant from timestamp to strftime
2021-10-11 16:53:55 +08:00
f378455cf9
changed lease start&end datetime formater for tenant from timestamp to strftime
2021-10-11 16:53:55 +08:00
669e299826
changed last run datetime and next run datetime formater for rule from timestamp to strftime
2021-10-11 16:53:55 +08:00
03d532871e
changed last seen datetime formater for gateway from timestamp to strftime
2021-10-11 16:53:55 +08:00
248fdb7180
changed last seen datetime formater of datasource from timestamp to strftime
2021-10-11 16:53:55 +08:00
d678ac4149
changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime;
2021-10-11 16:53:55 +08:00
a2f5af089d
changed cost file upload datetime formatter from timestamp to strftime
2021-10-11 16:53:55 +08:00
ff501fdf2f
added expiration datetimes to User in Admin UI
2021-10-11 16:53:55 +08:00
344d928ce9
added expiration datetimes to user actions in API
2021-10-11 16:53:55 +08:00
13b507a2a9
added column ID to StoreBatch Excel Exporter in API
2021-10-11 16:53:55 +08:00
d3fc8c98d0
added meter ID to meterbatch excel exporter in API
2021-10-11 16:53:55 +08:00
0e483b674e
added new protocols of datasource into API
2021-10-11 16:53:55 +08:00
be1ab059a1
added new datasource protocols to API
2021-10-11 16:53:55 +08:00
6811a22eea
added aliyunsmsapi to api/core
2021-10-11 16:53:55 +08:00
0c8988ba2e
updated distibutionssystem point value timeout value to 30 minutes
2021-10-11 16:53:55 +08:00
99f05c4311
updated README for installing openpyxl
2021-10-11 16:53:54 +08:00
16630dc30e
modified API error message for knowledge file cannot be removed from disk
2021-10-11 16:53:54 +08:00
14d0b7aa77
removed cookies usages from API
2021-10-11 16:53:54 +08:00
859ed6826c
updated userlogger in API to pass HTTPError to client
2021-10-11 16:53:54 +08:00
fc379e4e3b
added trusted-host to Dockerfiles
2021-10-11 16:53:54 +08:00
89c287148c
updated README
2021-10-11 16:53:54 +08:00
25b42b9c8a
added user log to UserLogin, ChangePassword and ResetPassword in API
2021-10-11 16:53:54 +08:00
74c847e657
fixed typos in API
2021-10-11 16:53:54 +08:00
5858943cd7
fixed typo in userlogger of API
2021-10-11 16:53:54 +08:00
b7b8f78ba1
removed user_logger decorators from some actions in API
2021-10-11 16:53:53 +08:00
ce55c0484f
added user_logger decorators to all on_put, on_post and on_delete actions in API
2021-10-11 16:53:53 +08:00
91a0342c2f
updated userlogger in API
2021-10-11 16:53:53 +08:00
61fdc9ca74
modify the date_time to utc
2021-10-11 16:53:53 +08:00
4f1d2f5ad4
add the judge for admin
2021-10-11 16:53:53 +08:00
4c8a93380f
add the log function and test in equipments
2021-10-11 16:53:53 +08:00
912d5863c0
updated README
2021-10-09 20:54:39 +08:00
1803533b28
modfiy the doc for docker-compose
2021-10-09 12:16:03 +08:00
9a82cbb999
Merge pull request #2 from MyEMS/master
...
catch up with the main site.
2021-10-05 16:10:30 +08:00
e098ec5763
updated format of excel exporters
2021-10-03 09:55:10 +08:00
70525e0631
updated format of excel exporters
2021-10-02 22:50:58 +08:00
aa7db89bb9
Merge pull request #1 from MyEMS/master
...
catch up with the main site.
2021-10-02 19:47:37 +08:00
60906080f4
mask out all clear password into encrypted ones.
2021-10-01 18:58:05 +08:00
1bfdedf0cc
fixed one bug for database.
...
created a dirty and easy way to run myems-api.
enhanced requirements.txt for both database and myems-api.
2021-10-01 18:38:34 +08:00
e1da419a2f
updated format of excel exporters
2021-09-30 22:39:29 +08:00
047241d466
updated format of excel exporters
2021-09-30 22:21:44 +08:00
afaa33e4fb
updated format of excel exporters
2021-09-29 22:42:47 +08:00
5f4776df4d
reformatted excel exporters
2021-09-28 22:57:52 +08:00
0cefad0ef1
reformatted excel exporter of spaceenergycategory
2021-09-28 22:18:31 +08:00
2e22c5cb92
fixed NoneType issues in ExcelExporters
2021-09-26 15:40:49 +08:00
3acb170e98
changed name font from Constantia to Arial in excel exporters
2021-09-25 22:42:26 +08:00
2496c1a32b
fixed PEP8 warnings and update version number to v1.3.0
2021-09-24 13:47:31 +08:00
685e96c0aa
replaced Chinese with English in Excel Exporters of API
2021-09-23 17:33:39 +08:00
b29d8d1e9b
removed gsmmodem and aliyun sms api from API & Admin UI
2021-09-22 22:42:37 +08:00
02caabc640
changed start&end datetime formater for tariff from timestamp to strftime
2021-09-22 18:09:13 +08:00
26000b5af7
changed lease start&end datetime formater for tenant from timestamp to strftime
2021-09-22 16:10:10 +08:00
efda021649
changed lease start&end datetime formater for tenant from timestamp to strftime
2021-09-22 16:07:38 +08:00
dec9bc6e87
changed last run datetime and next run datetime formater for rule from timestamp to strftime
2021-09-22 15:44:28 +08:00
15ca471b83
changed last seen datetime formater for gateway from timestamp to strftime
2021-09-22 15:25:30 +08:00
9624b75414
changed last seen datetime formater of datasource from timestamp to strftime
2021-09-22 14:50:41 +08:00
f27b95adee
changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime;
2021-09-22 13:55:50 +08:00
6962c65aab
changed cost file upload datetime formatter from timestamp to strftime
2021-09-22 12:41:12 +08:00
0ac76ccd96
added expiration datetimes to User in Admin UI
2021-09-22 11:28:33 +08:00
01b6dabb31
added expiration datetimes to user actions in API
2021-09-21 16:03:39 +08:00
bd43969274
added column ID to StoreBatch Excel Exporter in API
2021-09-17 12:24:25 +08:00
d2d4ced4d6
added meter ID to meterbatch excel exporter in API
2021-09-15 22:35:25 +08:00
b25559414d
added new protocols of datasource into API
2021-09-14 15:30:47 +08:00
982b71f1a4
added new datasource protocols to API
2021-09-14 11:10:18 +08:00
447eb57202
added aliyunsmsapi to api/core
2021-09-12 22:50:36 +08:00
7a760ad088
updated distibutionssystem point value timeout value to 30 minutes
2021-09-10 15:56:12 +08:00
0018459f0e
updated README for installing openpyxl
2021-09-07 17:33:10 +08:00
f24deea941
modified API error message for knowledge file cannot be removed from disk
2021-09-06 15:01:24 +08:00
4243ad043e
removed cookies usages from API
2021-09-06 11:52:47 +08:00
928ee6535e
updated userlogger in API to pass HTTPError to client
2021-09-04 15:41:06 +08:00
ddb95d87a3
added trusted-host to Dockerfiles
2021-09-01 15:35:13 +08:00
3c95f47415
updated README
2021-08-28 13:32:38 +08:00
6c90203d51
added user log to UserLogin, ChangePassword and ResetPassword in API
2021-08-28 11:26:26 +08:00
ee056857d5
fixed typos in API
2021-08-27 18:50:08 +08:00
c00b252de6
fixed typo in userlogger of API
2021-08-27 18:29:25 +08:00
457efdbf9c
removed user_logger decorators from some actions in API
2021-08-27 18:19:17 +08:00
6a5c8bd3cf
added user_logger decorators to all on_put, on_post and on_delete actions in API
2021-08-27 18:09:47 +08:00
eabce3c42c
implemented user_logger decorators in API
...
Merge branch 'PR63' into develop
2021-08-27 17:21:15 +08:00
9b5b9a38d7
updated userlogger in API
2021-08-27 17:21:01 +08:00
c350ddd808
fixed code style warnings in README
2021-08-26 14:57:44 +08:00
279ebde9f9
modify the date_time to utc
2021-08-26 10:02:30 +08:00
329b5f732b
add the judge for admin
2021-08-25 15:49:18 +08:00
0f637e8a4b
Merge branch 'develop' into logs
2021-08-25 15:24:08 +08:00
3565d0dbcc
add the log function and test in equipments
2021-08-25 15:13:34 +08:00
b389887b50
fixed PEP8 warnings in API
2021-08-25 12:01:14 +08:00
f39ad7f039
fixed code style warnings in API
2021-08-25 10:15:27 +08:00
bbbc93acda
fixed issues of markdown in README files
2021-08-23 16:53:48 +08:00
7766723f60
changed user token hash algorithm from sha1 to sha256 in API
2021-08-23 15:38:49 +08:00
3b2914eb87
fixed 'import * may pollute namespace' in API
2021-08-15 14:09:41 +08:00
61737feea8
removed 'unused import' from API
2021-08-15 14:06:46 +08:00
17dfe5d687
removed unused local variable in costfile.py of API
2021-08-15 13:56:44 +08:00
8372d3f741
removed unused import from meterbatch.py of API
2021-08-15 13:46:58 +08:00
0d4f0a57ab
fixed 'Clear-text logging of sensitive information' in API
2021-08-15 13:40:34 +08:00
6de60a8f0e
fixed 'The variable binary_file_data does not seem to be defined for all execution paths' in API
2021-08-15 13:14:35 +08:00
06b2892e84
fixed response body Restore actions
2021-08-14 17:24:35 +08:00
04bc0b2fdf
updated Dockerfiles to add pip mirrors
2021-08-11 18:27:42 +08:00
72d045e277
added version tags to images in Dockerfile
2021-08-11 13:17:30 +08:00
c0e363c87d
updated Admin UI translations for Error Messages of API
2021-08-10 16:41:01 +08:00
cb8cf6a424
fixed typo in API
2021-08-10 11:28:43 +08:00
1656d9b131
Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop
2021-08-06 16:12:00 +08:00
7270b1cdbb
fixed warnings of excelexporters in API
2021-08-05 16:27:05 +08:00
8fbf155960
replaced every_day_* to periodic_* in excelexporters of API
2021-08-05 10:52:05 +08:00
b6c6659106
replaced every_day_* to periodic_* in excelexporters of API
2021-08-05 10:52:00 +08:00
35d9ea4a02
modify the Dockerfile
2021-08-05 10:35:15 +08:00
4e11c36877
updated Menu API
2021-08-02 11:30:55 +08:00
39452605cd
fixed issue in Menu API
2021-08-02 11:10:53 +08:00
2c0de0f673
updated Menu Setting in Admin UI
2021-08-02 10:52:13 +08:00
efd239be06
added Menu Setting to Admin UI
2021-08-01 20:43:24 +08:00
ec5ad8792c
added Menu actions to API
...
Merge branch 'PR57' into develop
2021-08-01 12:13:36 +08:00
f3fe884268
updated README and Postman Collection for Menu of API
2021-08-01 12:13:20 +08:00
302fdf2ce8
updated Dockerfile
2021-07-30 19:05:54 +08:00
95c1dcca63
fixed the bug and add the notes
2021-07-30 18:58:05 +08:00
9bc743f7c9
fixed the bug for menu
2021-07-30 15:14:49 +08:00
8611c8d799
add the menu api
2021-07-30 15:08:20 +08:00
8513544e7d
add the cmd in Dockfile
2021-07-29 15:38:10 +08:00
13621160019@163.com