Commit Graph

200 Commits (be90a24883a5be25be24d25de0605d9e3414c05d)

Author SHA1 Message Date
13621160019@163.com e5a8c38ed2 removed dictionary based cursors from api/core 2022-04-13 15:08:43 +08:00
13621160019@163.com 891f77b5d4 removed dictionary parameter from cursor in combined equipment api 2022-04-12 22:22:47 +08:00
13621160019@163.com 8e7c30cafa removed ID limitation from on_delete of shopfloor api 2022-04-10 22:15:04 +08:00
13621160019@163.com ae2bd5ed7e fixed tuple index error in combinedequipment api 2022-04-10 20:42:14 +08:00
13621160019@163.com f190c9d5c3 added length parameter to mysql substring function in myems-api 2022-04-09 00:28:11 +08:00
13621160019@163.com e4fd38b18d removed cursor dictionary parameter from combinedequipment in myems-api 2022-04-07 22:09:33 +08:00
13621160019@163.com 5d17818ae0 removed cursor dictionary parameter from combinedequipment in myems-api 2022-04-07 22:01:05 +08:00
13621160019@163.com 1f09369f41 removed dictionary parameter from cursor of combinedequipment api functions 2022-03-28 22:24:48 +08:00
13621160019@163.com c964306999 replaced FALSE with 0 in SQL statements 2022-03-24 21:17:16 +08:00
13621160019@163.com 1fa7d67fe2 moved cnx.close after cursor.close in useractivity.write_log procedure 2022-03-20 14:33:39 +08:00
13621160019@163.com 6fd3fddf99 updated version number to v1.8.2 2022-03-16 15:43:02 +08:00
13621160019@163.com 0798a683f1 replaced cnx.disconnect() with cnx.close() according to PEP 249 2022-03-16 14:12:58 +08:00
13621160019@163.com e7548a7ea4 updated version number to v1.8.1 2022-03-05 10:50:21 +08:00
13621160019@163.com 004bfeff68 added limit 1 to number of ENERGY_VALUE points of meter 2022-02-23 14:42:37 +08:00
13621160019@163.com 2f4831bbd8 added limit 1 to number of ENERGY_VALUE points of meter 2022-02-23 14:02:48 +08:00
tianlinzhong d19838fd32 fixed issues 199 -3 2022-02-23 11:07:21 +08:00
tianlinzhong c2f427e354 fixed issues 199 -2 2022-02-21 23:49:41 +08:00
tianlinzhong 25a9713e23 fixed issues 199 -2 2022-02-21 23:38:49 +08:00
tianlinzhong 51b9e43a04 fixed issues 199 2022-02-21 14:39:53 +08:00
13621160019@163.com 7e5c39bae7 added Meter Carbon Dioxide Emissions Report to Web UI 2022-02-20 15:43:20 +08:00
13621160019@163.com ea992ee849 updated version number to 1.7.2 2022-02-19 08:44:35 +08:00
13621160019@163.com 93f9641d8b added Mark All As Read action to notification 2022-02-17 18:54:54 +08:00
tianlinzhong b132a3ba13 fixed Web UI Notification bug 2022-02-14 17:06:46 +08:00
13621160019@163.com 05ea20416f updated version number to v1.7.1 2022-02-12 21:03:25 +08:00
13621160019@163.com 1e652da94d updated Web Message actions in API and Notification Page in Web UI 2022-02-12 15:53:55 +08:00
tianlinzhong af332baa3c fixed Web UI Notification Error 2022-02-09 16:08:56 +08:00
13621160019@163.com 225dd53330 udpated version number to v1.7.0 2022-01-28 19:14:19 +08:00
13621160019@163.com 7f26b63aac upgraded version number to 1.6.1 2022-01-18 22:55:31 +08:00
13621160019@163.com 63397a1eee added qrcode string to tenant, equipment, and combinedequipment in api 2022-01-13 10:05:27 +08:00
13621160019@163.com ec74c31b6f added qrcode in string to store in api 2022-01-12 22:26:52 +08:00
13621160019@163.com 064f47786d added QRCode in String to Space in API 2022-01-12 21:51:04 +08:00
13621160019@163.com 6c3ca2314f added qrcode to shopfloor 2022-01-12 21:34:53 +08:00
13621160019@163.com 85a2728faf changed meter qrcode from svg to string 2022-01-12 11:58:36 +08:00
Caozhenhui 1dbe058abd used bytesIO deal with qrcode 2022-01-11 10:28:28 +08:00
Caozhenhui a04ad940c8 used bytesIO deal with qrcode 2022-01-11 10:26:48 +08:00
Caozhenhui b41608aaf3 added 'qrcode' parameter to meter 2022-01-10 14:21:23 +08:00
Caozhenhui 53f76d14bf added 'qrcode' parameter to meter 2022-01-10 09:58:19 +08:00
Caozhenhui 6af787af27 added 'qrcode' parameter to meter 2022-01-10 09:55:51 +08:00
13621160019@163.com 7459c37ea1 improved virtual meter editor in admin ui 2022-01-04 22:21:18 +08:00
tianlinzhong 3f096b592d Improved Virtual Meter Editor 2022-01-04 15:34:12 +08:00
13621160019@163.com 35d2d7306a updated version number to v1.6.0 2021-12-31 12:47:17 +08:00
tianlinzhong be7c51b2c1 Added Put Update New EmailMessage API and text message and wechat message 2021-12-27 16:03:13 +08:00
13621160019@163.com d0e06e122e added POST actions to create new email/wechat/text messages 2021-12-24 19:54:22 +08:00
tianlinzhong 289a6439e8 Added POST Create New WechatMessage API 2 2021-12-23 16:11:54 +08:00
tianlinzhong 1d88799907 Added POST Create New EmailMessage API 2 2021-12-22 10:47:49 +08:00
tianlinzhong d66cdd54d0 Added POST Create New EmailMessage API and text message and wechat message 2021-12-21 15:29:37 +08:00
tianlinzhong 043c39b81a Added POST Create New EmailMessage API and text message and wechat message 2021-12-21 15:04:09 +08:00
13621160019@163.com 907a582c48 updated get messages by date range in admin and api 2021-12-20 21:15:26 +08:00
13621160019@163.com 3045e8d4f0 Merge branch 'PR' into develop 2021-12-20 20:25:40 +08:00
13621160019@163.com 75ea44dd84 added locl/unlock user who faied login some times to admin and api 2021-12-20 20:00:48 +08:00