Merge branch 'develop'

database/install/myems_fdd_db.sql

@@ -123,7 +123,7 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_web_messages` (
   `priority` VARCHAR(128) NOT NULL COMMENT 'CRITICAL, HIGH, MEDIUM, LOW',
   `message` LONGTEXT NOT NULL,
   `created_datetime_utc` DATETIME NOT NULL,
-  `status` VARCHAR(32) NOT NULL COMMENT 'new, acknowledged, timeout',
+  `status` VARCHAR(32) NOT NULL COMMENT 'new, acknowledged, read',
   `reply` LONGTEXT NULL,
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_web_messages_index_1` ON  `myems_fdd_db`.`tbl_web_messages`  (`user_id`, `status`, `created_datetime_utc`);

database/install/myems_user_db.sql

@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_users` (
   `privilege_id` BIGINT NULL,
   `account_expiration_datetime_utc` DATETIME NOT NULL,
   `password_expiration_datetime_utc` DATETIME NOT NULL,
-  `failed_login_count` INT NOT NULL,
+  `failed_login_count` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`));
 
   -- --------------------------------------------------------------------------------------------------------------------

database/upgrade/upgrade1.7.1.sql

@@ -0,0 +1,12 @@
+START TRANSACTION;
+
+ALTER TABLE `myems_user_db`.`tbl_users`
+MODIFY COLUMN `failed_login_count` int(11) ZEROFILL NOT NULL DEFAULT 0 AFTER `password_expiration_datetime_utc`;
+
+ALTER TABLE `myems_fdd_db`.`tbl_web_messages`
+MODIFY COLUMN `status` varchar(32) NOT NULL COMMENT 'new, acknowledged, read' AFTER `created_datetime_utc`;
+
+-- UPDATE VERSION NUMBER
+UPDATE myems_system_db.tbl_versions SET version='1.7.1', release_date='2022-02-11' WHERE id=1;
+
+COMMIT;

web/src/components/MyEMS/Meter/MeterEnergy.js

@@ -428,6 +428,8 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
         
       } else {
         toast.error(json.description)
+        setSpinnerHidden(true);
+        setSubmitButtonDisabled(false);
       }
     }).catch(err => {
       console.log(err);