37a44353a8
added access control to shopfloor, store and tenant in api and admin
2021-12-08 23:28:58 +08:00
31b70d4057
added access_control to costcenter and tariff
2021-12-08 10:22:16 +08:00
95c8dd95d5
Merge branch 'PR' into develop
2021-12-07 20:14:55 +08:00
167d6a2caa
added access control to point in api and admin
2021-12-07 20:00:28 +08:00
9c9e316efc
added access control to point in api and admin
2021-12-07 19:50:37 +08:00
8ea1d4a812
added access control to shopfloor tenant and store
2021-12-07 15:04:26 +08:00
be77f29b3b
point of access_control
2021-12-07 14:35:41 +08:00
15cc27ac18
added access control to equipment in api and admin
2021-12-06 23:02:27 +08:00
9b417d0648
Merge branch 'PR' into develop
2021-12-06 22:17:44 +08:00
57671aa2b6
added access control to combinedequipment in api and admin
2021-12-06 19:31:51 +08:00
0bf0c829d0
equipment of access_control
2021-12-06 15:26:27 +08:00
fb31837efa
added access_control to combinedequipment
2021-12-06 14:52:15 +08:00
5d1e469894
updated nofification(web message) in web and api
2021-12-05 22:37:59 +08:00
cd94e31a98
added user varification to webmessage in admin and api
2021-12-05 18:06:50 +08:00
996f7066e1
added access control to wechat message in api and admin
2021-12-05 12:37:42 +08:00
65565a5351
added access control to text message in api and admin
2021-12-04 20:48:56 +08:00
3e536d503e
added access control to email message in api and admin
2021-12-04 19:52:12 +08:00
3ec50fab0d
added access control to sersor in api and admin
2021-12-03 19:53:12 +08:00
b10cc91a3a
Merge branch 'PR89' into develop
2021-12-03 19:21:08 +08:00
4e0961e5fb
added access control to distribution system in api and admin
2021-12-03 19:09:39 +08:00
05b5631408
Merge branch 'PR88' into develop
2021-12-03 17:01:21 +08:00
2eaa8df6c6
added access control to sensor
2021-12-03 16:36:48 +08:00
469c21672b
distrbutioncircuit/distributionsystem of access_control
2021-12-03 14:58:04 +08:00
fb8284ca52
added access control to privilege in api and admin
2021-12-03 14:16:51 +08:00
624e4f7e3b
Merge branch 'PR87' into develop
2021-12-03 14:00:48 +08:00
8f2db8952f
added access control to energyflowdiagram in api and admin
2021-12-03 13:51:32 +08:00
8dd998ed0c
added access_control to privilege
2021-12-02 10:43:32 +08:00
62312e8c54
energyflowdiagram of access_control2
2021-12-02 09:56:13 +08:00
f685728985
Merge remote-tracking branch 'origin/develop' into develop
2021-12-02 09:09:38 +08:00
213f669924
added access control to energyitem in api and admin
2021-12-01 22:16:11 +08:00
c7fe4dea79
energyflowdiagram of access_control
2021-12-01 14:21:38 +08:00
637f8ce481
added accecc_control to contact in api and admin
2021-11-30 22:57:51 +08:00
8481fa68a5
modified postman_collection.json
2021-11-30 10:13:11 +08:00
20db5357b2
modified postman_collection.json
2021-11-30 10:11:04 +08:00
16c7e858fb
added access control to EnergyItem
2021-11-30 10:00:38 +08:00
9304225419
contact of access_control
2021-11-29 18:48:29 +08:00
dfec9a8fc0
added access_control to menu in api and admin
2021-11-29 17:46:14 +08:00
d5ad69b7b9
menu of access_control2
2021-11-29 17:02:06 +08:00
7a2d2a3f1d
menu of access_control
2021-11-29 16:07:31 +08:00
ccf7b9d435
updated requirements of myems-api
2021-11-28 20:46:46 +08:00
3b0d4a13f5
added access control to meter in api and admin
2021-11-27 21:15:43 +08:00
27f9bb8629
updated postman collection and README of myems-api
2021-11-26 19:17:09 +08:00
8e0bb54616
Merge branch 'PR81' into develop
2021-11-23 23:16:24 +08:00
d7cad1d6e0
added access control to energycategory
2021-11-23 11:29:36 +08:00
a8fec3a7dd
added access control to energycategory
2021-11-23 11:19:38 +08:00
365a0a903c
added access control to meter
2021-11-23 11:08:29 +08:00
566b57843a
added access control to gateway, datasource and point
2021-11-20 21:51:38 +08:00
d5155c04b8
added access control to offline meter file
2021-11-19 22:49:54 +08:00
d15fef3b52
added access control to knowledge file
2021-11-19 22:10:59 +08:00
2245dee31e
added access control to cost file
2021-11-18 22:51:01 +08:00
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
13621160019@163.com