From 3690d0e02b94241dbfb7ade2ae1e98b7d0b4c88c Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Thu, 10 Feb 2022 20:36:01 +0800
Subject: [PATCH 1/4] fixed issue 192

---
 web/src/components/MyEMS/Meter/MeterEnergy.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js
index a73efc15..e8a5b0ba 100644
--- a/web/src/components/MyEMS/Meter/MeterEnergy.js
+++ b/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);
@@ -583,7 +585,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
                 <FormGroup>
                   <br></br>
                   <ButtonGroup id="submit">
-                    <Button color="success" disabled={submitButtonDisabled} >{t('Submit')}</Button>
+                      <Button color="success" disabled={submitButtonDisabled} >{t('Submit')}</Button>
                   </ButtonGroup>
                 </FormGroup>
               </Col>

From 154a2a859e7195b1e536a11c170c209251d591a2 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Thu, 10 Feb 2022 20:37:40 +0800
Subject: [PATCH 2/4] fixed issue 192

---
 web/src/components/MyEMS/Meter/MeterEnergy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js
index e8a5b0ba..69076d48 100644
--- a/web/src/components/MyEMS/Meter/MeterEnergy.js
+++ b/web/src/components/MyEMS/Meter/MeterEnergy.js
@@ -585,7 +585,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
                 <FormGroup>
                   <br></br>
                   <ButtonGroup id="submit">
-                      <Button color="success" disabled={submitButtonDisabled} >{t('Submit')}</Button>
+                    <Button color="success" disabled={submitButtonDisabled} >{t('Submit')}</Button>
                   </ButtonGroup>
                 </FormGroup>
               </Col>

From 03eb3ba94bde0889a72b98a85299d58911e6cd5f Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Fri, 11 Feb 2022 14:58:37 +0800
Subject: [PATCH 3/4] fixed issue tbl_users in database

---
 database/install/myems_user_db.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/install/myems_user_db.sql b/database/install/myems_user_db.sql
index b3ff84bd..e890f55b 100644
--- a/database/install/myems_user_db.sql
+++ b/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`));
 
   -- --------------------------------------------------------------------------------------------------------------------

From b721dfdd2af57398a3bc559dd8ce8c0442fcb19b Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Fri, 11 Feb 2022 15:07:41 +0800
Subject: [PATCH 4/4] updated comment of tbl_web_messages in database

---
 database/install/myems_fdd_db.sql |  2 +-
 database/upgrade/upgrade1.7.1.sql | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 database/upgrade/upgrade1.7.1.sql

diff --git a/database/install/myems_fdd_db.sql b/database/install/myems_fdd_db.sql
index a0694cfa..43f4c551 100644
--- a/database/install/myems_fdd_db.sql
+++ b/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`);
diff --git a/database/upgrade/upgrade1.7.1.sql b/database/upgrade/upgrade1.7.1.sql
new file mode 100644
index 00000000..63154db7
--- /dev/null
+++ b/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;
\ No newline at end of file