Merge branch 'develop'

MyEMS · Jul 11, 2024 · 617f522 · 617f522
2 parents 3a446d0 + d4b2b15
commit 617f522
Show file tree

Hide file tree

Showing 4 changed files with 343 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - added clone action to energy storage container in myems-api
 - added export action to energy storage container in myems-api
+- added actions for protocol in myems-api
 ### Changed
 - updated tariff price to keep 5 decimal places in database and myems-admin 
 ### Fixed

diff --git a/myems-admin/app/translations.js b/myems-admin/app/translations.js
@@ -1269,6 +1269,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -1416,6 +1419,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -2863,6 +2869,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -3010,6 +3019,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -4454,6 +4466,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -4600,6 +4615,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -6042,6 +6060,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -6189,6 +6210,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -7632,6 +7656,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -7779,6 +7806,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -9222,6 +9252,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -9369,6 +9402,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -10811,6 +10847,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -10958,6 +10997,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -12399,6 +12441,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -12546,6 +12591,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -13985,6 +14033,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -14132,6 +14183,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -15572,6 +15626,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -15719,6 +15776,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -17158,6 +17218,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -17305,6 +17368,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -18745,6 +18811,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -18892,6 +18961,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',
@@ -20337,6 +20409,9 @@ function config($translateProvider) {
  INVALID_PRIVILEGE_DATA: 'Invalid Privilege Data',
  INVALID_PRIVILEGE_ID: 'Invalid Privilege ID',
  INVALID_PRIVILEGE_NAME: 'Invalid Privilege Name',
+ INVALID_PROTOCOL_CODE: 'Invalid Protocol Code',
+ INVALID_PROTOCOL_ID: 'Invalid Protocol ID',
+ INVALID_PROTOCOL_NAME: 'Invalid Protocol Name',
  INVALID_RATIO_VALUE: 'Invalid Ratio Value',
  INVALID_RECIPIENT_EMAIL: 'Invalid Recipient Email',
  INVALID_RECIPIENT_MOBILE: 'Invalid Recipient Mobile',
@@ -20484,6 +20559,9 @@ function config($translateProvider) {
  POWER_POINT_NOT_FOUND: 'Power Point Not Found',
  PRIVILEGE_NAME_IS_ALREADY_IN_USE: 'Privilege Name Is Already In Use',
  PRIVILEGE_NOT_FOUND: 'Privilege Not Found',
+ PROTOCOL_CODE_IS_ALREADY_IN_USE: 'Protocol Code Is Already In Use',
+ PROTOCOL_NAME_IS_ALREADY_IN_USE: 'Protocol Name Is Already In Use',
+ PROTOCOL_NOT_FOUND: 'Protocol Not Found',
  RULE_NAME_IS_ALREADY_IN_USE: 'Rule Name Is Already In Use',
  RULE_NOT_FOUND: 'Rule Not Found',
  SELL_METER_NOT_FOUND: 'Sell Meter Not Found',

diff --git a/myems-api/app.py b/myems-api/app.py
@@ -9,7 +9,7 @@
  shopfloor, webmessage, distributionsystem, store, emailmessage, tenanttype, wechatmessage, space, gateway, \
  offlinemeter, rule, energycategory, sensor, energyitem, notification, menu, datarepairfile, workingcalendar, \
  microgrid, virtualpowerplant, energystoragecontainer, energystoragepowerstation, photovoltaicpowerstation, \
- windfarm, energyplanfile, svg
+ windfarm, energyplanfile, svg, protocol
 
 from reports import advancedreportfile
 from reports import combinedequipmentbatch
@@ -568,6 +568,11 @@
 api.add_route('/privileges/{id_}',
  privilege.PrivilegeItem())
 
+api.add_route('/protocols',
+ protocol.ProtocolCollection())
+api.add_route('/protocols/{id_}',
+ protocol.ProtocolItem())
+
 api.add_route('/rules',
  rule.RuleCollection())
 api.add_route('/rules/{id_}',