From c996658069db30ee210e9d09021005e669e6f981 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 24 Aug 2021 10:46:13 +0800 Subject: [PATCH 1/3] updated i18n in Web UI --- web/src/i18n.js | 312 +++++++++++++++++++++++------------------------- 1 file changed, 150 insertions(+), 162 deletions(-) diff --git a/web/src/i18n.js b/web/src/i18n.js index cb53b3dc..c202b14a 100644 --- a/web/src/i18n.js +++ b/web/src/i18n.js @@ -87,7 +87,7 @@ const resources = { "Settings": "Settings", "Set your own customized style": "Set your own customized style", "Color Scheme": "Color Scheme", - "Choose the perfect color mode for your app.": "Choose the perfect color mode for your app.", + "Choose the perfect color mode for your app": "Choose the perfect color mode for your app", "Light": "Light", "Dark": "Dark", "RTL Mode": "RTL Mode", @@ -106,7 +106,7 @@ const resources = { "language-en": "English", "language-de": "Deutsch", "Like What You See?": "Like What You See?", - "Get MyEMS now.": "Get MyEMS now.", + "Get MyEMS now": "Get MyEMS now", "Purchase": "Purchase", // Query Panel "Base Period Begins": "Base Period Begins", @@ -264,14 +264,14 @@ const resources = { "Logged in as ": "Logged in as ", "Forget Password?": "Forget Password?", "Forgot your password?": "Forgot your password?", - "Enter your email and we'll send you a reset link.": "Enter your email and we'll send you a reset link.", + "Enter your email and we'll send you a reset link": "Enter your email and we'll send you a reset link", "Send reset link": "Send reset link", "Thanks for using MyEMS!": "Thanks for using MyEMS!", - "You are now successfully signed out.": "You are now successfully signed out.", + "You are now successfully signed out": "You are now successfully signed out", "Return to Login": "Return to Login", "Please check your email!": "Please check your email!", "An email has been sent to ": "An email has been sent to ", - "Please click on the included link to reset your password.": "Please click on the included link to reset your password.", + "Please click on the included link to reset your password": "Please click on the included link to reset your password", "An email with password reset link is sent to ": "An email with password reset link is sent to ", "Change Password": "Change Password", "Old Password": "Old Password", @@ -314,7 +314,7 @@ const resources = { "File Size": "File Size", "Uploader": "Uploader", //Error - "The page you're looking for is not found.": "The page you're looking for is not found.", + "The page you're looking for is not found": "The page you're looking for is not found", "Make sure the address is correct and that the page hasn't moved. ": "Make sure the address is correct and that the page hasn't moved. ", "If you think this is a mistake,": "If you think this is a mistake,", "contact us": "contact us", @@ -355,17 +355,17 @@ const resources = { "API.ADVANCED_REPORT_NOT_FOUND": "Advanced report not found", "API.BAD_REQUEST": "Bad request", "API.CANNOT_SET_EXISTING_SUBMETER_AS_MASTER_METER": "Cannot set existing submeter as master meter", - "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTED": "Combined equipment equipment relation existed", + "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTS": "Combined equipment equipment relation exists", "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_NOT_FOUND": "Combined equipment equipment relation not found", - "API.COMBINED_EQUIPMENT_METER_RELATION_EXISTED": "Combined equipment meter relation existed", + "API.COMBINED_EQUIPMENT_METER_RELATION_EXISTS": "Combined equipment meter relation exists", "API.COMBINED_EQUIPMENT_METER_RELATION_NOT_FOUND": "Combined equipment meter relation not found", "API.COMBINED_EQUIPMENT_NAME_IS_ALREADY_IN_USE": "Combined equipment name is already in use", "API.COMBINED_EQUIPMENT_NOT_FOUND": "Combined equipment not found", - "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_EXISTED": "Combined equipment offline meter relation existed", + "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_EXISTS": "Combined equipment offline meter relation exists", "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_NOT_FOUND": "Combined equipment offline meter relation not found", "API.COMBINED_EQUIPMENT_PARAMETER_NAME_IS_ALREADY_IN_USE": "Combined equipment parameter name is already in use", "API.COMBINED_EQUIPMENT_PARAMETER_NOT_FOUND_OR_NOT_MATCH": "Combined equipment parameter not found or not match", - "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_EXISTED": "Combined equipment virtual meter relation existed", + "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_EXISTS": "Combined equipment virtual meter relation exists", "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_NOT_FOUND": "Combined equipment virtual meter relation not found", "API.CONTACT_NAME_IS_ALREADY_IN_USE": "Contact name is already in use", "API.CONTACT_NOT_FOUND": "Contact not found", @@ -378,7 +378,7 @@ const resources = { "API.DATABASE_ERROR": "Database error", "API.DISTRIBUTION_CIRCUIT_NAME_IS_ALREADY_IN_USE": "Distribution circuit name is already in use", "API.DISTRIBUTION_CIRCUIT_NOT_FOUND": "Distribution circuit not found", - "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_EXISTED": "Distribution circuit point relation existed", + "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_EXISTS": "Distribution circuit point relation exists", "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_NOT_FOUND": "Distribution circuit point relation not found", "API.DISTRIBUTION_SYSTEM_NAME_IS_ALREADY_IN_USE": "Distribution system name is already in use", "API.DISTRIBUTION_SYSTEM_NOT_FOUND": "Distribution system not found", @@ -407,15 +407,15 @@ const resources = { "API.ENERGY_ITEM_USED_IN_METER": "Energy item used in meter", "API.ENERGY_ITEM_USED_IN_OFFLINE_METER": "Energy item used in offline meter", "API.ENERGY_ITEM_USED_IN_VIRTUAL_METER": "Energy item used in virtual meter", - "API.EQUIPMENT_METER_RELATION_EXISTED": "Equipment meter relation existed", + "API.EQUIPMENT_METER_RELATION_EXISTS": "Equipment meter relation exists", "API.EQUIPMENT_METER_RELATION_NOT_FOUND": "Equipment meter relation not found", "API.EQUIPMENT_NAME_IS_ALREADY_IN_USE": "Equipment name is already in use", "API.EQUIPMENT_NOT_FOUND": "Equipment not found", - "API.EQUIPMENT_OFFLINE_METER_RELATION_EXISTED": "Equipment offline meter relation existed", + "API.EQUIPMENT_OFFLINE_METER_RELATION_EXISTS": "Equipment offline meter relation exists", "API.EQUIPMENT_OFFLINE_METER_RELATION_NOT_FOUND": "Equipment offline meter relation not found", "API.EQUIPMENT_PARAMETER_NAME_IS_ALREADY_IN_USE": "Equipment parameter name is already in use", "API.EQUIPMENT_PARAMETER_NOT_FOUND_OR_NOT_MATCH": "Equipment parameter not found or not match", - "API.EQUIPMENT_VIRTUAL_METER_RELATION_EXISTED": "Equipment virtual meter relation existed", + "API.EQUIPMENT_VIRTUAL_METER_RELATION_EXISTS": "Equipment virtual meter relation exists", "API.EQUIPMENT_VIRTUAL_METER_RELATION_NOT_FOUND": "Equipment virtual meter relation not found", "API.ERROR": "Error", "API.EXCEPTION": "Exception", @@ -453,7 +453,7 @@ const resources = { "API.INVALID_COST_FILE_ID": "Invalid cost file id", "API.INVALID_DATA_SOURCE_ID": "Invalid data source id", "API.INVALID_DATA_SOURCE_NAME": "Invalid data source name", - "API.INVALID_DATA_SOURCE_PROTOCOL.": "Invalid data source protocol.", + "API.INVALID_DATA_SOURCE_PROTOCOL": "Invalid data source protocol", "API.INVALID_DENOMINATOR_METER_UUID": "Invalid denominator meter uuid", "API.INVALID_DISPLAY_NAME": "Invalid display name", "API.INVALID_DISTRIBUTION_CIRCUIT_ID": "Invalid distribution circuit id", @@ -538,7 +538,6 @@ const resources = { "API.INVALID_PRIVILEGE": "Invalid privilege", "API.INVALID_PRIVILEGE_DATA": "Invalid privilege data", "API.INVALID_PRIVILEGE_ID": "Invalid privilege id", - "API.INVALID_PRIVILEGE_ID_": "Invalid privilege id ", "API.INVALID_PRIVILEGE_NAME": "Invalid privilege name", "API.INVALID_RATIO_VALUE": "Invalid ratio value", "API.INVALID_REPLY": "Invalid reply", @@ -551,7 +550,7 @@ const resources = { "API.INVALID_SENSOR_ID": "Invalid sensor id", "API.INVALID_SENSOR_NAME": "Invalid sensor name", "API.INVALID_SERIAL_PORT": "Invalid serial port", - "API.INVALID_SESSION_PLEASE_RE_LOGIN": "Invalid session please re login", + "API.INVALID_SESSION_PLEASE_RE_LOGIN": "Invalid session please re-login", "API.INVALID_SHOPFLOOR_ID": "Invalid shopfloor id", "API.INVALID_SHOPFLOOR_NAME": "Invalid shopfloor name", "API.INVALID_SOURCE_NODE_ID": "Invalid source node id", @@ -589,7 +588,7 @@ const resources = { "API.INVALID_USER_NAME": "Invalid user name", "API.INVALID_USER_NAME_OR_EMAIL": "Invalid user name or email", "API.INVALID_USER_PHONE": "Invalid user phone", - "API.INVALID_USER_PLEASE_RE_LOGIN": "Invalid user please re login", + "API.INVALID_USER_PLEASE_RE_LOGIN": "Invalid user please re-login", "API.INVALID_USER_UUID": "Invalid user uuid", "API.INVALID_VARIABLE_METER_ID": "Invalid variable meter id", "API.INVALID_VARIABLE_METER_TYPE": "Invalid variable meter type", @@ -605,7 +604,7 @@ const resources = { "API.METER_NAME_IS_ALREADY_IN_USE": "Meter name is already in use", "API.METER_NOT_FOUND": "Meter not found", "API.METER_OF_VARIABLE_NOT_FOUND": "Meter of variable not found", - "API.METER_POINT_RELATION_EXISTED": "Meter point relation existed", + "API.METER_POINT_RELATION_EXISTS": "Meter point relation exists", "API.METER_POINT_RELATION_NOT_FOUND": "Meter point relation not found", "API.NOT_FOUND": "Not found", "API.NOTIFICATION_NOT_FOUND": "Notification not found", @@ -622,85 +621,85 @@ const resources = { "API.RULE_NOT_FOUND": "Rule not found", "API.SENSOR_NAME_IS_ALREADY_IN_USE": "Sensor name is already in use", "API.SENSOR_NOT_FOUND": "Sensor not found", - "API.SENSOR_POINT_RELATION_EXISTED": "Sensor point relation existed", + "API.SENSOR_POINT_RELATION_EXISTS": "Sensor point relation exists", "API.SENSOR_POINT_RELATION_NOT_FOUND": "Sensor point relation not found", - "API.SHOPFLOOR_EQUIPMENT_RELATION_EXISTED": "Shopfloor equipment relation existed", + "API.SHOPFLOOR_EQUIPMENT_RELATION_EXISTS": "Shopfloor equipment relation exists", "API.SHOPFLOOR_EQUIPMENT_RELATION_NOT_FOUND": "Shopfloor equipment relation not found", - "API.SHOPFLOOR_METER_RELATION_EXISTED": "Shopfloor meter relation existed", + "API.SHOPFLOOR_METER_RELATION_EXISTS": "Shopfloor meter relation exists", "API.SHOPFLOOR_METER_RELATION_NOT_FOUND": "Shopfloor meter relation not found", "API.SHOPFLOOR_NAME_IS_ALREADY_IN_USE": "Shopfloor name is already in use", "API.SHOPFLOOR_NOT_FOUND": "Shopfloor not found", - "API.SHOPFLOOR_OFFLINE_METER_RELATION_EXISTED": "Shopfloor offline meter relation existed", + "API.SHOPFLOOR_OFFLINE_METER_RELATION_EXISTS": "Shopfloor offline meter relation exists", "API.SHOPFLOOR_OFFLINE_METER_RELATION_NOT_FOUND": "Shopfloor offline meter relation not found", - "API.SHOPFLOOR_POINT_RELATION_EXISTED": "Shopfloor point relation existed", + "API.SHOPFLOOR_POINT_RELATION_EXISTS": "Shopfloor point relation exists", "API.SHOPFLOOR_POINT_RELATION_NOT_FOUND": "Shopfloor point relation not found", - "API.SHOPFLOOR_SENSOR_RELATION_EXISTED": "Shopfloor sensor relation existed", + "API.SHOPFLOOR_SENSOR_RELATION_EXISTS": "Shopfloor sensor relation exists", "API.SHOPFLOOR_SENSOR_RELATION_NOT_FOUND": "Shopfloor sensor relation not found", - "API.SHOPFLOOR_VIRTUAL_METER_RELATION_EXISTED": "Shopfloor virtual meter relation existed", + "API.SHOPFLOOR_VIRTUAL_METER_RELATION_EXISTS": "Shopfloor virtual meter relation exists", "API.SHOPFLOOR_VIRTUAL_METER_RELATION_NOT_FOUND": "Shopfloor virtual meter relation not found", "API.SOURCE_NODE_NOT_FOUND": "Source node not found", - "API.SPACE_COMBINED_EQUIPMENT_RELATION_EXISTED": "Space combined equipment relation existed", + "API.SPACE_COMBINED_EQUIPMENT_RELATION_EXISTS": "Space combined equipment relation exists", "API.SPACE_COMBINED_EQUIPMENT_RELATION_NOT_FOUND": "Space combined equipment relation not found", - "API.SPACE_EQUIPMENT_RELATION_EXISTED": "Space equipment relation existed", + "API.SPACE_EQUIPMENT_RELATION_EXISTS": "Space equipment relation exists", "API.SPACE_EQUIPMENT_RELATION_NOT_FOUND": "Space equipment relation not found", - "API.SPACE_METER_RELATION_EXISTED": "Space meter relation existed", + "API.SPACE_METER_RELATION_EXISTS": "Space meter relation exists", "API.SPACE_METER_RELATION_NOT_FOUND": "Space meter relation not found", "API.SPACE_NAME_IS_ALREADY_IN_USE": "Space name is already in use", "API.SPACE_NOT_FOUND": "Space not found", "API.SPACE_NOT_FOUND_IN_PRIVILEGE": "Space not found in privilege", - "API.SPACE_OFFLINE_METER_RELATION_EXISTED": "Space offline meter relation existed", + "API.SPACE_OFFLINE_METER_RELATION_EXISTS": "Space offline meter relation exists", "API.SPACE_OFFLINE_METER_RELATION_NOT_FOUND": "Space offline meter relation not found", - "API.SPACE_POINT_RELATION_EXISTED": "Space point relation existed", + "API.SPACE_POINT_RELATION_EXISTS": "Space point relation exists", "API.SPACE_POINT_RELATION_NOT_FOUND": "Space point relation not found", - "API.SPACE_SENSOR_RELATION_EXISTED": "Space sensor relation existed", + "API.SPACE_SENSOR_RELATION_EXISTS": "Space sensor relation exists", "API.SPACE_SENSOR_RELATION_NOT_FOUND": "Space sensor relation not found", - "API.SPACE_SHOPFLOOR_RELATION_EXISTED": "Space shopfloor relation existed", + "API.SPACE_SHOPFLOOR_RELATION_EXISTS": "Space shopfloor relation exists", "API.SPACE_SHOPFLOOR_RELATION_NOT_FOUND": "Space shopfloor relation not found", - "API.SPACE_STORE_RELATION_EXISTED": "Space store relation existed", + "API.SPACE_STORE_RELATION_EXISTS": "Space store relation exists", "API.SPACE_STORE_RELATION_NOT_FOUND": "Space store relation not found", - "API.SPACE_TENANT_RELATION_EXISTED": "Space tenant relation existed", + "API.SPACE_TENANT_RELATION_EXISTS": "Space tenant relation exists", "API.SPACE_TENANT_RELATION_NOT_FOUND": "Space tenant relation not found", - "API.SPACE_VIRTUAL_METER_RELATION_EXISTED": "Space virtual meter relation existed", + "API.SPACE_VIRTUAL_METER_RELATION_EXISTS": "Space virtual meter relation exists", "API.SPACE_VIRTUAL_METER_RELATION_NOT_FOUND": "Space virtual meter relation not found", - "API.START_DATETIME_SHOULD_BE_EARLY_THAN_END_DATETIME": "Start datetime should be early than end datetime", - "API.STORE_METER_RELATION_EXISTED": "Store meter relation existed", + "API.START_DATETIME_MUST_BE_EARLIER_THAN_END_DATETIME": "Start datetime must be early than end datetime", + "API.STORE_METER_RELATION_EXISTS": "Store meter relation exists", "API.STORE_METER_RELATION_NOT_FOUND": "Store meter relation not found", "API.STORE_NAME_IS_ALREADY_IN_USE": "Store name is already in use", "API.STORE_NOT_FOUND": "Store not found", - "API.STORE_OFFLINE_METER_RELATION_EXISTED": "Store offline meter relation existed", + "API.STORE_OFFLINE_METER_RELATION_EXISTS": "Store offline meter relation exists", "API.STORE_OFFLINE_METER_RELATION_NOT_FOUND": "Store offline meter relation not found", - "API.STORE_POINT_RELATION_EXISTED": "Store point relation existed", + "API.STORE_POINT_RELATION_EXISTS": "Store point relation exists", "API.STORE_POINT_RELATION_NOT_FOUND": "Store point relation not found", - "API.STORE_SENSOR_RELATION_EXISTED": "Store sensor relation existed", + "API.STORE_SENSOR_RELATION_EXISTS": "Store sensor relation exists", "API.STORE_SENSOR_RELATION_NOT_FOUND": "Store sensor relation not found", "API.STORE_TYPE_NAME_IS_ALREADY_IN_USE": "Store type name is already in use", "API.STORE_TYPE_NOT_FOUND": "Store type not found", "API.STORE_TYPE_SIMPLIFIED_CODE_IS_ALREADY_IN_USE": "Store type simplified code is already in use", "API.STORE_TYPE_USED_IN_STORE": "Store type used in store", - "API.STORE_VIRTUAL_METER_RELATION_EXISTED": "Store virtual meter relation existed", + "API.STORE_VIRTUAL_METER_RELATION_EXISTS": "Store virtual meter relation exists", "API.STORE_VIRTUAL_METER_RELATION_NOT_FOUND": "Store virtual meter relation not found", "API.TARGET_NODE_NOT_FOUND": "Target node not found", - "API.TARIFF_ALREADY_ASSOCIATED_WITH_COST_CENTER": "Tariff already associated with cost center", + "API.TARIFF_IS_ALREADY_ASSOCIATED_WITH_COST_CENTER": "Tariff is already associated with cost center", "API.TARIFF_IN_USE": "Tariff in use", "API.TARIFF_IS_NOT_ASSOCIATED_WITH_COST_CENTER": "Tariff is not associated with cost center", "API.TARIFF_NAME_IS_ALREADY_IN_USE": "Tariff name is already in use", "API.TARIFF_NOT_EMPTY": "Tariff not empty", "API.TARIFF_NOT_FOUND": "Tariff not found", - "API.TENANT_METER_RELATION_EXISTED": "Tenant meter relation existed", + "API.TENANT_METER_RELATION_EXISTS": "Tenant meter relation exists", "API.TENANT_METER_RELATION_NOT_FOUND": "Tenant meter relation not found", "API.TENANT_NAME_IS_ALREADY_IN_USE": "Tenant name is already in use", "API.TENANT_NOT_FOUND": "Tenant not found", - "API.TENANT_OFFLINE_METER_RELATION_EXISTED": "Tenant offline meter relation existed", + "API.TENANT_OFFLINE_METER_RELATION_EXISTS": "Tenant offline meter relation exists", "API.TENANT_OFFLINE_METER_RELATION_NOT_FOUND": "Tenant offline meter relation not found", - "API.TENANT_POINT_RELATION_EXISTED": "Tenant point relation existed", + "API.TENANT_POINT_RELATION_EXISTS": "Tenant point relation exists", "API.TENANT_POINT_RELATION_NOT_FOUND": "Tenant point relation not found", - "API.TENANT_SENSOR_RELATION_EXISTED": "Tenant sensor relation existed", + "API.TENANT_SENSOR_RELATION_EXISTS": "Tenant sensor relation exists", "API.TENANT_SENSOR_RELATION_NOT_FOUND": "Tenant sensor relation not found", "API.TENANT_TYPE_NAME_IS_ALREADY_IN_USE": "Tenant type name is already in use", "API.TENANT_TYPE_NOT_FOUND": "Tenant type not found", "API.TENANT_TYPE_SIMPLIFIED_CODE_IS_ALREADY_IN_USE": "Tenant type simplified code is already in use", "API.TENANT_TYPE_USED_IN_TENANT": "Tenant type used in tenant", - "API.TENANT_VIRTUAL_METER_RELATION_EXISTED": "Tenant virtual meter relation existed", + "API.TENANT_VIRTUAL_METER_RELATION_EXISTS": "Tenant virtual meter relation exists", "API.TENANT_VIRTUAL_METER_RELATION_NOT_FOUND": "Tenant virtual meter relation not found", "API.TEXT_MESSAGE_NOT_FOUND": "Text message not found", "API.THE_REPORTING_PERIOD_MUST_BE_LONGER_THAN_15_MINUTES": "The reporting period must be longer than 15 minutes", @@ -719,24 +718,21 @@ const resources = { "API.THERE_IS_RELATION_WITH_OFFLINE_METERS": "There is relation with offline meters", "API.THERE_IS_RELATION_WITH_OTHER_VIRTUAL_METERS": "There is relation with other virtual meters", "API.THERE_IS_RELATION_WITH_POINTS": "There is relation with points", - "API.THERE_IS_RELATION_WITH_SENSOR": "There is relation with sensor", "API.THERE_IS_RELATION_WITH_SENSORS": "There is relation with sensors", "API.THERE_IS_RELATION_WITH_SHOPFLOORS": "There is relation with shopfloors", - "API.THERE_IS_RELATION_WITH_SPACE": "There is relation with space", "API.THERE_IS_RELATION_WITH_SPACES": "There is relation with spaces", "API.THERE_IS_RELATION_WITH_STORES": "There is relation with stores", "API.THERE_IS_RELATION_WITH_TARIFFS": "There is relation with tariffs", "API.THERE_IS_RELATION_WITH_TENANTS": "There is relation with tenants", "API.THERE_IS_RELATION_WITH_VIRTUAL_METER": "There is relation with virtual meter", "API.THERE_IS_RELATION_WITH_VIRTUAL_METERS": "There is relation with virtual meters", - "API.THERE_IS_RELATIONSHIP_WITH_EQUIPMENTS": "There is relationship with equipments", - "API.THERE_IS_RELATIONSHIP_WITH_SPACES": "There is relationship with spaces", - "API.THERE_IS_RELATIONSHIP_WITH_USERS": "There is relationship with users", + "API.THERE_IS_RELATION_WITH_EQUIPMENTS": "There is relation with equipments", + "API.THERE_IS_RELATION_WITH_USERS": "There is relation with users", "API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER": "This data source is being used by a meter", "API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER": "This meter is being used by a virtual meter", "API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER": "This offline meter is being used by a virtual meter", - "API.THIS_SHOPFLOOR_CAN_NOT_BE_DELETED": "This shopfloor can not be deleted", - "API.THIS_SPACE_CAN_NOT_BE_DELETED": "This space can not be deleted", + "API.THIS_SHOPFLOOR_CANNOT_BE_DELETED": "This shopfloor cannot be deleted", + "API.THIS_SPACE_CANNOT_BE_DELETED": "This space cannot be deleted", "API.TIMEZONE_NOT_FOUND": "Timezone not found", "API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN": "Token not found in headers please login", "API.USER_NAME_IS_ALREADY_IN_USE": "User name is already in use", @@ -837,7 +833,7 @@ const resources = { "Settings": "Einstellungen", "Set your own customized style": "Stellen Sie Ihren eigenen Stil ein", "Color Scheme": "Farbschema", - "Choose the perfect color mode for your app.": "Wählen Sie den perfekten Farbmodus für Ihre App.", + "Choose the perfect color mode for your app": "Wählen Sie den perfekten Farbmodus für Ihre App", "Light": "Helle", "Dark": "Dunkle", "RTL Mode": "RTL-Modus", @@ -856,7 +852,7 @@ const resources = { "language-en": "English", "language-de": "Deutsch", "Like What You See?": "Wie was du siehst?", - "Get MyEMS now.": "Holen Sie sich jetzt MyEMS.", + "Get MyEMS now": "Holen Sie sich jetzt MyEMS", "Purchase": "Kauf", // Query Panels "Base Period Begins": "Basisperiode beginnt", @@ -1014,14 +1010,14 @@ const resources = { "Logged in as ": "Angemeldet als ", "Forget Password?": "Passwort vergessen?", "Forgot your password?": "Passwort vergessen?", - "Enter your email and we'll send you a reset link.": "Geben Sie Ihre E-Mail-Adresse ein und wir senden Ihnen einen Link zum Zurücksetzen.", + "Enter your email and we'll send you a reset link": "Geben Sie Ihre E-Mail-Adresse ein und wir senden Ihnen einen Link zum Zurücksetzen", "Send reset link": "Reset-Link senden", "Thanks for using MyEMS!": "Vielen Dank, dass Sie MyEMS verwenden!", - "You are now successfully signed out.": "Sie sind jetzt erfolgreich abgemeldet.", + "You are now successfully signed out": "Sie sind jetzt erfolgreich abgemeldet", "Return to Login": "Zurück zum Login", "Please check your email!": "Bitte überprüfen Sie Ihre E-Mails!", "An email has been sent to ": "Eine email wurde gesendet an ", - "Please click on the included link to reset your password.": "Bitte klicken Sie auf den enthaltenen Link, um Ihr Passwort zurückzusetzen.", + "Please click on the included link to reset your password": "Bitte klicken Sie auf den enthaltenen Link, um Ihr Passwort zurückzusetzen", "An email with password reset link is sent to ": "Eine E-Mail mit einem Link zum Zurücksetzen des Passworts wird an gesendet ", "Change Password": "Ändere das Passwort", "Old Password": "Altes Passwort", @@ -1067,8 +1063,8 @@ const resources = { "Uploader": "Uploader", "Upload Datetime": "Datetime hochladen", //Error - "The page you're looking for is not found.": "Die gesuchte Seite wurde nicht gefunden.", - "Make sure the address is correct and that the page hasn't moved. ": "Stellen Sie sicher, dass die Adresse korrekt ist und die Seite nicht verschoben wurde.", + "The page you're looking for is not found": "Die gesuchte Seite wurde nicht gefunden", + "Make sure the address is correct and that the page hasn't moved. ": "Stellen Sie sicher, dass die Adresse korrekt ist und die Seite nicht verschoben wurde", "If you think this is a mistake,": "Wenn Sie denken, dass dies ein Fehler ist,", "contact us": "kontaktiere uns", "Take me home": "Bring mich zurück zur Homepage", @@ -1108,17 +1104,17 @@ const resources = { "API.ADVANCED_REPORT_NOT_FOUND": "", "API.BAD_REQUEST": "", "API.CANNOT_SET_EXISTING_SUBMETER_AS_MASTER_METER": "", - "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.COMBINED_EQUIPMENT_METER_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_METER_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_METER_RELATION_NOT_FOUND": "", "API.COMBINED_EQUIPMENT_NAME_IS_ALREADY_IN_USE": "", "API.COMBINED_EQUIPMENT_NOT_FOUND": "", - "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_NOT_FOUND": "", "API.COMBINED_EQUIPMENT_PARAMETER_NAME_IS_ALREADY_IN_USE": "", "API.COMBINED_EQUIPMENT_PARAMETER_NOT_FOUND_OR_NOT_MATCH": "", - "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.CONTACT_NAME_IS_ALREADY_IN_USE": "", "API.CONTACT_NOT_FOUND": "", @@ -1131,7 +1127,7 @@ const resources = { "API.DATABASE_ERROR": "", "API.DISTRIBUTION_CIRCUIT_NAME_IS_ALREADY_IN_USE": "", "API.DISTRIBUTION_CIRCUIT_NOT_FOUND": "", - "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_EXISTED": "", + "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_EXISTS": "", "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_NOT_FOUND": "", "API.DISTRIBUTION_SYSTEM_NAME_IS_ALREADY_IN_USE": "", "API.DISTRIBUTION_SYSTEM_NOT_FOUND": "", @@ -1160,15 +1156,15 @@ const resources = { "API.ENERGY_ITEM_USED_IN_METER": "", "API.ENERGY_ITEM_USED_IN_OFFLINE_METER": "", "API.ENERGY_ITEM_USED_IN_VIRTUAL_METER": "", - "API.EQUIPMENT_METER_RELATION_EXISTED": "", + "API.EQUIPMENT_METER_RELATION_EXISTS": "", "API.EQUIPMENT_METER_RELATION_NOT_FOUND": "", "API.EQUIPMENT_NAME_IS_ALREADY_IN_USE": "", "API.EQUIPMENT_NOT_FOUND": "", - "API.EQUIPMENT_OFFLINE_METER_RELATION_EXISTED": "", + "API.EQUIPMENT_OFFLINE_METER_RELATION_EXISTS": "", "API.EQUIPMENT_OFFLINE_METER_RELATION_NOT_FOUND": "", "API.EQUIPMENT_PARAMETER_NAME_IS_ALREADY_IN_USE": "", "API.EQUIPMENT_PARAMETER_NOT_FOUND_OR_NOT_MATCH": "", - "API.EQUIPMENT_VIRTUAL_METER_RELATION_EXISTED": "", + "API.EQUIPMENT_VIRTUAL_METER_RELATION_EXISTS": "", "API.EQUIPMENT_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.ERROR": "", "API.EXCEPTION": "", @@ -1291,7 +1287,6 @@ const resources = { "API.INVALID_PRIVILEGE": "", "API.INVALID_PRIVILEGE_DATA": "", "API.INVALID_PRIVILEGE_ID": "", - "API.INVALID_PRIVILEGE_ID_": "", "API.INVALID_PRIVILEGE_NAME": "", "API.INVALID_RATIO_VALUE": "", "API.INVALID_REPLY": "", @@ -1358,7 +1353,7 @@ const resources = { "API.METER_NAME_IS_ALREADY_IN_USE": "", "API.METER_NOT_FOUND": "", "API.METER_OF_VARIABLE_NOT_FOUND": "", - "API.METER_POINT_RELATION_EXISTED": "", + "API.METER_POINT_RELATION_EXISTS": "", "API.METER_POINT_RELATION_NOT_FOUND": "", "API.NOT_FOUND": "", "API.NOTIFICATION_NOT_FOUND": "", @@ -1375,85 +1370,85 @@ const resources = { "API.RULE_NOT_FOUND": "", "API.SENSOR_NAME_IS_ALREADY_IN_USE": "", "API.SENSOR_NOT_FOUND": "", - "API.SENSOR_POINT_RELATION_EXISTED": "", + "API.SENSOR_POINT_RELATION_EXISTS": "", "API.SENSOR_POINT_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_EQUIPMENT_RELATION_EXISTED": "", + "API.SHOPFLOOR_EQUIPMENT_RELATION_EXISTS": "", "API.SHOPFLOOR_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_METER_RELATION_EXISTED": "", + "API.SHOPFLOOR_METER_RELATION_EXISTS": "", "API.SHOPFLOOR_METER_RELATION_NOT_FOUND": "", "API.SHOPFLOOR_NAME_IS_ALREADY_IN_USE": "", "API.SHOPFLOOR_NOT_FOUND": "", - "API.SHOPFLOOR_OFFLINE_METER_RELATION_EXISTED": "", + "API.SHOPFLOOR_OFFLINE_METER_RELATION_EXISTS": "", "API.SHOPFLOOR_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_POINT_RELATION_EXISTED": "", + "API.SHOPFLOOR_POINT_RELATION_EXISTS": "", "API.SHOPFLOOR_POINT_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_SENSOR_RELATION_EXISTED": "", + "API.SHOPFLOOR_SENSOR_RELATION_EXISTS": "", "API.SHOPFLOOR_SENSOR_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_VIRTUAL_METER_RELATION_EXISTED": "", + "API.SHOPFLOOR_VIRTUAL_METER_RELATION_EXISTS": "", "API.SHOPFLOOR_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.SOURCE_NODE_NOT_FOUND": "", - "API.SPACE_COMBINED_EQUIPMENT_RELATION_EXISTED": "", + "API.SPACE_COMBINED_EQUIPMENT_RELATION_EXISTS": "", "API.SPACE_COMBINED_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.SPACE_EQUIPMENT_RELATION_EXISTED": "", + "API.SPACE_EQUIPMENT_RELATION_EXISTS": "", "API.SPACE_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.SPACE_METER_RELATION_EXISTED": "", + "API.SPACE_METER_RELATION_EXISTS": "", "API.SPACE_METER_RELATION_NOT_FOUND": "", "API.SPACE_NAME_IS_ALREADY_IN_USE": "", "API.SPACE_NOT_FOUND": "", "API.SPACE_NOT_FOUND_IN_PRIVILEGE": "", - "API.SPACE_OFFLINE_METER_RELATION_EXISTED": "", + "API.SPACE_OFFLINE_METER_RELATION_EXISTS": "", "API.SPACE_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.SPACE_POINT_RELATION_EXISTED": "", + "API.SPACE_POINT_RELATION_EXISTS": "", "API.SPACE_POINT_RELATION_NOT_FOUND": "", - "API.SPACE_SENSOR_RELATION_EXISTED": "", + "API.SPACE_SENSOR_RELATION_EXISTS": "", "API.SPACE_SENSOR_RELATION_NOT_FOUND": "", - "API.SPACE_SHOPFLOOR_RELATION_EXISTED": "", + "API.SPACE_SHOPFLOOR_RELATION_EXISTS": "", "API.SPACE_SHOPFLOOR_RELATION_NOT_FOUND": "", - "API.SPACE_STORE_RELATION_EXISTED": "", + "API.SPACE_STORE_RELATION_EXISTS": "", "API.SPACE_STORE_RELATION_NOT_FOUND": "", - "API.SPACE_TENANT_RELATION_EXISTED": "", + "API.SPACE_TENANT_RELATION_EXISTS": "", "API.SPACE_TENANT_RELATION_NOT_FOUND": "", - "API.SPACE_VIRTUAL_METER_RELATION_EXISTED": "", + "API.SPACE_VIRTUAL_METER_RELATION_EXISTS": "", "API.SPACE_VIRTUAL_METER_RELATION_NOT_FOUND": "", - "API.START_DATETIME_SHOULD_BE_EARLY_THAN_END_DATETIME": "", - "API.STORE_METER_RELATION_EXISTED": "", + "API.START_DATETIME_MUST_BE_EARLIER_THAN_END_DATETIME": "", + "API.STORE_METER_RELATION_EXISTS": "", "API.STORE_METER_RELATION_NOT_FOUND": "", "API.STORE_NAME_IS_ALREADY_IN_USE": "", "API.STORE_NOT_FOUND": "", - "API.STORE_OFFLINE_METER_RELATION_EXISTED": "", + "API.STORE_OFFLINE_METER_RELATION_EXISTS": "", "API.STORE_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.STORE_POINT_RELATION_EXISTED": "", + "API.STORE_POINT_RELATION_EXISTS": "", "API.STORE_POINT_RELATION_NOT_FOUND": "", - "API.STORE_SENSOR_RELATION_EXISTED": "", + "API.STORE_SENSOR_RELATION_EXISTS": "", "API.STORE_SENSOR_RELATION_NOT_FOUND": "", "API.STORE_TYPE_NAME_IS_ALREADY_IN_USE": "", "API.STORE_TYPE_NOT_FOUND": "", "API.STORE_TYPE_SIMPLIFIED_CODE_IS_ALREADY_IN_USE": "", "API.STORE_TYPE_USED_IN_STORE": "", - "API.STORE_VIRTUAL_METER_RELATION_EXISTED": "", + "API.STORE_VIRTUAL_METER_RELATION_EXISTS": "", "API.STORE_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.TARGET_NODE_NOT_FOUND": "", - "API.TARIFF_ALREADY_ASSOCIATED_WITH_COST_CENTER": "", + "API.TARIFF_IS_ALREADY_ASSOCIATED_WITH_COST_CENTER": "", "API.TARIFF_IN_USE": "", "API.TARIFF_IS_NOT_ASSOCIATED_WITH_COST_CENTER": "", "API.TARIFF_NAME_IS_ALREADY_IN_USE": "", "API.TARIFF_NOT_EMPTY": "", "API.TARIFF_NOT_FOUND": "", - "API.TENANT_METER_RELATION_EXISTED": "", + "API.TENANT_METER_RELATION_EXISTS": "", "API.TENANT_METER_RELATION_NOT_FOUND": "", "API.TENANT_NAME_IS_ALREADY_IN_USE": "", "API.TENANT_NOT_FOUND": "", - "API.TENANT_OFFLINE_METER_RELATION_EXISTED": "", + "API.TENANT_OFFLINE_METER_RELATION_EXISTS": "", "API.TENANT_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.TENANT_POINT_RELATION_EXISTED": "", + "API.TENANT_POINT_RELATION_EXISTS": "", "API.TENANT_POINT_RELATION_NOT_FOUND": "", - "API.TENANT_SENSOR_RELATION_EXISTED": "", + "API.TENANT_SENSOR_RELATION_EXISTS": "", "API.TENANT_SENSOR_RELATION_NOT_FOUND": "", "API.TENANT_TYPE_NAME_IS_ALREADY_IN_USE": "", "API.TENANT_TYPE_NOT_FOUND": "", "API.TENANT_TYPE_SIMPLIFIED_CODE_IS_ALREADY_IN_USE": "", "API.TENANT_TYPE_USED_IN_TENANT": "", - "API.TENANT_VIRTUAL_METER_RELATION_EXISTED": "", + "API.TENANT_VIRTUAL_METER_RELATION_EXISTS": "", "API.TENANT_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.TEXT_MESSAGE_NOT_FOUND": "", "API.THE_REPORTING_PERIOD_MUST_BE_LONGER_THAN_15_MINUTES": "", @@ -1472,24 +1467,21 @@ const resources = { "API.THERE_IS_RELATION_WITH_OFFLINE_METERS": "", "API.THERE_IS_RELATION_WITH_OTHER_VIRTUAL_METERS": "", "API.THERE_IS_RELATION_WITH_POINTS": "", - "API.THERE_IS_RELATION_WITH_SENSOR": "", "API.THERE_IS_RELATION_WITH_SENSORS": "", "API.THERE_IS_RELATION_WITH_SHOPFLOORS": "", - "API.THERE_IS_RELATION_WITH_SPACE": "", "API.THERE_IS_RELATION_WITH_SPACES": "", "API.THERE_IS_RELATION_WITH_STORES": "", "API.THERE_IS_RELATION_WITH_TARIFFS": "", "API.THERE_IS_RELATION_WITH_TENANTS": "", "API.THERE_IS_RELATION_WITH_VIRTUAL_METER": "", "API.THERE_IS_RELATION_WITH_VIRTUAL_METERS": "", - "API.THERE_IS_RELATIONSHIP_WITH_EQUIPMENTS": "", - "API.THERE_IS_RELATIONSHIP_WITH_SPACES": "", - "API.THERE_IS_RELATIONSHIP_WITH_USERS": "", + "API.THERE_IS_RELATION_WITH_EQUIPMENTS": "", + "API.THERE_IS_RELATION_WITH_USERS": "", "API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER": "", "API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER": "", "API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER": "", - "API.THIS_SHOPFLOOR_CAN_NOT_BE_DELETED": "", - "API.THIS_SPACE_CAN_NOT_BE_DELETED": "", + "API.THIS_SHOPFLOOR_CANNOT_BE_DELETED": "", + "API.THIS_SPACE_CANNOT_BE_DELETED": "", "API.TIMEZONE_NOT_FOUND": "", "API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN": "", "API.USER_NAME_IS_ALREADY_IN_USE": "", @@ -1590,7 +1582,7 @@ const resources = { "Settings": "设置", "Set your own customized style": "设置您的自定义样式", "Color Scheme": "配色方案", - "Choose the perfect color mode for your app.": "为您的应用选择理想的色彩模式。", + "Choose the perfect color mode for your app": "为您的应用选择理想的色彩模式", "Light": "亮色", "Dark": "暗色", "RTL Mode": "RTL模式", @@ -1609,7 +1601,7 @@ const resources = { "language-en": "English", "language-de": "Deutsch", "Like What You See?": "喜欢这个系统?", - "Get MyEMS now.": "立即获取MyEMS。", + "Get MyEMS now": "立即获取MyEMS", "Purchase": "购买", // Query Panels "Base Period Begins": "基准期开始", @@ -1767,14 +1759,14 @@ const resources = { "Logged in as ": "已登录 ", "Forget Password?": "忘记密码?", "Forgot your password?": "忘记你的密码?", - "Enter your email and we'll send you a reset link.": "输入电子邮件地址，我们会把重置链接发送给您。", + "Enter your email and we'll send you a reset link": "输入电子邮件地址，我们会把重置链接发送给您", "Send reset link": "发送重置连接", "Thanks for using MyEMS!": "感谢您使用MyEMS!", - "You are now successfully signed out.": "您已成功退出。", + "You are now successfully signed out": "您已成功退出", "Return to Login": "返回登录", "Please check your email!": "请查收您的电子邮件!", "An email has been sent to ": "一封电子邮件已经发送至 ", - "Please click on the included link to reset your password.": "请点击里面的链接重置您的密码。", + "Please click on the included link to reset your password": "请点击里面的链接重置您的密码", "An email with password reset link is sent to ": "一封包含密码重置链接的电子邮件已经发送至 ", "Change Password": "修改密码", "Old Password": "原密码", @@ -1820,13 +1812,13 @@ const resources = { "Uploader": "上传者", "Upload Datetime": "上传时间", //Error - "The page you're looking for is not found.": "您要找的页面不存在。", - "Make sure the address is correct and that the page hasn't moved. ": "请确认地址正确且页面没有被移动。", + "The page you're looking for is not found": "您要找的页面不存在", + "Make sure the address is correct and that the page hasn't moved": "请确认地址正确且页面没有被移动", "If you think this is a mistake,": "如果您认为这是一个错误,", "contact us": "联系我们", "Take me home": "带我回首页", "Whoops, something went wrong!": "哦, 出错了！!", - "Try refreshing the page, or going back and attempting the action again. ": "请尝试刷新页面, 或回退并再次尝试执行这个操作。 ", + "Try refreshing the page, or going back and attempting the action again": "请尝试刷新页面, 或回退并再次尝试执行这个操作", "If this problem persists,": "如果问题依然存在,", //Tenant Bill "Lease Contract Number": "租赁合同号码", @@ -1861,17 +1853,17 @@ const resources = { "API.ADVANCED_REPORT_NOT_FOUND": "", "API.BAD_REQUEST": "", "API.CANNOT_SET_EXISTING_SUBMETER_AS_MASTER_METER": "", - "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.COMBINED_EQUIPMENT_METER_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_METER_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_METER_RELATION_NOT_FOUND": "", "API.COMBINED_EQUIPMENT_NAME_IS_ALREADY_IN_USE": "", "API.COMBINED_EQUIPMENT_NOT_FOUND": "", - "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_OFFLINE_METER_RELATION_NOT_FOUND": "", "API.COMBINED_EQUIPMENT_PARAMETER_NAME_IS_ALREADY_IN_USE": "", "API.COMBINED_EQUIPMENT_PARAMETER_NOT_FOUND_OR_NOT_MATCH": "", - "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_EXISTED": "", + "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_EXISTS": "", "API.COMBINED_EQUIPMENT_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.CONTACT_NAME_IS_ALREADY_IN_USE": "", "API.CONTACT_NOT_FOUND": "", @@ -1884,7 +1876,7 @@ const resources = { "API.DATABASE_ERROR": "", "API.DISTRIBUTION_CIRCUIT_NAME_IS_ALREADY_IN_USE": "", "API.DISTRIBUTION_CIRCUIT_NOT_FOUND": "", - "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_EXISTED": "", + "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_EXISTS": "", "API.DISTRIBUTION_CIRCUIT_POINT_RELATION_NOT_FOUND": "", "API.DISTRIBUTION_SYSTEM_NAME_IS_ALREADY_IN_USE": "", "API.DISTRIBUTION_SYSTEM_NOT_FOUND": "", @@ -1913,15 +1905,15 @@ const resources = { "API.ENERGY_ITEM_USED_IN_METER": "", "API.ENERGY_ITEM_USED_IN_OFFLINE_METER": "", "API.ENERGY_ITEM_USED_IN_VIRTUAL_METER": "", - "API.EQUIPMENT_METER_RELATION_EXISTED": "", + "API.EQUIPMENT_METER_RELATION_EXISTS": "", "API.EQUIPMENT_METER_RELATION_NOT_FOUND": "", "API.EQUIPMENT_NAME_IS_ALREADY_IN_USE": "", "API.EQUIPMENT_NOT_FOUND": "", - "API.EQUIPMENT_OFFLINE_METER_RELATION_EXISTED": "", + "API.EQUIPMENT_OFFLINE_METER_RELATION_EXISTS": "", "API.EQUIPMENT_OFFLINE_METER_RELATION_NOT_FOUND": "", "API.EQUIPMENT_PARAMETER_NAME_IS_ALREADY_IN_USE": "", "API.EQUIPMENT_PARAMETER_NOT_FOUND_OR_NOT_MATCH": "", - "API.EQUIPMENT_VIRTUAL_METER_RELATION_EXISTED": "", + "API.EQUIPMENT_VIRTUAL_METER_RELATION_EXISTS": "", "API.EQUIPMENT_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.ERROR": "", "API.EXCEPTION": "", @@ -2044,7 +2036,6 @@ const resources = { "API.INVALID_PRIVILEGE": "", "API.INVALID_PRIVILEGE_DATA": "", "API.INVALID_PRIVILEGE_ID": "", - "API.INVALID_PRIVILEGE_ID_": "", "API.INVALID_PRIVILEGE_NAME": "", "API.INVALID_RATIO_VALUE": "", "API.INVALID_REPLY": "", @@ -2111,7 +2102,7 @@ const resources = { "API.METER_NAME_IS_ALREADY_IN_USE": "", "API.METER_NOT_FOUND": "", "API.METER_OF_VARIABLE_NOT_FOUND": "", - "API.METER_POINT_RELATION_EXISTED": "", + "API.METER_POINT_RELATION_EXISTS": "", "API.METER_POINT_RELATION_NOT_FOUND": "", "API.NOT_FOUND": "", "API.NOTIFICATION_NOT_FOUND": "", @@ -2128,85 +2119,85 @@ const resources = { "API.RULE_NOT_FOUND": "", "API.SENSOR_NAME_IS_ALREADY_IN_USE": "", "API.SENSOR_NOT_FOUND": "", - "API.SENSOR_POINT_RELATION_EXISTED": "", + "API.SENSOR_POINT_RELATION_EXISTS": "", "API.SENSOR_POINT_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_EQUIPMENT_RELATION_EXISTED": "", + "API.SHOPFLOOR_EQUIPMENT_RELATION_EXISTS": "", "API.SHOPFLOOR_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_METER_RELATION_EXISTED": "", + "API.SHOPFLOOR_METER_RELATION_EXISTS": "", "API.SHOPFLOOR_METER_RELATION_NOT_FOUND": "", "API.SHOPFLOOR_NAME_IS_ALREADY_IN_USE": "", "API.SHOPFLOOR_NOT_FOUND": "", - "API.SHOPFLOOR_OFFLINE_METER_RELATION_EXISTED": "", + "API.SHOPFLOOR_OFFLINE_METER_RELATION_EXISTS": "", "API.SHOPFLOOR_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_POINT_RELATION_EXISTED": "", + "API.SHOPFLOOR_POINT_RELATION_EXISTS": "", "API.SHOPFLOOR_POINT_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_SENSOR_RELATION_EXISTED": "", + "API.SHOPFLOOR_SENSOR_RELATION_EXISTS": "", "API.SHOPFLOOR_SENSOR_RELATION_NOT_FOUND": "", - "API.SHOPFLOOR_VIRTUAL_METER_RELATION_EXISTED": "", + "API.SHOPFLOOR_VIRTUAL_METER_RELATION_EXISTS": "", "API.SHOPFLOOR_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.SOURCE_NODE_NOT_FOUND": "", - "API.SPACE_COMBINED_EQUIPMENT_RELATION_EXISTED": "", + "API.SPACE_COMBINED_EQUIPMENT_RELATION_EXISTS": "", "API.SPACE_COMBINED_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.SPACE_EQUIPMENT_RELATION_EXISTED": "", + "API.SPACE_EQUIPMENT_RELATION_EXISTS": "", "API.SPACE_EQUIPMENT_RELATION_NOT_FOUND": "", - "API.SPACE_METER_RELATION_EXISTED": "", + "API.SPACE_METER_RELATION_EXISTS": "", "API.SPACE_METER_RELATION_NOT_FOUND": "", "API.SPACE_NAME_IS_ALREADY_IN_USE": "", "API.SPACE_NOT_FOUND": "", "API.SPACE_NOT_FOUND_IN_PRIVILEGE": "", - "API.SPACE_OFFLINE_METER_RELATION_EXISTED": "", + "API.SPACE_OFFLINE_METER_RELATION_EXISTS": "", "API.SPACE_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.SPACE_POINT_RELATION_EXISTED": "", + "API.SPACE_POINT_RELATION_EXISTS": "", "API.SPACE_POINT_RELATION_NOT_FOUND": "", - "API.SPACE_SENSOR_RELATION_EXISTED": "", + "API.SPACE_SENSOR_RELATION_EXISTS": "", "API.SPACE_SENSOR_RELATION_NOT_FOUND": "", - "API.SPACE_SHOPFLOOR_RELATION_EXISTED": "", + "API.SPACE_SHOPFLOOR_RELATION_EXISTS": "", "API.SPACE_SHOPFLOOR_RELATION_NOT_FOUND": "", - "API.SPACE_STORE_RELATION_EXISTED": "", + "API.SPACE_STORE_RELATION_EXISTS": "", "API.SPACE_STORE_RELATION_NOT_FOUND": "", - "API.SPACE_TENANT_RELATION_EXISTED": "", + "API.SPACE_TENANT_RELATION_EXISTS": "", "API.SPACE_TENANT_RELATION_NOT_FOUND": "", - "API.SPACE_VIRTUAL_METER_RELATION_EXISTED": "", + "API.SPACE_VIRTUAL_METER_RELATION_EXISTS": "", "API.SPACE_VIRTUAL_METER_RELATION_NOT_FOUND": "", - "API.START_DATETIME_SHOULD_BE_EARLY_THAN_END_DATETIME": "", - "API.STORE_METER_RELATION_EXISTED": "", + "API.START_DATETIME_MUST_BE_EARLIER_THAN_END_DATETIME": "", + "API.STORE_METER_RELATION_EXISTS": "", "API.STORE_METER_RELATION_NOT_FOUND": "", "API.STORE_NAME_IS_ALREADY_IN_USE": "", "API.STORE_NOT_FOUND": "", - "API.STORE_OFFLINE_METER_RELATION_EXISTED": "", + "API.STORE_OFFLINE_METER_RELATION_EXISTS": "", "API.STORE_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.STORE_POINT_RELATION_EXISTED": "", + "API.STORE_POINT_RELATION_EXISTS": "", "API.STORE_POINT_RELATION_NOT_FOUND": "", - "API.STORE_SENSOR_RELATION_EXISTED": "", + "API.STORE_SENSOR_RELATION_EXISTS": "", "API.STORE_SENSOR_RELATION_NOT_FOUND": "", "API.STORE_TYPE_NAME_IS_ALREADY_IN_USE": "", "API.STORE_TYPE_NOT_FOUND": "", "API.STORE_TYPE_SIMPLIFIED_CODE_IS_ALREADY_IN_USE": "", "API.STORE_TYPE_USED_IN_STORE": "", - "API.STORE_VIRTUAL_METER_RELATION_EXISTED": "", + "API.STORE_VIRTUAL_METER_RELATION_EXISTS": "", "API.STORE_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.TARGET_NODE_NOT_FOUND": "", - "API.TARIFF_ALREADY_ASSOCIATED_WITH_COST_CENTER": "", + "API.TARIFF_IS_ALREADY_ASSOCIATED_WITH_COST_CENTER": "", "API.TARIFF_IN_USE": "", "API.TARIFF_IS_NOT_ASSOCIATED_WITH_COST_CENTER": "", "API.TARIFF_NAME_IS_ALREADY_IN_USE": "", "API.TARIFF_NOT_EMPTY": "", "API.TARIFF_NOT_FOUND": "", - "API.TENANT_METER_RELATION_EXISTED": "", + "API.TENANT_METER_RELATION_EXISTS": "", "API.TENANT_METER_RELATION_NOT_FOUND": "", "API.TENANT_NAME_IS_ALREADY_IN_USE": "", "API.TENANT_NOT_FOUND": "", - "API.TENANT_OFFLINE_METER_RELATION_EXISTED": "", + "API.TENANT_OFFLINE_METER_RELATION_EXISTS": "", "API.TENANT_OFFLINE_METER_RELATION_NOT_FOUND": "", - "API.TENANT_POINT_RELATION_EXISTED": "", + "API.TENANT_POINT_RELATION_EXISTS": "", "API.TENANT_POINT_RELATION_NOT_FOUND": "", - "API.TENANT_SENSOR_RELATION_EXISTED": "", + "API.TENANT_SENSOR_RELATION_EXISTS": "", "API.TENANT_SENSOR_RELATION_NOT_FOUND": "", "API.TENANT_TYPE_NAME_IS_ALREADY_IN_USE": "", "API.TENANT_TYPE_NOT_FOUND": "", "API.TENANT_TYPE_SIMPLIFIED_CODE_IS_ALREADY_IN_USE": "", "API.TENANT_TYPE_USED_IN_TENANT": "", - "API.TENANT_VIRTUAL_METER_RELATION_EXISTED": "", + "API.TENANT_VIRTUAL_METER_RELATION_EXISTS": "", "API.TENANT_VIRTUAL_METER_RELATION_NOT_FOUND": "", "API.TEXT_MESSAGE_NOT_FOUND": "", "API.THE_REPORTING_PERIOD_MUST_BE_LONGER_THAN_15_MINUTES": "", @@ -2225,24 +2216,21 @@ const resources = { "API.THERE_IS_RELATION_WITH_OFFLINE_METERS": "", "API.THERE_IS_RELATION_WITH_OTHER_VIRTUAL_METERS": "", "API.THERE_IS_RELATION_WITH_POINTS": "", - "API.THERE_IS_RELATION_WITH_SENSOR": "", "API.THERE_IS_RELATION_WITH_SENSORS": "", "API.THERE_IS_RELATION_WITH_SHOPFLOORS": "", - "API.THERE_IS_RELATION_WITH_SPACE": "", "API.THERE_IS_RELATION_WITH_SPACES": "", "API.THERE_IS_RELATION_WITH_STORES": "", "API.THERE_IS_RELATION_WITH_TARIFFS": "", "API.THERE_IS_RELATION_WITH_TENANTS": "", "API.THERE_IS_RELATION_WITH_VIRTUAL_METER": "", "API.THERE_IS_RELATION_WITH_VIRTUAL_METERS": "", - "API.THERE_IS_RELATIONSHIP_WITH_EQUIPMENTS": "", - "API.THERE_IS_RELATIONSHIP_WITH_SPACES": "", - "API.THERE_IS_RELATIONSHIP_WITH_USERS": "", + "API.THERE_IS_RELATION_WITH_EQUIPMENTS": "", + "API.THERE_IS_RELATION_WITH_USERS": "", "API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER": "", "API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER": "", "API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER": "", - "API.THIS_SHOPFLOOR_CAN_NOT_BE_DELETED": "", - "API.THIS_SPACE_CAN_NOT_BE_DELETED": "", + "API.THIS_SHOPFLOOR_CANNOT_BE_DELETED": "", + "API.THIS_SPACE_CANNOT_BE_DELETED": "", "API.TIMEZONE_NOT_FOUND": "", "API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN": "", "API.USER_NAME_IS_ALREADY_IN_USE": "", From f39ad7f039403997615b246f31c0d3340a1e080f Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Wed, 25 Aug 2021 10:15:27 +0800 Subject: [PATCH 2/3] fixed code style warnings in API --- myems-api/core/combinedequipment.py | 12 ++++++++++ myems-api/core/contact.py | 2 ++ myems-api/core/costcenter.py | 4 ++++ myems-api/core/costfile.py | 3 +++ myems-api/core/datasource.py | 3 +++ myems-api/core/distributioncircuit.py | 4 ++++ myems-api/core/distributionsystem.py | 3 +++ myems-api/core/emailmessage.py | 2 ++ myems-api/core/emailserver.py | 2 ++ myems-api/core/energycategory.py | 2 ++ myems-api/core/energyflowdiagram.py | 6 +++++ myems-api/core/energyitem.py | 2 ++ myems-api/core/equipment.py | 10 ++++++++ myems-api/core/gateway.py | 3 +++ myems-api/core/gsmmodem.py | 4 ++-- myems-api/core/knowledgefile.py | 3 +++ myems-api/core/menu.py | 4 ++++ myems-api/core/meter.py | 5 ++++ myems-api/core/notification.py | 2 ++ myems-api/core/offlinemeter.py | 2 ++ myems-api/core/offlinemeterfile.py | 3 +++ myems-api/core/point.py | 2 ++ myems-api/core/privilege.py | 2 ++ myems-api/core/rule.py | 2 ++ myems-api/core/sensor.py | 4 ++++ myems-api/core/shopfloor.py | 14 +++++++++++ myems-api/core/space.py | 24 +++++++++++++++++++ myems-api/core/store.py | 12 ++++++++++ myems-api/core/storetype.py | 2 ++ myems-api/core/tariff.py | 2 ++ myems-api/core/tenant.py | 12 ++++++++++ myems-api/core/tenanttype.py | 2 ++ myems-api/core/textmessage.py | 2 ++ myems-api/core/timezone.py | 2 ++ myems-api/core/user.py | 6 +++++ myems-api/core/version.py | 1 + myems-api/core/virtualmeter.py | 2 ++ myems-api/core/webmessage.py | 3 +++ myems-api/core/wechatmessage.py | 1 + .../excelexporters/shopfloorenergyitem.py | 1 - .../excelexporters/shopfloorstatistics.py | 1 - .../excelexporters/spaceenergycategory.py | 1 - myems-api/excelexporters/tenantbill.py | 1 - myems-api/reports/advancedreport.py | 2 ++ myems-api/reports/combinedequipmentbatch.py | 1 + myems-api/reports/combinedequipmentcost.py | 1 + .../reports/combinedequipmentefficiency.py | 1 + .../combinedequipmentenergycategory.py | 1 + .../reports/combinedequipmentenergyitem.py | 1 + myems-api/reports/combinedequipmentincome.py | 1 + myems-api/reports/combinedequipmentload.py | 1 + myems-api/reports/combinedequipmentoutput.py | 1 + myems-api/reports/combinedequipmentsaving.py | 1 + .../reports/combinedequipmentstatistics.py | 1 + myems-api/reports/dashboard.py | 1 + myems-api/reports/distributionsystem.py | 1 + myems-api/reports/energyflowdiagram.py | 1 + myems-api/reports/equipmentbatch.py | 1 + myems-api/reports/equipmentcost.py | 1 + myems-api/reports/equipmentefficiency.py | 1 + myems-api/reports/equipmentenergycategory.py | 1 + myems-api/reports/equipmentenergyitem.py | 1 + myems-api/reports/equipmentincome.py | 1 + myems-api/reports/equipmentload.py | 1 + myems-api/reports/equipmentoutput.py | 1 + myems-api/reports/equipmentsaving.py | 1 + myems-api/reports/equipmentstatistics.py | 1 + myems-api/reports/equipmenttracking.py | 1 + .../reports/fddcombinedequipmentfault.py | 1 + myems-api/reports/fddequipmentfault.py | 1 + myems-api/reports/fddshopfloorfault.py | 1 + myems-api/reports/fddspacefault.py | 1 + myems-api/reports/fddstorefault.py | 1 + myems-api/reports/fddtenantfault.py | 1 + myems-api/reports/meterbatch.py | 1 + myems-api/reports/metercost.py | 1 + myems-api/reports/meterenergy.py | 1 + myems-api/reports/meterrealtime.py | 1 + myems-api/reports/metersubmetersbalance.py | 1 + myems-api/reports/metertracking.py | 1 + myems-api/reports/metertrend.py | 1 + myems-api/reports/offlinemetercost.py | 1 + myems-api/reports/offlinemeterenergy.py | 1 + myems-api/reports/shopfloorbatch.py | 1 + myems-api/reports/shopfloorcost.py | 1 + myems-api/reports/shopfloorenergycategory.py | 1 + myems-api/reports/shopfloorenergyitem.py | 1 + myems-api/reports/shopfloorload.py | 1 + myems-api/reports/shopfloorsaving.py | 1 + myems-api/reports/shopfloorstatistics.py | 1 + myems-api/reports/spacecost.py | 1 + myems-api/reports/spaceefficiency.py | 1 + myems-api/reports/spaceenergycategory.py | 1 + myems-api/reports/spaceenergyitem.py | 1 + myems-api/reports/spaceincome.py | 1 + myems-api/reports/spaceload.py | 1 + myems-api/reports/spaceoutput.py | 1 + myems-api/reports/spacesaving.py | 1 + myems-api/reports/spacestatistics.py | 1 + myems-api/reports/storebatch.py | 1 + myems-api/reports/storecost.py | 1 + myems-api/reports/storeenergycategory.py | 1 + myems-api/reports/storeenergyitem.py | 1 + myems-api/reports/storeload.py | 1 + myems-api/reports/storesaving.py | 1 + myems-api/reports/storestatistics.py | 1 + myems-api/reports/tenantbatch.py | 1 + myems-api/reports/tenantbill.py | 1 + myems-api/reports/tenantcost.py | 1 + myems-api/reports/tenantenergycategory.py | 1 + myems-api/reports/tenantenergyitem.py | 1 + myems-api/reports/tenantload.py | 1 + myems-api/reports/tenantsaving.py | 1 + myems-api/reports/tenantstatistics.py | 1 + myems-api/reports/virtualmetercost.py | 1 + myems-api/reports/virtualmeterenergy.py | 1 + 116 files changed, 248 insertions(+), 6 deletions(-) diff --git a/myems-api/core/combinedequipment.py b/myems-api/core/combinedequipment.py index 76f76262..97158f6a 100644 --- a/myems-api/core/combinedequipment.py +++ b/myems-api/core/combinedequipment.py @@ -8,6 +8,7 @@ import uuid class CombinedEquipmentCollection: @staticmethod def __init__(): + """ Initializes CombinedEquipmentCollection""" pass @staticmethod @@ -145,6 +146,7 @@ class CombinedEquipmentCollection: class CombinedEquipmentItem: @staticmethod def __init__(): + """Initializes CombinedEquipmentItem""" pass @staticmethod @@ -515,6 +517,7 @@ class CombinedEquipmentItem: class CombinedEquipmentEquipmentCollection: @staticmethod def __init__(): + """Initializes CombinedEquipmentEquipmentCollection""" pass @staticmethod @@ -621,6 +624,7 @@ class CombinedEquipmentEquipmentCollection: class CombinedEquipmentEquipmentItem: @staticmethod def __init__(): + """Initializes CombinedEquipmentEquipmentItem""" pass @staticmethod @@ -680,6 +684,7 @@ class CombinedEquipmentEquipmentItem: class CombinedEquipmentParameterCollection: @staticmethod def __init__(): + """Initializes CombinedEquipmentParameterCollection""" pass @staticmethod @@ -993,6 +998,7 @@ class CombinedEquipmentParameterCollection: class CombinedEquipmentParameterItem: @staticmethod def __init__(): + """"Initializes CombinedEquipmentParameterItem""" pass @staticmethod @@ -1364,6 +1370,7 @@ class CombinedEquipmentParameterItem: class CombinedEquipmentMeterCollection: @staticmethod def __init__(): + """"Initializes CombinedEquipmentMeterCollection""" pass @staticmethod @@ -1491,6 +1498,7 @@ class CombinedEquipmentMeterCollection: class CombinedEquipmentMeterItem: @staticmethod def __init__(): + """"Initializes CombinedEquipmentMeterItem""" pass @staticmethod @@ -1550,6 +1558,7 @@ class CombinedEquipmentMeterItem: class CombinedEquipmentOfflineMeterCollection: @staticmethod def __init__(): + """"Initializes CombinedEquipmentOfflineMeterCollection""" pass @staticmethod @@ -1678,6 +1687,7 @@ class CombinedEquipmentOfflineMeterCollection: class CombinedEquipmentOfflineMeterItem: @staticmethod def __init__(): + """"Initializes CombinedEquipmentOfflineMeterItem""" pass @staticmethod @@ -1737,6 +1747,7 @@ class CombinedEquipmentOfflineMeterItem: class CombinedEquipmentVirtualMeterCollection: @staticmethod def __init__(): + """"Initializes CombinedEquipmentVirtualMeterCollection""" pass @staticmethod @@ -1865,6 +1876,7 @@ class CombinedEquipmentVirtualMeterCollection: class CombinedEquipmentVirtualMeterItem: @staticmethod def __init__(): + """"Initializes CombinedEquipmentVirtualMeterItem""" pass @staticmethod diff --git a/myems-api/core/contact.py b/myems-api/core/contact.py index 3f780b1f..407688b4 100644 --- a/myems-api/core/contact.py +++ b/myems-api/core/contact.py @@ -9,6 +9,7 @@ import re class ContactCollection: @staticmethod def __init__(): + """"Initializes ContactCollection""" pass @staticmethod @@ -118,6 +119,7 @@ class ContactCollection: class ContactItem: @staticmethod def __init__(): + """"Initializes ContactItem""" pass @staticmethod diff --git a/myems-api/core/costcenter.py b/myems-api/core/costcenter.py index 492661b2..49cf22d3 100644 --- a/myems-api/core/costcenter.py +++ b/myems-api/core/costcenter.py @@ -8,6 +8,7 @@ import uuid class CostCenterCollection: @staticmethod def __init__(): + """"Initializes CostCenterCollection""" pass @staticmethod @@ -98,6 +99,7 @@ class CostCenterCollection: class CostCenterItem: @staticmethod def __init__(): + """"Initializes CostCenterItem""" pass @staticmethod @@ -361,6 +363,7 @@ class CostCenterItem: class CostCenterTariffCollection: @staticmethod def __init__(): + """"Initializes CostCenterTariffCollection""" pass @staticmethod @@ -460,6 +463,7 @@ class CostCenterTariffCollection: class CostCenterTariffItem: @staticmethod def __init__(): + """"Initializes CostCenterTariffItem""" pass @staticmethod diff --git a/myems-api/core/costfile.py b/myems-api/core/costfile.py index ff249050..fb352833 100644 --- a/myems-api/core/costfile.py +++ b/myems-api/core/costfile.py @@ -10,6 +10,7 @@ import os class CostFileCollection: @staticmethod def __init__(): + """"Initializes CostFileCollection""" pass @staticmethod @@ -142,6 +143,7 @@ class CostFileCollection: class CostFileItem: @staticmethod def __init__(): + """"Initializes CostFileItem""" pass @staticmethod @@ -222,6 +224,7 @@ class CostFileItem: class CostFileRestore: @staticmethod def __init__(): + """"Initializes CostFileRestore""" pass @staticmethod diff --git a/myems-api/core/datasource.py b/myems-api/core/datasource.py index 9898e521..ab72e5aa 100644 --- a/myems-api/core/datasource.py +++ b/myems-api/core/datasource.py @@ -9,6 +9,7 @@ from datetime import datetime, timezone class DataSourceCollection: @staticmethod def __init__(): + """"Initializes DataSourceCollection""" pass @staticmethod @@ -136,6 +137,7 @@ class DataSourceCollection: class DataSourceItem: @staticmethod def __init__(): + """"Initializes DataSourceItem""" pass @staticmethod @@ -310,6 +312,7 @@ class DataSourceItem: class DataSourcePointCollection: @staticmethod def __init__(): + """"Initializes DataSourcePointCollection""" pass @staticmethod diff --git a/myems-api/core/distributioncircuit.py b/myems-api/core/distributioncircuit.py index 988dfafc..5bbb54fa 100644 --- a/myems-api/core/distributioncircuit.py +++ b/myems-api/core/distributioncircuit.py @@ -8,6 +8,7 @@ import uuid class DistributionCircuitCollection: @staticmethod def __init__(): + """Initializes DistributionCircuitCollection""" pass @staticmethod @@ -171,6 +172,7 @@ class DistributionCircuitCollection: class DistributionCircuitItem: @staticmethod def __init__(): + """Initializes DistributionCircuitItem""" pass @staticmethod @@ -372,6 +374,7 @@ class DistributionCircuitItem: class DistributionCircuitPointCollection: @staticmethod def __init__(): + """Initializes DistributionCircuitPointCollection""" pass @staticmethod @@ -489,6 +492,7 @@ class DistributionCircuitPointCollection: class DistributionCircuitPointItem: @staticmethod def __init__(): + """Initializes DistributionCircuitPointItem""" pass @staticmethod diff --git a/myems-api/core/distributionsystem.py b/myems-api/core/distributionsystem.py index 8f4e5a6a..28427847 100644 --- a/myems-api/core/distributionsystem.py +++ b/myems-api/core/distributionsystem.py @@ -8,6 +8,7 @@ import uuid class DistributionSystemCollection: @staticmethod def __init__(): + """Initializes DistributionSystemCollection""" pass @staticmethod @@ -103,6 +104,7 @@ class DistributionSystemCollection: class DistributionSystemItem: @staticmethod def __init__(): + """Initializes DistributionSystemItem""" pass @staticmethod @@ -242,6 +244,7 @@ class DistributionSystemItem: class DistributionSystemDistributionCircuitCollection: @staticmethod def __init__(): + """Initializes DistributionSystemDistributionCircuitCollection""" pass @staticmethod diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 88611fcd..f2f0e996 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -8,6 +8,7 @@ from datetime import datetime, timedelta, timezone class EmailMessageCollection: @staticmethod def __init__(): + """"Initializes EmailMessageCollection""" pass @staticmethod @@ -89,6 +90,7 @@ class EmailMessageCollection: class EmailMessageItem: @staticmethod def __init__(): + """"Initializes EmailMessageItem""" pass @staticmethod diff --git a/myems-api/core/emailserver.py b/myems-api/core/emailserver.py index 74c94c21..a5e8defe 100644 --- a/myems-api/core/emailserver.py +++ b/myems-api/core/emailserver.py @@ -9,6 +9,7 @@ import re class EmailServerCollection: @staticmethod def __init__(): + """"Initializes EmailServerCollection""" pass @staticmethod @@ -138,6 +139,7 @@ class EmailServerCollection: class EmailServerItem: @staticmethod def __init__(): + """"Initializes EmailServerItem""" pass @staticmethod diff --git a/myems-api/core/energycategory.py b/myems-api/core/energycategory.py index 6b374a0f..83df4929 100644 --- a/myems-api/core/energycategory.py +++ b/myems-api/core/energycategory.py @@ -8,6 +8,7 @@ import uuid class EnergyCategoryCollection: @staticmethod def __init__(): + """"Initializes EnergyCategoryCollection""" pass @staticmethod @@ -108,6 +109,7 @@ class EnergyCategoryCollection: class EnergyCategoryItem: @staticmethod def __init__(): + """"Initializes EnergyCategoryItem""" pass @staticmethod diff --git a/myems-api/core/energyflowdiagram.py b/myems-api/core/energyflowdiagram.py index d7055675..53ad8434 100644 --- a/myems-api/core/energyflowdiagram.py +++ b/myems-api/core/energyflowdiagram.py @@ -8,6 +8,7 @@ import uuid class EnergyFlowDiagramCollection: @staticmethod def __init__(): + """"Initializes EnergyFlowDiagramCollection""" pass @staticmethod @@ -164,6 +165,7 @@ class EnergyFlowDiagramCollection: class EnergyFlowDiagramItem: @staticmethod def __init__(): + """"Initializes EnergyFlowDiagramItem""" pass @staticmethod @@ -363,6 +365,7 @@ class EnergyFlowDiagramItem: class EnergyFlowDiagramLinkCollection: @staticmethod def __init__(): + """"Initializes EnergyFlowDiagramLinkCollection""" pass @staticmethod @@ -612,6 +615,7 @@ class EnergyFlowDiagramLinkCollection: class EnergyFlowDiagramLinkItem: @staticmethod def __init__(): + """"Initializes EnergyFlowDiagramLinkItem""" pass @staticmethod @@ -916,6 +920,7 @@ class EnergyFlowDiagramLinkItem: class EnergyFlowDiagramNodeCollection: @staticmethod def __init__(): + """"Initializes EnergyFlowDiagramNodeCollection""" pass @staticmethod @@ -1016,6 +1021,7 @@ class EnergyFlowDiagramNodeCollection: class EnergyFlowDiagramNodeItem: @staticmethod def __init__(): + """"Initializes EnergyFlowDiagramNodeItem""" pass @staticmethod diff --git a/myems-api/core/energyitem.py b/myems-api/core/energyitem.py index 4dc70b34..5e3e9499 100644 --- a/myems-api/core/energyitem.py +++ b/myems-api/core/energyitem.py @@ -8,6 +8,7 @@ import uuid class EnergyItemCollection: @staticmethod def __init__(): + """"Initializes EnergyItemCollection""" pass @staticmethod @@ -113,6 +114,7 @@ class EnergyItemCollection: class EnergyItemItem: @staticmethod def __init__(): + """"Initializes EnergyItemItem""" pass @staticmethod diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py index 84edc4d5..086ddaf9 100644 --- a/myems-api/core/equipment.py +++ b/myems-api/core/equipment.py @@ -8,6 +8,7 @@ import uuid class EquipmentCollection: @staticmethod def __init__(): + """Initializes EquipmentCollection""" pass @staticmethod @@ -145,6 +146,7 @@ class EquipmentCollection: class EquipmentItem: @staticmethod def __init__(): + """Initializes EquipmentItem""" pass @staticmethod @@ -526,6 +528,7 @@ class EquipmentItem: class EquipmentParameterCollection: @staticmethod def __init__(): + """Initializes EquipmentParameterCollection""" pass @staticmethod @@ -839,6 +842,7 @@ class EquipmentParameterCollection: class EquipmentParameterItem: @staticmethod def __init__(): + """Initializes EquipmentParameterItem""" pass @staticmethod @@ -1210,6 +1214,7 @@ class EquipmentParameterItem: class EquipmentMeterCollection: @staticmethod def __init__(): + """Initializes EquipmentMeterCollection""" pass @staticmethod @@ -1337,6 +1342,7 @@ class EquipmentMeterCollection: class EquipmentMeterItem: @staticmethod def __init__(): + """Initializes EquipmentMeterItem""" pass @staticmethod @@ -1395,6 +1401,7 @@ class EquipmentMeterItem: class EquipmentOfflineMeterCollection: @staticmethod def __init__(): + """Initializes EquipmentOfflineMeterCollection""" pass @staticmethod @@ -1522,6 +1529,7 @@ class EquipmentOfflineMeterCollection: class EquipmentOfflineMeterItem: @staticmethod def __init__(): + """Initializes EquipmentOfflineMeterItem""" pass @staticmethod @@ -1581,6 +1589,7 @@ class EquipmentOfflineMeterItem: class EquipmentVirtualMeterCollection: @staticmethod def __init__(): + """Initializes EquipmentVirtualMeterCollection""" pass @staticmethod @@ -1708,6 +1717,7 @@ class EquipmentVirtualMeterCollection: class EquipmentVirtualMeterItem: @staticmethod def __init__(): + """Initializes EquipmentVirtualMeterItem""" pass @staticmethod diff --git a/myems-api/core/gateway.py b/myems-api/core/gateway.py index 3a937eeb..370ebb64 100644 --- a/myems-api/core/gateway.py +++ b/myems-api/core/gateway.py @@ -9,6 +9,7 @@ from datetime import datetime, timezone class GatewayCollection: @staticmethod def __init__(): + """"Initializes GatewayCollection""" pass @staticmethod @@ -87,6 +88,7 @@ class GatewayCollection: class GatewayItem: @staticmethod def __init__(): + """"Initializes GatewayItem""" pass @staticmethod @@ -219,6 +221,7 @@ class GatewayItem: class GatewayDataSourceCollection: @staticmethod def __init__(): + """"Initializes GatewayDataSourceCollection""" pass @staticmethod diff --git a/myems-api/core/gsmmodem.py b/myems-api/core/gsmmodem.py index 421763ff..e91ef512 100644 --- a/myems-api/core/gsmmodem.py +++ b/myems-api/core/gsmmodem.py @@ -2,13 +2,12 @@ import falcon import json import mysql.connector import config -import base64 -import re class GSMModemCollection: @staticmethod def __init__(): + """Initializes GSMModemCollection""" pass @staticmethod @@ -91,6 +90,7 @@ class GSMModemCollection: class GSMModemItem: @staticmethod def __init__(): + """Initializes GSMModemItem""" pass @staticmethod diff --git a/myems-api/core/knowledgefile.py b/myems-api/core/knowledgefile.py index 2ff7593c..b0945cc3 100644 --- a/myems-api/core/knowledgefile.py +++ b/myems-api/core/knowledgefile.py @@ -12,6 +12,7 @@ import sys class KnowledgeFileCollection: @staticmethod def __init__(): + """"Initializes KnowledgeFileCollection""" pass @staticmethod @@ -175,6 +176,7 @@ class KnowledgeFileCollection: class KnowledgeFileItem: @staticmethod def __init__(): + """"Initializes KnowledgeFileItem""" pass @staticmethod @@ -271,6 +273,7 @@ class KnowledgeFileItem: class KnowledgeFileRestore: @staticmethod def __init__(): + """"Initializes KnowledgeFileRestore""" pass @staticmethod diff --git a/myems-api/core/menu.py b/myems-api/core/menu.py index 827b98a5..0d4a3ab4 100644 --- a/myems-api/core/menu.py +++ b/myems-api/core/menu.py @@ -7,6 +7,7 @@ import config class MenuCollection: @staticmethod def __init__(): + """"Initializes MenuCollection""" pass @staticmethod @@ -43,6 +44,7 @@ class MenuCollection: class MenuItem: @staticmethod def __init__(): + """"Initializes MenuItem""" pass @staticmethod @@ -114,6 +116,7 @@ class MenuItem: class MenuChildrenCollection: @staticmethod def __init__(): + """"Initializes MenuChildrenCollection""" pass @staticmethod @@ -185,6 +188,7 @@ class MenuChildrenCollection: class MenuWebCollection: @staticmethod def __init__(): + """"Initializes MenuWebCollection""" pass @staticmethod diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py index 468d9812..f5edff57 100644 --- a/myems-api/core/meter.py +++ b/myems-api/core/meter.py @@ -8,6 +8,7 @@ import uuid class MeterCollection: @staticmethod def __init__(): + """Initializes MeterCollection""" pass @staticmethod @@ -271,6 +272,7 @@ class MeterCollection: class MeterItem: @staticmethod def __init__(): + """Initializes MeterItem""" pass @staticmethod @@ -742,6 +744,7 @@ class MeterItem: class MeterSubmeterCollection: @staticmethod def __init__(): + """Initializes MeterSubmeterCollection""" pass @staticmethod @@ -843,6 +846,7 @@ class MeterSubmeterCollection: class MeterPointCollection: @staticmethod def __init__(): + """Initializes MeterPointCollection""" pass @staticmethod @@ -946,6 +950,7 @@ class MeterPointCollection: class MeterPointItem: @staticmethod def __init__(): + """Initializes MeterPointItem""" pass @staticmethod diff --git a/myems-api/core/notification.py b/myems-api/core/notification.py index 31d7e77b..7193ae63 100644 --- a/myems-api/core/notification.py +++ b/myems-api/core/notification.py @@ -8,6 +8,7 @@ from datetime import datetime, timedelta, timezone class NotificationCollection: @staticmethod def __init__(): + """"Initializes NotificationCollection""" pass @staticmethod @@ -149,6 +150,7 @@ class NotificationCollection: class NotificationItem: @staticmethod def __init__(): + """"Initializes NotificationItem""" pass @staticmethod diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index 9b851049..0892cf86 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -8,6 +8,7 @@ import uuid class OfflineMeterCollection: @staticmethod def __init__(): + """Initializes OfflineMeterCollection""" pass @staticmethod @@ -230,6 +231,7 @@ class OfflineMeterCollection: class OfflineMeterItem: @staticmethod def __init__(): + """Initializes OfflineMeterItem""" pass @staticmethod diff --git a/myems-api/core/offlinemeterfile.py b/myems-api/core/offlinemeterfile.py index d71bd69a..d40e90c1 100644 --- a/myems-api/core/offlinemeterfile.py +++ b/myems-api/core/offlinemeterfile.py @@ -10,6 +10,7 @@ import os class OfflineMeterFileCollection: @staticmethod def __init__(): + """"Initializes OfflineMeterFileCollection""" pass @staticmethod @@ -144,6 +145,7 @@ class OfflineMeterFileCollection: class OfflineMeterFileItem: @staticmethod def __init__(): + """"Initializes OfflineMeterFileItem""" pass @staticmethod @@ -224,6 +226,7 @@ class OfflineMeterFileItem: class OfflineMeterFileRestore: @staticmethod def __init__(): + """"Initializes OfflineMeterFileRestore""" pass @staticmethod diff --git a/myems-api/core/point.py b/myems-api/core/point.py index 7d70ea9b..434b067d 100644 --- a/myems-api/core/point.py +++ b/myems-api/core/point.py @@ -7,6 +7,7 @@ import config class PointCollection: @staticmethod def __init__(): + """"Initializes PointCollection""" pass @staticmethod @@ -194,6 +195,7 @@ class PointCollection: class PointItem: @staticmethod def __init__(): + """"Initializes PointItem""" pass @staticmethod diff --git a/myems-api/core/privilege.py b/myems-api/core/privilege.py index 96214b9b..959cb1b0 100644 --- a/myems-api/core/privilege.py +++ b/myems-api/core/privilege.py @@ -7,6 +7,7 @@ import config class PrivilegeCollection: @staticmethod def __init__(): + """"Initializes PrivilegeCollection""" pass @staticmethod @@ -88,6 +89,7 @@ class PrivilegeCollection: class PrivilegeItem: @staticmethod def __init__(): + """"Initializes PrivilegeItem""" pass @staticmethod diff --git a/myems-api/core/rule.py b/myems-api/core/rule.py index 3dd2ade7..f6357503 100644 --- a/myems-api/core/rule.py +++ b/myems-api/core/rule.py @@ -9,6 +9,7 @@ import config class RuleCollection: @staticmethod def __init__(): + """Initializes RuleCollection""" pass @staticmethod @@ -172,6 +173,7 @@ class RuleCollection: class RuleItem: @staticmethod def __init__(): + """Initializes RuleItem""" pass @staticmethod diff --git a/myems-api/core/sensor.py b/myems-api/core/sensor.py index 3ab691b6..46a8a58f 100644 --- a/myems-api/core/sensor.py +++ b/myems-api/core/sensor.py @@ -8,6 +8,7 @@ import uuid class SensorCollection: @staticmethod def __init__(): + """"Initializes SensorCollection""" pass @staticmethod @@ -92,6 +93,7 @@ class SensorCollection: class SensorItem: @staticmethod def __init__(): + """"Initializes SensorItem""" pass @staticmethod @@ -266,6 +268,7 @@ class SensorItem: class SensorPointCollection: @staticmethod def __init__(): + """"Initializes SensorPointCollection""" pass @staticmethod @@ -369,6 +372,7 @@ class SensorPointCollection: class SensorPointItem: @staticmethod def __init__(): + """"Initializes SensorPointItem""" pass @staticmethod diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py index f0fd2758..11bc1e31 100644 --- a/myems-api/core/shopfloor.py +++ b/myems-api/core/shopfloor.py @@ -8,6 +8,7 @@ import uuid class ShopfloorCollection: @staticmethod def __init__(): + """Initializes ShopfloorCollection""" pass @staticmethod @@ -194,6 +195,7 @@ class ShopfloorCollection: class ShopfloorItem: @staticmethod def __init__(): + """Initializes ShopfloorItem""" pass @staticmethod @@ -514,6 +516,7 @@ class ShopfloorItem: class ShopfloorEquipmentCollection: @staticmethod def __init__(): + """Initializes ShopfloorEquipmentCollection""" pass @staticmethod @@ -620,6 +623,7 @@ class ShopfloorEquipmentCollection: class ShopfloorEquipmentItem: @staticmethod def __init__(): + """Initializes ShopfloorEquipmentItem""" pass @staticmethod @@ -679,6 +683,7 @@ class ShopfloorEquipmentItem: class ShopfloorMeterCollection: @staticmethod def __init__(): + """Initializes ShopfloorMeterCollection""" pass @staticmethod @@ -799,6 +804,7 @@ class ShopfloorMeterCollection: class ShopfloorMeterItem: @staticmethod def __init__(): + """Initializes ShopfloorMeterItem""" pass @staticmethod @@ -857,6 +863,7 @@ class ShopfloorMeterItem: class ShopfloorOfflineMeterCollection: @staticmethod def __init__(): + """Initializes ShopfloorOfflineMeterCollection""" pass @staticmethod @@ -977,6 +984,7 @@ class ShopfloorOfflineMeterCollection: class ShopfloorOfflineMeterItem: @staticmethod def __init__(): + """Initializes ShopfloorOfflineMeterItem""" pass @staticmethod @@ -1036,6 +1044,7 @@ class ShopfloorOfflineMeterItem: class ShopfloorPointCollection: @staticmethod def __init__(): + """Initializes ShopfloorPointCollection""" pass @staticmethod @@ -1155,6 +1164,7 @@ class ShopfloorPointCollection: class ShopfloorPointItem: @staticmethod def __init__(): + """Initializes ShopfloorPointItem""" pass @staticmethod @@ -1214,6 +1224,7 @@ class ShopfloorPointItem: class ShopfloorSensorCollection: @staticmethod def __init__(): + """Initializes ShopfloorSensorCollection""" pass @staticmethod @@ -1320,6 +1331,7 @@ class ShopfloorSensorCollection: class ShopfloorSensorItem: @staticmethod def __init__(): + """Initializes ShopfloorSensorItem""" pass @staticmethod @@ -1378,6 +1390,7 @@ class ShopfloorSensorItem: class ShopfloorVirtualMeterCollection: @staticmethod def __init__(): + """Initializes ShopfloorVirtualMeterCollection""" pass @staticmethod @@ -1498,6 +1511,7 @@ class ShopfloorVirtualMeterCollection: class ShopfloorVirtualMeterItem: @staticmethod def __init__(): + """Initializes ShopfloorVirtualMeterItem""" pass @staticmethod diff --git a/myems-api/core/space.py b/myems-api/core/space.py index b927a312..f8974679 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -11,6 +11,7 @@ from anytree.exporter import JsonExporter class SpaceCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -258,6 +259,7 @@ class SpaceCollection: class SpaceItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -682,6 +684,7 @@ class SpaceItem: class SpaceChildrenCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -810,6 +813,7 @@ class SpaceChildrenCollection: class SpaceCombinedEquipmentCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -916,6 +920,7 @@ class SpaceCombinedEquipmentCollection: class SpaceCombinedEquipmentItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -975,6 +980,7 @@ class SpaceCombinedEquipmentItem: class SpaceEquipmentCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1081,6 +1087,7 @@ class SpaceEquipmentCollection: class SpaceEquipmentItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1139,6 +1146,7 @@ class SpaceEquipmentItem: class SpaceMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1259,6 +1267,7 @@ class SpaceMeterCollection: class SpaceMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1319,6 +1328,7 @@ class SpaceMeterItem: class SpaceOfflineMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1439,6 +1449,7 @@ class SpaceOfflineMeterCollection: class SpaceOfflineMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1498,6 +1509,7 @@ class SpaceOfflineMeterItem: class SpacePointCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1617,6 +1629,7 @@ class SpacePointCollection: class SpacePointItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1676,6 +1689,7 @@ class SpacePointItem: class SpaceSensorCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1782,6 +1796,7 @@ class SpaceSensorCollection: class SpaceSensorItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1840,6 +1855,7 @@ class SpaceSensorItem: class SpaceShopfloorCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1946,6 +1962,7 @@ class SpaceShopfloorCollection: class SpaceShopfloorItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -2004,6 +2021,7 @@ class SpaceShopfloorItem: class SpaceStoreCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -2110,6 +2128,7 @@ class SpaceStoreCollection: class SpaceStoreItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -2168,6 +2187,7 @@ class SpaceStoreItem: class SpaceTenantCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -2274,6 +2294,7 @@ class SpaceTenantCollection: class SpaceTenantItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -2332,6 +2353,7 @@ class SpaceTenantItem: class SpaceVirtualMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -2452,6 +2474,7 @@ class SpaceVirtualMeterCollection: class SpaceVirtualMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -2511,6 +2534,7 @@ class SpaceVirtualMeterItem: class SpaceTreeCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/core/store.py b/myems-api/core/store.py index a66fce47..cc24dda3 100644 --- a/myems-api/core/store.py +++ b/myems-api/core/store.py @@ -8,6 +8,7 @@ import uuid class StoreCollection: @staticmethod def __init__(): + """"Initializes StoreCollection""" pass @staticmethod @@ -239,6 +240,7 @@ class StoreCollection: class StoreItem: @staticmethod def __init__(): + """"Initializes StoreItem""" pass @staticmethod @@ -590,6 +592,7 @@ class StoreItem: class StoreMeterCollection: @staticmethod def __init__(): + """"Initializes StoreMeterCollection""" pass @staticmethod @@ -710,6 +713,7 @@ class StoreMeterCollection: class StoreMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -768,6 +772,7 @@ class StoreMeterItem: class StoreOfflineMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -888,6 +893,7 @@ class StoreOfflineMeterCollection: class StoreOfflineMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -947,6 +953,7 @@ class StoreOfflineMeterItem: class StorePointCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1066,6 +1073,7 @@ class StorePointCollection: class StorePointItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1125,6 +1133,7 @@ class StorePointItem: class StoreSensorCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1231,6 +1240,7 @@ class StoreSensorCollection: class StoreSensorItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1289,6 +1299,7 @@ class StoreSensorItem: class StoreVirtualMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1409,6 +1420,7 @@ class StoreVirtualMeterCollection: class StoreVirtualMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/core/storetype.py b/myems-api/core/storetype.py index 8063126d..dd7c05d2 100644 --- a/myems-api/core/storetype.py +++ b/myems-api/core/storetype.py @@ -8,6 +8,7 @@ import uuid class StoreTypeCollection: @staticmethod def __init__(): + """ Initializes StoreTypeCollection""" pass @staticmethod @@ -110,6 +111,7 @@ class StoreTypeCollection: class StoreTypeItem: @staticmethod def __init__(): + """ Initializes StoreTypeItem""" pass @staticmethod diff --git a/myems-api/core/tariff.py b/myems-api/core/tariff.py index 1948ede8..54224965 100644 --- a/myems-api/core/tariff.py +++ b/myems-api/core/tariff.py @@ -9,6 +9,7 @@ from datetime import datetime, timedelta, timezone class TariffCollection: @staticmethod def __init__(): + """"Initializes TariffCollection""" pass @staticmethod @@ -215,6 +216,7 @@ class TariffCollection: class TariffItem: @staticmethod def __init__(): + """"Initializes TariffItem""" pass @staticmethod diff --git a/myems-api/core/tenant.py b/myems-api/core/tenant.py index eeb1e600..41a333bb 100644 --- a/myems-api/core/tenant.py +++ b/myems-api/core/tenant.py @@ -9,6 +9,7 @@ from datetime import datetime, timedelta, timezone class TenantCollection: @staticmethod def __init__(): + """"Initializes TenantCollection""" pass @staticmethod @@ -290,6 +291,7 @@ class TenantCollection: class TenantItem: @staticmethod def __init__(): + """"Initializes TenantItem""" pass @staticmethod @@ -687,6 +689,7 @@ class TenantItem: class TenantMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -807,6 +810,7 @@ class TenantMeterCollection: class TenantMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -865,6 +869,7 @@ class TenantMeterItem: class TenantOfflineMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -985,6 +990,7 @@ class TenantOfflineMeterCollection: class TenantOfflineMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1044,6 +1050,7 @@ class TenantOfflineMeterItem: class TenantPointCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1163,6 +1170,7 @@ class TenantPointCollection: class TenantPointItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1222,6 +1230,7 @@ class TenantPointItem: class TenantSensorCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1328,6 +1337,7 @@ class TenantSensorCollection: class TenantSensorItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1386,6 +1396,7 @@ class TenantSensorItem: class TenantVirtualMeterCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -1506,6 +1517,7 @@ class TenantVirtualMeterCollection: class TenantVirtualMeterItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/core/tenanttype.py b/myems-api/core/tenanttype.py index b423f282..f490c98d 100644 --- a/myems-api/core/tenanttype.py +++ b/myems-api/core/tenanttype.py @@ -8,6 +8,7 @@ import uuid class TenantTypeCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -110,6 +111,7 @@ class TenantTypeCollection: class TenantTypeItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/core/textmessage.py b/myems-api/core/textmessage.py index 72f071f3..17c596cf 100644 --- a/myems-api/core/textmessage.py +++ b/myems-api/core/textmessage.py @@ -8,6 +8,7 @@ from datetime import datetime, timedelta, timezone class TextMessageCollection: @staticmethod def __init__(): + """"Initializes TextMessageCollection""" pass @staticmethod @@ -86,6 +87,7 @@ class TextMessageCollection: class TextMessageItem: @staticmethod def __init__(): + """"Initializes TextMessageItem""" pass @staticmethod diff --git a/myems-api/core/timezone.py b/myems-api/core/timezone.py index 99c4a9c5..cbcf5885 100644 --- a/myems-api/core/timezone.py +++ b/myems-api/core/timezone.py @@ -7,6 +7,7 @@ import config class TimezoneCollection: @staticmethod def __init__(): + """"Initializes TimezoneCollection""" pass @staticmethod @@ -37,6 +38,7 @@ class TimezoneCollection: class TimezoneItem: @staticmethod def __init__(): + """"Initializes TimezoneItem""" pass @staticmethod diff --git a/myems-api/core/user.py b/myems-api/core/user.py index f0961a21..b56700f3 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -12,6 +12,7 @@ from datetime import datetime, timedelta class UserCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -160,6 +161,7 @@ class UserCollection: class UserItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -338,6 +340,7 @@ class UserItem: class UserLogin: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -452,6 +455,7 @@ class UserLogin: class UserLogout: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -500,6 +504,7 @@ class UserLogout: class ChangePassword: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -614,6 +619,7 @@ class ChangePassword: class ResetPassword: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/core/version.py b/myems-api/core/version.py index 701f3e7c..a7a75a9b 100644 --- a/myems-api/core/version.py +++ b/myems-api/core/version.py @@ -5,6 +5,7 @@ import simplejson as json class VersionItem: @staticmethod def __init__(): + """"Initializes VersionItem""" pass @staticmethod diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index cc811409..e49d2475 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -8,6 +8,7 @@ import uuid class VirtualMeterCollection: @staticmethod def __init__(): + """"Initializes VirtualMeterCollection""" pass @staticmethod @@ -362,6 +363,7 @@ class VirtualMeterCollection: class VirtualMeterItem: @staticmethod def __init__(): + """"Initializes VirtualMeterItem""" pass @staticmethod diff --git a/myems-api/core/webmessage.py b/myems-api/core/webmessage.py index 29f68a81..c1d72f13 100644 --- a/myems-api/core/webmessage.py +++ b/myems-api/core/webmessage.py @@ -8,6 +8,7 @@ from datetime import datetime, timedelta, timezone class WebMessageCollection: @staticmethod def __init__(): + """"Initializes WebMessageCollection""" pass @staticmethod @@ -99,6 +100,7 @@ class WebMessageCollection: class WebMessageStatusNewCollection: @staticmethod def __init__(): + """"Initializes WebMessageStatusNewCollection""" pass @staticmethod @@ -162,6 +164,7 @@ class WebMessageStatusNewCollection: class WebMessageItem: @staticmethod def __init__(): + """"Initializes WebMessageItem""" pass @staticmethod diff --git a/myems-api/core/wechatmessage.py b/myems-api/core/wechatmessage.py index 97e2f636..884b8058 100644 --- a/myems-api/core/wechatmessage.py +++ b/myems-api/core/wechatmessage.py @@ -78,6 +78,7 @@ class WechatMessageCollection(object): class WechatMessageItem: @staticmethod def __init__(): + """"Initializes WechatMessageItem""" pass @staticmethod diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 5cd1d14d..5d16c31f 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -83,7 +83,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index 8d011ffe..3d5bbe32 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -83,7 +83,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index 3d1740ea..76fe2a8c 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/myems-api/excelexporters/spaceenergycategory.py @@ -85,7 +85,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), diff --git a/myems-api/excelexporters/tenantbill.py b/myems-api/excelexporters/tenantbill.py index 4b7c3019..7941be09 100644 --- a/myems-api/excelexporters/tenantbill.py +++ b/myems-api/excelexporters/tenantbill.py @@ -102,7 +102,6 @@ def generate_excel(report, notice_font = Font(name='宋体', size=20, bold=True) name_font = Font(name='Constantia', size=12, bold=True) title_font = Font(name='宋体', size=11, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), diff --git a/myems-api/reports/advancedreport.py b/myems-api/reports/advancedreport.py index 418cf788..591c8749 100644 --- a/myems-api/reports/advancedreport.py +++ b/myems-api/reports/advancedreport.py @@ -10,6 +10,7 @@ import config class AdvancedReportCollection: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod @@ -110,6 +111,7 @@ class AdvancedReportCollection: class AdvancedReportItem: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentbatch.py b/myems-api/reports/combinedequipmentbatch.py index b69f3d6d..c93531f8 100644 --- a/myems-api/reports/combinedequipmentbatch.py +++ b/myems-api/reports/combinedequipmentbatch.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentbatch class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentcost.py b/myems-api/reports/combinedequipmentcost.py index 1810508b..b2562c7e 100644 --- a/myems-api/reports/combinedequipmentcost.py +++ b/myems-api/reports/combinedequipmentcost.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentcost class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentefficiency.py b/myems-api/reports/combinedequipmentefficiency.py index 0d22ccb6..bcd0b293 100644 --- a/myems-api/reports/combinedequipmentefficiency.py +++ b/myems-api/reports/combinedequipmentefficiency.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentefficiency class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentenergycategory.py b/myems-api/reports/combinedequipmentenergycategory.py index f52806be..c2886cf1 100644 --- a/myems-api/reports/combinedequipmentenergycategory.py +++ b/myems-api/reports/combinedequipmentenergycategory.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentenergycategory class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentenergyitem.py b/myems-api/reports/combinedequipmentenergyitem.py index e32efa7e..863b6c07 100644 --- a/myems-api/reports/combinedequipmentenergyitem.py +++ b/myems-api/reports/combinedequipmentenergyitem.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentenergyitem class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentincome.py b/myems-api/reports/combinedequipmentincome.py index d6333bbf..004be5e5 100644 --- a/myems-api/reports/combinedequipmentincome.py +++ b/myems-api/reports/combinedequipmentincome.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentincome class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentload.py b/myems-api/reports/combinedequipmentload.py index 4ff9c702..d18897f6 100644 --- a/myems-api/reports/combinedequipmentload.py +++ b/myems-api/reports/combinedequipmentload.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentload class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentoutput.py b/myems-api/reports/combinedequipmentoutput.py index 826d148b..1e5be77a 100644 --- a/myems-api/reports/combinedequipmentoutput.py +++ b/myems-api/reports/combinedequipmentoutput.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentoutput class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentsaving.py b/myems-api/reports/combinedequipmentsaving.py index b18c8861..febb3815 100644 --- a/myems-api/reports/combinedequipmentsaving.py +++ b/myems-api/reports/combinedequipmentsaving.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentsaving class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/combinedequipmentstatistics.py b/myems-api/reports/combinedequipmentstatistics.py index 9596154f..531a1c4b 100644 --- a/myems-api/reports/combinedequipmentstatistics.py +++ b/myems-api/reports/combinedequipmentstatistics.py @@ -11,6 +11,7 @@ import excelexporters.combinedequipmentstatistics class Reporting: @staticmethod def __init__(): + """Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/dashboard.py b/myems-api/reports/dashboard.py index d693c360..844a0d7c 100644 --- a/myems-api/reports/dashboard.py +++ b/myems-api/reports/dashboard.py @@ -10,6 +10,7 @@ from decimal import Decimal class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/distributionsystem.py b/myems-api/reports/distributionsystem.py index f7a6dff8..5c739357 100644 --- a/myems-api/reports/distributionsystem.py +++ b/myems-api/reports/distributionsystem.py @@ -8,6 +8,7 @@ from datetime import datetime, timedelta, timezone class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/energyflowdiagram.py b/myems-api/reports/energyflowdiagram.py index a3cf3fb4..4723d475 100644 --- a/myems-api/reports/energyflowdiagram.py +++ b/myems-api/reports/energyflowdiagram.py @@ -10,6 +10,7 @@ import config class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentbatch.py b/myems-api/reports/equipmentbatch.py index 8ab8a622..38c17e1d 100644 --- a/myems-api/reports/equipmentbatch.py +++ b/myems-api/reports/equipmentbatch.py @@ -11,6 +11,7 @@ import excelexporters.equipmentbatch class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentcost.py b/myems-api/reports/equipmentcost.py index 46e34253..26706313 100644 --- a/myems-api/reports/equipmentcost.py +++ b/myems-api/reports/equipmentcost.py @@ -11,6 +11,7 @@ import excelexporters.equipmentcost class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/equipmentefficiency.py b/myems-api/reports/equipmentefficiency.py index ff504823..ce882a25 100644 --- a/myems-api/reports/equipmentefficiency.py +++ b/myems-api/reports/equipmentefficiency.py @@ -11,6 +11,7 @@ import excelexporters.equipmentefficiency class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentenergycategory.py b/myems-api/reports/equipmentenergycategory.py index f380fc4f..331a0466 100644 --- a/myems-api/reports/equipmentenergycategory.py +++ b/myems-api/reports/equipmentenergycategory.py @@ -11,6 +11,7 @@ import excelexporters.equipmentenergycategory class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/equipmentenergyitem.py b/myems-api/reports/equipmentenergyitem.py index bdf1b2fe..3ed11fbb 100644 --- a/myems-api/reports/equipmentenergyitem.py +++ b/myems-api/reports/equipmentenergyitem.py @@ -11,6 +11,7 @@ import excelexporters.equipmentenergyitem class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentincome.py b/myems-api/reports/equipmentincome.py index 0c1234d4..8c9efb77 100644 --- a/myems-api/reports/equipmentincome.py +++ b/myems-api/reports/equipmentincome.py @@ -11,6 +11,7 @@ import excelexporters.equipmentincome class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentload.py b/myems-api/reports/equipmentload.py index 622d1bb0..f14ce0e2 100644 --- a/myems-api/reports/equipmentload.py +++ b/myems-api/reports/equipmentload.py @@ -11,6 +11,7 @@ import excelexporters.equipmentload class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentoutput.py b/myems-api/reports/equipmentoutput.py index 9bbdbec1..c6789fdf 100644 --- a/myems-api/reports/equipmentoutput.py +++ b/myems-api/reports/equipmentoutput.py @@ -11,6 +11,7 @@ import excelexporters.equipmentoutput class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentsaving.py b/myems-api/reports/equipmentsaving.py index a3e7cd35..bf3cc013 100644 --- a/myems-api/reports/equipmentsaving.py +++ b/myems-api/reports/equipmentsaving.py @@ -11,6 +11,7 @@ import excelexporters.equipmentsaving class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmentstatistics.py b/myems-api/reports/equipmentstatistics.py index 804f2671..214ac8ae 100644 --- a/myems-api/reports/equipmentstatistics.py +++ b/myems-api/reports/equipmentstatistics.py @@ -11,6 +11,7 @@ import excelexporters.equipmentstatistics class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/equipmenttracking.py b/myems-api/reports/equipmenttracking.py index b790d21d..c231857d 100644 --- a/myems-api/reports/equipmenttracking.py +++ b/myems-api/reports/equipmenttracking.py @@ -9,6 +9,7 @@ import excelexporters.equipmenttracking class Reporting: @staticmethod def __init__(): + """ Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/fddcombinedequipmentfault.py b/myems-api/reports/fddcombinedequipmentfault.py index 15336b63..65974313 100644 --- a/myems-api/reports/fddcombinedequipmentfault.py +++ b/myems-api/reports/fddcombinedequipmentfault.py @@ -5,6 +5,7 @@ import simplejson as json class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/fddequipmentfault.py b/myems-api/reports/fddequipmentfault.py index 15336b63..65974313 100644 --- a/myems-api/reports/fddequipmentfault.py +++ b/myems-api/reports/fddequipmentfault.py @@ -5,6 +5,7 @@ import simplejson as json class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/fddshopfloorfault.py b/myems-api/reports/fddshopfloorfault.py index 15336b63..65974313 100644 --- a/myems-api/reports/fddshopfloorfault.py +++ b/myems-api/reports/fddshopfloorfault.py @@ -5,6 +5,7 @@ import simplejson as json class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/fddspacefault.py b/myems-api/reports/fddspacefault.py index 15336b63..65974313 100644 --- a/myems-api/reports/fddspacefault.py +++ b/myems-api/reports/fddspacefault.py @@ -5,6 +5,7 @@ import simplejson as json class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/fddstorefault.py b/myems-api/reports/fddstorefault.py index 15336b63..9acc4faa 100644 --- a/myems-api/reports/fddstorefault.py +++ b/myems-api/reports/fddstorefault.py @@ -5,6 +5,7 @@ import simplejson as json class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/fddtenantfault.py b/myems-api/reports/fddtenantfault.py index 15336b63..65974313 100644 --- a/myems-api/reports/fddtenantfault.py +++ b/myems-api/reports/fddtenantfault.py @@ -5,6 +5,7 @@ import simplejson as json class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/meterbatch.py b/myems-api/reports/meterbatch.py index 2a81959c..53161df4 100644 --- a/myems-api/reports/meterbatch.py +++ b/myems-api/reports/meterbatch.py @@ -10,6 +10,7 @@ import excelexporters.meterbatch class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/metercost.py b/myems-api/reports/metercost.py index 7c3c7085..4a528e57 100644 --- a/myems-api/reports/metercost.py +++ b/myems-api/reports/metercost.py @@ -11,6 +11,7 @@ import excelexporters.metercost class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/meterenergy.py b/myems-api/reports/meterenergy.py index 6b452596..4c6625d0 100644 --- a/myems-api/reports/meterenergy.py +++ b/myems-api/reports/meterenergy.py @@ -11,6 +11,7 @@ import excelexporters.meterenergy class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/meterrealtime.py b/myems-api/reports/meterrealtime.py index 92eccfd0..5f895354 100644 --- a/myems-api/reports/meterrealtime.py +++ b/myems-api/reports/meterrealtime.py @@ -8,6 +8,7 @@ from datetime import datetime, timedelta, timezone class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/metersubmetersbalance.py b/myems-api/reports/metersubmetersbalance.py index 791d36c7..04477afb 100644 --- a/myems-api/reports/metersubmetersbalance.py +++ b/myems-api/reports/metersubmetersbalance.py @@ -11,6 +11,7 @@ import excelexporters.metersubmetersbalance class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/metertracking.py b/myems-api/reports/metertracking.py index 5023a612..d45cf8d9 100644 --- a/myems-api/reports/metertracking.py +++ b/myems-api/reports/metertracking.py @@ -10,6 +10,7 @@ from datetime import datetime, timedelta, timezone class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/metertrend.py b/myems-api/reports/metertrend.py index b6e97d71..4ef8fc2d 100644 --- a/myems-api/reports/metertrend.py +++ b/myems-api/reports/metertrend.py @@ -10,6 +10,7 @@ import excelexporters.metertrend class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/offlinemetercost.py b/myems-api/reports/offlinemetercost.py index e1776a42..deac662c 100644 --- a/myems-api/reports/offlinemetercost.py +++ b/myems-api/reports/offlinemetercost.py @@ -11,6 +11,7 @@ import excelexporters.offlinemetercost class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/offlinemeterenergy.py b/myems-api/reports/offlinemeterenergy.py index 410eef15..8db9ad16 100644 --- a/myems-api/reports/offlinemeterenergy.py +++ b/myems-api/reports/offlinemeterenergy.py @@ -11,6 +11,7 @@ import excelexporters.offlinemeterenergy class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/shopfloorbatch.py b/myems-api/reports/shopfloorbatch.py index a58a4aaa..080eb200 100644 --- a/myems-api/reports/shopfloorbatch.py +++ b/myems-api/reports/shopfloorbatch.py @@ -11,6 +11,7 @@ import excelexporters.shopfloorbatch class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/shopfloorcost.py b/myems-api/reports/shopfloorcost.py index 3754f1ee..be6355d5 100644 --- a/myems-api/reports/shopfloorcost.py +++ b/myems-api/reports/shopfloorcost.py @@ -11,6 +11,7 @@ import excelexporters.shopfloorcost class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/shopfloorenergycategory.py b/myems-api/reports/shopfloorenergycategory.py index 82ce06d2..279c6412 100644 --- a/myems-api/reports/shopfloorenergycategory.py +++ b/myems-api/reports/shopfloorenergycategory.py @@ -11,6 +11,7 @@ import excelexporters.shopfloorenergycategory class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/shopfloorenergyitem.py b/myems-api/reports/shopfloorenergyitem.py index 18599a21..7a77eab3 100644 --- a/myems-api/reports/shopfloorenergyitem.py +++ b/myems-api/reports/shopfloorenergyitem.py @@ -11,6 +11,7 @@ import excelexporters.shopfloorenergyitem class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/shopfloorload.py b/myems-api/reports/shopfloorload.py index 18afa989..cdee1aba 100644 --- a/myems-api/reports/shopfloorload.py +++ b/myems-api/reports/shopfloorload.py @@ -11,6 +11,7 @@ import excelexporters.shopfloorload class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/shopfloorsaving.py b/myems-api/reports/shopfloorsaving.py index c6df8405..9a97a4f1 100644 --- a/myems-api/reports/shopfloorsaving.py +++ b/myems-api/reports/shopfloorsaving.py @@ -11,6 +11,7 @@ import excelexporters.shopfloorsaving class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/shopfloorstatistics.py b/myems-api/reports/shopfloorstatistics.py index e85a4b68..30dc1957 100644 --- a/myems-api/reports/shopfloorstatistics.py +++ b/myems-api/reports/shopfloorstatistics.py @@ -11,6 +11,7 @@ import excelexporters.shopfloorstatistics class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/spacecost.py b/myems-api/reports/spacecost.py index 57f75fee..44239857 100644 --- a/myems-api/reports/spacecost.py +++ b/myems-api/reports/spacecost.py @@ -11,6 +11,7 @@ import excelexporters.spacecost class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/spaceefficiency.py b/myems-api/reports/spaceefficiency.py index d719b108..7b95cf39 100644 --- a/myems-api/reports/spaceefficiency.py +++ b/myems-api/reports/spaceefficiency.py @@ -11,6 +11,7 @@ import excelexporters.spaceefficiency class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/spaceenergycategory.py b/myems-api/reports/spaceenergycategory.py index f1f23bd0..f2961888 100644 --- a/myems-api/reports/spaceenergycategory.py +++ b/myems-api/reports/spaceenergycategory.py @@ -11,6 +11,7 @@ import excelexporters.spaceenergycategory class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/spaceenergyitem.py b/myems-api/reports/spaceenergyitem.py index bcb29ad8..c53c554b 100644 --- a/myems-api/reports/spaceenergyitem.py +++ b/myems-api/reports/spaceenergyitem.py @@ -11,6 +11,7 @@ import excelexporters.spaceenergyitem class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/spaceincome.py b/myems-api/reports/spaceincome.py index 66951485..bf56b4ab 100644 --- a/myems-api/reports/spaceincome.py +++ b/myems-api/reports/spaceincome.py @@ -11,6 +11,7 @@ import excelexporters.spaceincome class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/spaceload.py b/myems-api/reports/spaceload.py index 0ff06e40..9d5aafd1 100644 --- a/myems-api/reports/spaceload.py +++ b/myems-api/reports/spaceload.py @@ -11,6 +11,7 @@ import excelexporters.spaceload class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/spaceoutput.py b/myems-api/reports/spaceoutput.py index e3da5da5..3081ed77 100644 --- a/myems-api/reports/spaceoutput.py +++ b/myems-api/reports/spaceoutput.py @@ -11,6 +11,7 @@ import excelexporters.spaceoutput class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/spacesaving.py b/myems-api/reports/spacesaving.py index 9821e4e3..0bb185bb 100644 --- a/myems-api/reports/spacesaving.py +++ b/myems-api/reports/spacesaving.py @@ -11,6 +11,7 @@ import excelexporters.spacesaving class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/spacestatistics.py b/myems-api/reports/spacestatistics.py index 72c059a3..90aa5fdb 100644 --- a/myems-api/reports/spacestatistics.py +++ b/myems-api/reports/spacestatistics.py @@ -11,6 +11,7 @@ import excelexporters.spacestatistics class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/storebatch.py b/myems-api/reports/storebatch.py index 46a18de9..d0368f24 100644 --- a/myems-api/reports/storebatch.py +++ b/myems-api/reports/storebatch.py @@ -11,6 +11,7 @@ import excelexporters.storebatch class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/storecost.py b/myems-api/reports/storecost.py index db5a8153..1f03ab2b 100644 --- a/myems-api/reports/storecost.py +++ b/myems-api/reports/storecost.py @@ -11,6 +11,7 @@ import excelexporters.storecost class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/storeenergycategory.py b/myems-api/reports/storeenergycategory.py index d794586a..aacbcf81 100644 --- a/myems-api/reports/storeenergycategory.py +++ b/myems-api/reports/storeenergycategory.py @@ -11,6 +11,7 @@ import excelexporters.storeenergycategory class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/storeenergyitem.py b/myems-api/reports/storeenergyitem.py index d0e6eae3..69b9dc68 100644 --- a/myems-api/reports/storeenergyitem.py +++ b/myems-api/reports/storeenergyitem.py @@ -11,6 +11,7 @@ import excelexporters.storeenergyitem class Reporting: @staticmethod def __init__(): + """Initializes Class""" pass @staticmethod diff --git a/myems-api/reports/storeload.py b/myems-api/reports/storeload.py index 11031f8a..1be7f6d4 100644 --- a/myems-api/reports/storeload.py +++ b/myems-api/reports/storeload.py @@ -11,6 +11,7 @@ import excelexporters.storeload class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/storesaving.py b/myems-api/reports/storesaving.py index cd4df993..7c22f648 100644 --- a/myems-api/reports/storesaving.py +++ b/myems-api/reports/storesaving.py @@ -11,6 +11,7 @@ import excelexporters.storesaving class Reporting: @staticmethod def __init__(): + """ Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/storestatistics.py b/myems-api/reports/storestatistics.py index f6835b61..ef782eb3 100644 --- a/myems-api/reports/storestatistics.py +++ b/myems-api/reports/storestatistics.py @@ -12,6 +12,7 @@ from decimal import Decimal class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantbatch.py b/myems-api/reports/tenantbatch.py index d4f5b14a..a1ce4384 100644 --- a/myems-api/reports/tenantbatch.py +++ b/myems-api/reports/tenantbatch.py @@ -11,6 +11,7 @@ import excelexporters.tenantbatch class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantbill.py b/myems-api/reports/tenantbill.py index b0c4ca7a..a6381da6 100644 --- a/myems-api/reports/tenantbill.py +++ b/myems-api/reports/tenantbill.py @@ -11,6 +11,7 @@ import excelexporters.tenantbill class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantcost.py b/myems-api/reports/tenantcost.py index f8871102..3ea1f4f6 100644 --- a/myems-api/reports/tenantcost.py +++ b/myems-api/reports/tenantcost.py @@ -11,6 +11,7 @@ import excelexporters.tenantcost class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantenergycategory.py b/myems-api/reports/tenantenergycategory.py index 73c69794..6e9714e1 100644 --- a/myems-api/reports/tenantenergycategory.py +++ b/myems-api/reports/tenantenergycategory.py @@ -11,6 +11,7 @@ import excelexporters.tenantenergycategory class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantenergyitem.py b/myems-api/reports/tenantenergyitem.py index 3cf1f7da..fab9a0bf 100644 --- a/myems-api/reports/tenantenergyitem.py +++ b/myems-api/reports/tenantenergyitem.py @@ -11,6 +11,7 @@ import excelexporters.tenantenergyitem class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantload.py b/myems-api/reports/tenantload.py index b37a6860..fa6fe848 100644 --- a/myems-api/reports/tenantload.py +++ b/myems-api/reports/tenantload.py @@ -11,6 +11,7 @@ import excelexporters.tenantload class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantsaving.py b/myems-api/reports/tenantsaving.py index 46dd1645..103ea9c6 100644 --- a/myems-api/reports/tenantsaving.py +++ b/myems-api/reports/tenantsaving.py @@ -11,6 +11,7 @@ import excelexporters.tenantsaving class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/tenantstatistics.py b/myems-api/reports/tenantstatistics.py index b99fcfeb..49a4224d 100644 --- a/myems-api/reports/tenantstatistics.py +++ b/myems-api/reports/tenantstatistics.py @@ -11,6 +11,7 @@ import excelexporters.tenantstatistics class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/virtualmetercost.py b/myems-api/reports/virtualmetercost.py index eb1f1e0f..e8bc8a5a 100644 --- a/myems-api/reports/virtualmetercost.py +++ b/myems-api/reports/virtualmetercost.py @@ -11,6 +11,7 @@ import excelexporters.virtualmetercost class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod diff --git a/myems-api/reports/virtualmeterenergy.py b/myems-api/reports/virtualmeterenergy.py index 4adc2516..c3c0dec7 100644 --- a/myems-api/reports/virtualmeterenergy.py +++ b/myems-api/reports/virtualmeterenergy.py @@ -11,6 +11,7 @@ import excelexporters.virtualmeterenergy class Reporting: @staticmethod def __init__(): + """"Initializes Reporting""" pass @staticmethod From b389887b5070e98fffb4f40edd4b43278c70cc5b Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Wed, 25 Aug 2021 12:01:14 +0800 Subject: [PATCH 3/3] fixed PEP8 warnings in API --- .../space_energy_input_category.py | 6 ++++-- myems-aggregation/space_energy_input_item.py | 3 ++- .../space_energy_output_category.py | 7 ++++--- myems-api/app.py | 6 +++--- myems-api/core/combinedequipment.py | 16 +++++++-------- myems-api/core/distributioncircuit.py | 2 +- myems-api/core/equipment.py | 14 ++++++------- myems-api/core/meter.py | 10 +++++----- myems-api/core/offlinemeter.py | 8 ++++---- myems-api/core/sensor.py | 2 +- myems-api/core/shopfloor.py | 12 +++++------ myems-api/core/space.py | 20 +++++++++---------- myems-api/core/store.py | 18 ++++++++--------- myems-api/core/tenant.py | 18 ++++++++--------- myems-api/core/virtualmeter.py | 8 ++++---- myems-api/reports/metersubmetersbalance.py | 11 +++++----- myems-api/reports/tenantenergycategory.py | 7 +++---- 17 files changed, 86 insertions(+), 82 deletions(-) diff --git a/myems-aggregation/space_energy_input_category.py b/myems-aggregation/space_energy_input_category.py index ea05bcbe..dc145dbc 100644 --- a/myems-aggregation/space_energy_input_category.py +++ b/myems-aggregation/space_energy_input_category.py @@ -584,7 +584,8 @@ def worker(space): energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc] = dict() energy_category_id = row_value[1] actual_value = row_value[2] - energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_category_id] = actual_value + energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][ + energy_category_id] = actual_value except Exception as e: error_string = "Error in step 14 of space_energy_input_category.worker " + str(e) if cursor_energy_db: @@ -769,7 +770,8 @@ def worker(space): energy_child_space_hourly[child_space_id][current_datetime_utc] = dict() energy_category_id = row_energy_value[1] actual_value = row_energy_value[2] - energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] = actual_value + energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] \ + = actual_value except Exception as e: error_string = "Error in step 19 of space_energy_input_category.worker " + str(e) if cursor_energy_db: diff --git a/myems-aggregation/space_energy_input_item.py b/myems-aggregation/space_energy_input_item.py index 4589897e..2ebf7a0b 100644 --- a/myems-aggregation/space_energy_input_item.py +++ b/myems-aggregation/space_energy_input_item.py @@ -587,7 +587,8 @@ def worker(space): energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc] = dict() energy_item_id = row_value[1] actual_value = row_value[2] - energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_item_id] = actual_value + energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_item_id] \ + = actual_value except Exception as e: error_string = "Error in step 14 of space_energy_input_item.worker " + str(e) if cursor_energy_db: diff --git a/myems-aggregation/space_energy_output_category.py b/myems-aggregation/space_energy_output_category.py index 24cec572..f8aa7c5a 100644 --- a/myems-aggregation/space_energy_output_category.py +++ b/myems-aggregation/space_energy_output_category.py @@ -286,8 +286,8 @@ def worker(space): energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc] = dict() energy_category_id = row_value[1] actual_value = row_value[2] - energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_category_id] = \ - actual_value + energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][ + energy_category_id] = actual_value except Exception as e: error_string = "Error in step 5 of space_energy_output_category.worker " + str(e) if cursor_energy_db: @@ -361,7 +361,8 @@ def worker(space): energy_child_space_hourly[child_space_id][current_datetime_utc] = dict() energy_category_id = row_energy_value[1] actual_value = row_energy_value[2] - energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] = actual_value + energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] \ + = actual_value except Exception as e: error_string = "Error in step 7 of space_energy_output_category.worker " + str(e) if cursor_energy_db: diff --git a/myems-api/app.py b/myems-api/app.py index 5f90d078..458da0d1 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -3,9 +3,9 @@ from falcon_cors import CORS from falcon_multipart.middleware import MultipartMiddleware from core import energyflowdiagram, privilege, textmessage, distributioncircuit, virtualmeter, \ costcenter, point, knowledgefile, meter, gsmmodem, tariff, user, storetype, timezone, \ - costfile, offlinemeterfile, version, contact, emailserver, combinedequipment, datasource, equipment, tenant, shopfloor, \ - webmessage, distributionsystem, store, emailmessage, tenanttype, wechatmessage, space, gateway, offlinemeter, \ - rule, energycategory, sensor, energyitem, notification, menu + costfile, offlinemeterfile, version, contact, emailserver, combinedequipment, datasource, equipment, tenant, \ + shopfloor, webmessage, distributionsystem, store, emailmessage, tenanttype, wechatmessage, space, gateway, \ + offlinemeter, rule, energycategory, sensor, energyitem, notification, menu from reports import advancedreport from reports import distributionsystem as distributionsystemreport from reports import energyflowdiagram as energyflowdiagramreport diff --git a/myems-api/core/combinedequipment.py b/myems-api/core/combinedequipment.py index 97158f6a..b15d843a 100644 --- a/myems-api/core/combinedequipment.py +++ b/myems-api/core/combinedequipment.py @@ -89,8 +89,8 @@ class CombinedEquipmentCollection: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] if 'description' in new_values['data'].keys() and \ @@ -307,8 +307,8 @@ class CombinedEquipmentItem: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] if 'description' in new_values['data'].keys() and \ @@ -629,7 +629,7 @@ class CombinedEquipmentEquipmentItem: @staticmethod def on_options(req, resp, id_, eid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, eid): @@ -1503,7 +1503,7 @@ class CombinedEquipmentMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1692,7 +1692,7 @@ class CombinedEquipmentOfflineMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1881,7 +1881,7 @@ class CombinedEquipmentVirtualMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): diff --git a/myems-api/core/distributioncircuit.py b/myems-api/core/distributioncircuit.py index 5bbb54fa..9d4c655d 100644 --- a/myems-api/core/distributioncircuit.py +++ b/myems-api/core/distributioncircuit.py @@ -497,7 +497,7 @@ class DistributionCircuitPointItem: @staticmethod def on_options(req, resp, id_, pid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, pid): diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py index 086ddaf9..ee9f59aa 100644 --- a/myems-api/core/equipment.py +++ b/myems-api/core/equipment.py @@ -89,8 +89,8 @@ class EquipmentCollection: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] if 'description' in new_values['data'].keys() and \ @@ -320,8 +320,8 @@ class EquipmentItem: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] if 'description' in new_values['data'].keys() and \ @@ -1347,7 +1347,7 @@ class EquipmentMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1534,7 +1534,7 @@ class EquipmentOfflineMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1722,7 +1722,7 @@ class EquipmentVirtualMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py index f5edff57..19ff22d1 100644 --- a/myems-api/core/meter.py +++ b/myems-api/core/meter.py @@ -147,8 +147,8 @@ class MeterCollection: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] if 'energy_item_id' in new_values['data'].keys() and \ @@ -595,8 +595,8 @@ class MeterItem: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] @@ -955,7 +955,7 @@ class MeterPointItem: @staticmethod def on_options(req, resp, id_, pid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, pid): diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index 0892cf86..bd5806d1 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -133,8 +133,8 @@ class OfflineMeterCollection: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] @@ -518,8 +518,8 @@ class OfflineMeterItem: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] diff --git a/myems-api/core/sensor.py b/myems-api/core/sensor.py index 46a8a58f..068d63f7 100644 --- a/myems-api/core/sensor.py +++ b/myems-api/core/sensor.py @@ -377,7 +377,7 @@ class SensorPointItem: @staticmethod def on_options(req, resp, id_, pid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, pid): diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py index 11bc1e31..ac4ca2b6 100644 --- a/myems-api/core/shopfloor.py +++ b/myems-api/core/shopfloor.py @@ -628,7 +628,7 @@ class ShopfloorEquipmentItem: @staticmethod def on_options(req, resp, id_, eid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, eid): @@ -809,7 +809,7 @@ class ShopfloorMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -989,7 +989,7 @@ class ShopfloorOfflineMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1169,7 +1169,7 @@ class ShopfloorPointItem: @staticmethod def on_options(req, resp, id_, pid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, pid): @@ -1336,7 +1336,7 @@ class ShopfloorSensorItem: @staticmethod def on_options(req, resp, id_, sid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, sid): @@ -1516,7 +1516,7 @@ class ShopfloorVirtualMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): diff --git a/myems-api/core/space.py b/myems-api/core/space.py index f8974679..e2253e33 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -925,7 +925,7 @@ class SpaceCombinedEquipmentItem: @staticmethod def on_options(req, resp, id_, eid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, eid): @@ -1092,7 +1092,7 @@ class SpaceEquipmentItem: @staticmethod def on_options(req, resp, id_, eid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, eid): @@ -1272,7 +1272,7 @@ class SpaceMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1454,7 +1454,7 @@ class SpaceOfflineMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1634,7 +1634,7 @@ class SpacePointItem: @staticmethod def on_options(req, resp, id_, pid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, pid): @@ -1801,7 +1801,7 @@ class SpaceSensorItem: @staticmethod def on_options(req, resp, id_, sid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, sid): @@ -1967,7 +1967,7 @@ class SpaceShopfloorItem: @staticmethod def on_options(req, resp, id_, sid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, sid): @@ -2133,7 +2133,7 @@ class SpaceStoreItem: @staticmethod def on_options(req, resp, id_, tid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, tid): @@ -2299,7 +2299,7 @@ class SpaceTenantItem: @staticmethod def on_options(req, resp, id_, tid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, tid): @@ -2479,7 +2479,7 @@ class SpaceVirtualMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): diff --git a/myems-api/core/store.py b/myems-api/core/store.py index cc24dda3..91d58a27 100644 --- a/myems-api/core/store.py +++ b/myems-api/core/store.py @@ -150,15 +150,15 @@ class StoreCollection: if 'contact_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['contact_id'], int) or \ new_values['data']['contact_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_CONTACT_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_CONTACT_ID') contact_id = new_values['data']['contact_id'] if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] if 'description' in new_values['data'].keys() and \ @@ -718,7 +718,7 @@ class StoreMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -898,7 +898,7 @@ class StoreOfflineMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1078,7 +1078,7 @@ class StorePointItem: @staticmethod def on_options(req, resp, id_, pid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, pid): @@ -1245,7 +1245,7 @@ class StoreSensorItem: @staticmethod def on_options(req, resp, id_, sid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, sid): @@ -1425,7 +1425,7 @@ class StoreVirtualMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): diff --git a/myems-api/core/tenant.py b/myems-api/core/tenant.py index 41a333bb..6878e3c9 100644 --- a/myems-api/core/tenant.py +++ b/myems-api/core/tenant.py @@ -195,15 +195,15 @@ class TenantCollection: if 'contact_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['contact_id'], int) or \ new_values['data']['contact_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_CONTACT_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_CONTACT_ID') contact_id = new_values['data']['contact_id'] if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] if 'description' in new_values['data'].keys() and \ @@ -815,7 +815,7 @@ class TenantMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -995,7 +995,7 @@ class TenantOfflineMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): @@ -1175,7 +1175,7 @@ class TenantPointItem: @staticmethod def on_options(req, resp, id_, pid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, pid): @@ -1342,7 +1342,7 @@ class TenantSensorItem: @staticmethod def on_options(req, resp, id_, sid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, sid): @@ -1522,7 +1522,7 @@ class TenantVirtualMeterItem: @staticmethod def on_options(req, resp, id_, mid): - resp.status = falcon.HTTP_200 + resp.status = falcon.HTTP_200 @staticmethod def on_delete(req, resp, id_, mid): diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index e49d2475..e7f55020 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -174,8 +174,8 @@ class VirtualMeterCollection: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] @@ -701,8 +701,8 @@ class VirtualMeterItem: if 'cost_center_id' not in new_values['data'].keys() or \ not isinstance(new_values['data']['cost_center_id'], int) or \ new_values['data']['cost_center_id'] <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_COST_CENTER_ID') + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_COST_CENTER_ID') cost_center_id = new_values['data']['cost_center_id'] diff --git a/myems-api/reports/metersubmetersbalance.py b/myems-api/reports/metersubmetersbalance.py index 04477afb..e575cfe8 100644 --- a/myems-api/reports/metersubmetersbalance.py +++ b/myems-api/reports/metersubmetersbalance.py @@ -334,10 +334,11 @@ class Reporting: } # export result to Excel file and then encode the file to base64 string - result['excel_bytes_base64'] = excelexporters.metersubmetersbalance.export(result, - master_meter['name'], - reporting_period_start_datetime_local, - reporting_period_end_datetime_local, - period_type) + result['excel_bytes_base64'] = \ + excelexporters.metersubmetersbalance.export(result, + master_meter['name'], + reporting_period_start_datetime_local, + reporting_period_end_datetime_local, + period_type) resp.body = json.dumps(result) diff --git a/myems-api/reports/tenantenergycategory.py b/myems-api/reports/tenantenergycategory.py index 6e9714e1..3d268806 100644 --- a/myems-api/reports/tenantenergycategory.py +++ b/myems-api/reports/tenantenergycategory.py @@ -554,16 +554,15 @@ class Reporting: result['reporting_period']['increment_rate_in_kgce'] = \ (result['reporting_period']['total_in_kgce'] - result['base_period']['total_in_kgce']) / \ - result['base_period']['total_in_kgce'] \ - if result['base_period']['total_in_kgce'] > Decimal(0.0) else None + result['base_period']['total_in_kgce'] if result['base_period']['total_in_kgce'] > Decimal(0.0) else None result['reporting_period']['total_in_kgce_per_unit_area'] = \ result['reporting_period']['total_in_kgco2e'] / tenant['area'] if tenant['area'] > 0.0 else None result['reporting_period']['increment_rate_in_kgco2e'] = \ (result['reporting_period']['total_in_kgco2e'] - result['base_period']['total_in_kgco2e']) / \ - result['base_period']['total_in_kgco2e'] \ - if result['base_period']['total_in_kgco2e'] > Decimal(0.0) else None + result['base_period']['total_in_kgco2e'] if result['base_period']['total_in_kgco2e'] > Decimal(0.0)\ + else None result['parameters'] = { "names": parameters_data['names'],