Caozhenhui
|
2c748d2eee
|
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
|
2021-11-04 20:24:51 +08:00 |
|
Caozhenhui
|
bffef535ea
|
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
|
2021-11-04 19:50:44 +08:00 |
|
Caozhenhui
|
67f22d2dd3
|
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
|
2021-11-04 19:49:23 +08:00 |
|
Caozhenhui
|
caa65ef136
|
Added the time scale of weekly in statistics_hourly_data_by_period
|
2021-11-04 16:24:23 +08:00 |
|
Caozhenhui
|
88e33fa9c6
|
Added the time scale of weekly
|
2021-11-03 11:09:48 +08:00 |
|
Caozhenhui
|
4a44727a0a
|
Added the time scale of weekly
|
2021-11-03 11:00:17 +08:00 |
|
Caozhenhui
|
3fc620b596
|
Added the time scale of weekly
|
2021-11-03 10:32:16 +08:00 |
|
Caozhenhui
|
62ad53d430
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-11-02 17:03:08 +08:00 |
|
guangyuzhang
|
8d421975c5
|
updated Dockerfiles
|
2021-11-01 14:52:33 +08:00 |
|
Caozhenhui
|
9ea6c505a5
|
Added the time scale of weekly to all required files
|
2021-11-01 11:28:07 +08:00 |
|
13621160019@163.com
|
913061987d
|
updated README
|
2021-10-30 18:53:35 +08:00 |
|
13621160019@163.com
|
70151b020f
|
updated version number to v1.3.3
|
2021-10-30 16:11:12 +08:00 |
|
13621160019@163.com
|
ff30e3a805
|
updated README and database test procedure
|
2021-10-30 13:30:46 +08:00 |
|
13621160019@163.com
|
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 |
|
13621160019@163.com
|
5f285d7939
|
updated commments in aggregate_hourly_data_by_period of API
|
2021-10-28 21:53:24 +08:00 |
|
13621160019@163.com
|
8353ca2b88
|
updated myems-api installation
|
2021-10-28 12:23:27 +08:00 |
|
Caozhenhui
|
0c1a2d9ab8
|
Modified comments
|
2021-10-27 10:05:35 +08:00 |
|
Caozhenhui
|
fedcb71d3f
|
Modified comments
|
2021-10-27 09:54:59 +08:00 |
|
Caozhenhui
|
21901667cb
|
simplified code
|
2021-10-27 09:51:34 +08:00 |
|
Caozhenhui
|
88eb2dfc07
|
simplified code
|
2021-10-27 09:29:33 +08:00 |
|
Caozhenhui
|
7f212e209d
|
Added the time scale of weekly to meterenergy
|
2021-10-26 19:35:10 +08:00 |
|
13621160019@163.com
|
c20600d7fe
|
removed unused import from API
|
2021-10-25 20:06:58 +08:00 |
|
13621160019@163.com
|
545d16660d
|
fixed detailed data sort issues in Web UI
|
2021-10-24 16:30:52 +08:00 |
|
13621160019@163.com
|
c2725a9023
|
reformatted excel exporters of shopfloor reports
|
2021-10-22 16:12:29 +08:00 |
|
13621160019@163.com
|
3d6bceb4db
|
reformatted excel exporters of store reports
|
2021-10-22 13:13:44 +08:00 |
|
13621160019@163.com
|
f968f17de3
|
reformatted excel exporters of tenant reports
|
2021-10-21 21:23:48 +08:00 |
|
13621160019@163.com
|
d9a0fe53b5
|
reformatted excel exporters of equipment reports
|
2021-10-21 20:56:28 +08:00 |
|
Caozhenhui
|
20b05f769d
|
Remove Child Space Data Section from EquipmentEnergyCategory Excel Exporter
|
2021-10-20 17:50:46 +08:00 |
|
13621160019@163.com
|
05110a1efe
|
added associated equipments data to combinedequipmentefficiency report
Merge branch 'PR72' into develop
|
2021-10-20 15:56:37 +08:00 |
|
13621160019@163.com
|
087815c219
|
fixed PEP8 warnings
|
2021-10-20 15:56:27 +08:00 |
|
13621160019@163.com
|
e65cd550a2
|
deleted unused comments from excelexporters
|
2021-10-20 15:10:40 +08:00 |
|
tianlinzhong
|
f4166091b7
|
Added Associated Equpment Data to CombinedEquipmentEfficiency Report in web UI and API
|
2021-10-20 13:45:19 +08:00 |
|
Caozhenhui
|
14dddada7f
|
Added Pie Charts of TCE/TCO2E
|
2021-10-20 10:37:33 +08:00 |
|
13621160019@163.com
|
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 |
|
13621160019@163.com
|
4616712828
|
cleared unused comments
|
2021-10-19 19:06:02 +08:00 |
|
13621160019@163.com
|
32256396ac
|
added validation for area of shopfloor, space, store and tenant in API
|
2021-10-19 18:45:17 +08:00 |
|
Caozhenhui
|
d6f24b6e8d
|
Added Pie Charts of TCE/TCO2E to ShopfloorEnergycategory Excel Exporter
|
2021-10-19 13:51:21 +08:00 |
|
13621160019@163.com
|
f128c477b7
|
fixed warnings in excel exporters
|
2021-10-18 14:48:55 +08:00 |
|
tianlinzhong
|
cf26d8c700
|
Rename All Parameter Worksheet Names in Excel Exporters
|
2021-10-18 10:57:35 +08:00 |
|
13621160019@163.com
|
3936b7c2e7
|
updated version number to v1.3.1
|
2021-10-15 16:31:00 +08:00 |
|
13621160019@163.com
|
7eb5effd6a
|
updated README files
|
2021-10-15 14:30:17 +08:00 |
|
13621160019@163.com
|
55b5024619
|
renamed example.env files and fixed typos in config
|
2021-10-15 13:32:43 +08:00 |
|
13621160019@163.com
|
b2ac741fdc
|
fixed worksheet name error in combined equipment efficiency excel exporter
|
2021-10-13 22:22:33 +08:00 |
|
13621160019@163.com
|
3c3016f8e1
|
updated maximum load value according to MINUTES_TO_COUNT in tenantbatch report
|
2021-10-13 21:58:36 +08:00 |
|
Caozhenhui
|
f729744960
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-10-13 13:23:18 +08:00 |
|
13621160019@163.com
|
b97c16fbb9
|
updated config.py files to move all variables to .env files via Python Decouple
|
2021-10-12 18:39:42 +08:00 |
|
tianlinzhong
|
8b765f43d5
|
Error When Opening CombinedEquipmentEfficiency Excel Report
|
2021-10-12 14:56:39 +08:00 |
|
Caozhenhui
|
2d91cecec9
|
added maximum load data
|
2021-10-12 14:27:37 +08:00 |
|
tianlinzhong
|
515125a169
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-10-11 17:18:06 +08:00 |
|
tianlinzhong
|
cef1f9ad67
|
1
|
2021-10-11 17:17:28 +08:00 |
|
13621160019@163.com
|
443623424f
|
updated README
|
2021-10-11 16:53:56 +08:00 |
|
hyh123a
|
f3a36d4a74
|
modfiy the doc for docker-compose
|
2021-10-11 16:53:56 +08:00 |
|
13621160019@163.com
|
00d36b331e
|
updated format of excel exporters
|
2021-10-11 16:53:56 +08:00 |
|
13621160019@163.com
|
5ea4c7a83b
|
updated format of excel exporters
|
2021-10-11 16:53:56 +08:00 |
|
13621160019@163.com
|
bfd6d8956a
|
updated format of excel exporters
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
2d5810db51
|
updated format of excel exporters
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
d41739b06b
|
updated format of excel exporters
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
0975db800d
|
reformatted excel exporters
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
89f764869d
|
reformatted excel exporter of spaceenergycategory
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
e55ea48ef5
|
fixed NoneType issues in ExcelExporters
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
60d772ee1b
|
changed name font from Constantia to Arial in excel exporters
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
fc18eeb32c
|
fixed PEP8 warnings and update version number to v1.3.0
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
3cbecd9d14
|
replaced Chinese with English in Excel Exporters of API
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
c65a24682c
|
removed gsmmodem and aliyun sms api from API & Admin UI
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
2539b129e5
|
changed start&end datetime formater for tariff from timestamp to strftime
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
022c6f49d4
|
changed lease start&end datetime formater for tenant from timestamp to strftime
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
f378455cf9
|
changed lease start&end datetime formater for tenant from timestamp to strftime
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
669e299826
|
changed last run datetime and next run datetime formater for rule from timestamp to strftime
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
03d532871e
|
changed last seen datetime formater for gateway from timestamp to strftime
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
248fdb7180
|
changed last seen datetime formater of datasource from timestamp to strftime
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
d678ac4149
|
changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime;
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
a2f5af089d
|
changed cost file upload datetime formatter from timestamp to strftime
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
ff501fdf2f
|
added expiration datetimes to User in Admin UI
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
344d928ce9
|
added expiration datetimes to user actions in API
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
13b507a2a9
|
added column ID to StoreBatch Excel Exporter in API
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
d3fc8c98d0
|
added meter ID to meterbatch excel exporter in API
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
0e483b674e
|
added new protocols of datasource into API
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
be1ab059a1
|
added new datasource protocols to API
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
6811a22eea
|
added aliyunsmsapi to api/core
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
0c8988ba2e
|
updated distibutionssystem point value timeout value to 30 minutes
|
2021-10-11 16:53:55 +08:00 |
|
13621160019@163.com
|
99f05c4311
|
updated README for installing openpyxl
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
16630dc30e
|
modified API error message for knowledge file cannot be removed from disk
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
14d0b7aa77
|
removed cookies usages from API
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
859ed6826c
|
updated userlogger in API to pass HTTPError to client
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
fc379e4e3b
|
added trusted-host to Dockerfiles
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
89c287148c
|
updated README
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
25b42b9c8a
|
added user log to UserLogin, ChangePassword and ResetPassword in API
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
74c847e657
|
fixed typos in API
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
5858943cd7
|
fixed typo in userlogger of API
|
2021-10-11 16:53:54 +08:00 |
|
13621160019@163.com
|
b7b8f78ba1
|
removed user_logger decorators from some actions in API
|
2021-10-11 16:53:53 +08:00 |
|
13621160019@163.com
|
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 |
|
13621160019@163.com
|
91a0342c2f
|
updated userlogger in API
|
2021-10-11 16:53:53 +08:00 |
|
hyh123a
|
61fdc9ca74
|
modify the date_time to utc
|
2021-10-11 16:53:53 +08:00 |
|
hyh123a
|
4f1d2f5ad4
|
add the judge for admin
|
2021-10-11 16:53:53 +08:00 |
|
hyh123a
|
4c8a93380f
|
add the log function and test in equipments
|
2021-10-11 16:53:53 +08:00 |
|
13621160019@163.com
|
912d5863c0
|
updated README
|
2021-10-09 20:54:39 +08:00 |
|
hyh123a
|
1803533b28
|
modfiy the doc for docker-compose
|
2021-10-09 12:16:03 +08:00 |
|
Winnerineast Lee
|
9a82cbb999
|
Merge pull request #2 from MyEMS/master
catch up with the main site.
|
2021-10-05 16:10:30 +08:00 |
|
13621160019@163.com
|
e098ec5763
|
updated format of excel exporters
|
2021-10-03 09:55:10 +08:00 |
|
13621160019@163.com
|
70525e0631
|
updated format of excel exporters
|
2021-10-02 22:50:58 +08:00 |