- (버그수정)단순 로그인 기능 사용 시, admin 비번 변경하면 Level1로 변하는 버그 수정 -> 수정 안되어있어서 수정함

INT69DB_2A/Forms/FormInformation.cs

@@ -113,7 +113,7 @@ namespace INT69DB_2A.Forms
         }
         private void DefaultSetting()
         {
-            this.labelDisplayVer.Text = "6.6.1";
+            this.labelDisplayVer.Text = "6.6.2";
             this.labelUserMgerVer.Text = "";
             this.labelAes128Ver.Text = "";
             this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;

INT69DB_2A/Forms/FormMotorSetting.Designer.cs

@@ -128,7 +128,6 @@
             this.buttonCom1TestForward = new SmartX.SmartButton();
             this.buttonCom1TestReverse = new SmartX.SmartButton();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.radioButtonImpellerMotorAngle180180 = new SmartX.SmartRadioButton();
             ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
             this.groupBoxSelectImpeller.SuspendLayout();
             this.groupBoxEach.SuspendLayout();

INT69DB_2A/Forms/FormUserEditor.cs

@@ -28,6 +28,7 @@ namespace INT69DB_2A.Forms
 
         private string BeforeID;
         private string BeforePassword;
+        private string CurrentUserPassword;
         #endregion
 
         #region Constructor
@@ -164,6 +165,7 @@ namespace INT69DB_2A.Forms
             this.PasswordChar = false;
             this.BeforeID = "";
             this.BeforePassword = "";
+            this.CurrentUserPassword = "Password12!";
 
             this.UpdateAccessRightComboBoxDisplay();
             this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
@@ -251,6 +253,7 @@ namespace INT69DB_2A.Forms
             else
                 isNewReg = false;
 
+            #region listbox 미선택 시 신규 유저 등록, 선택 시 기존 유저 정보 수정
             if (isNewReg == true)
             {
                 switch (this.ParentForm.SystemConfig.Language)
@@ -327,6 +330,7 @@ namespace INT69DB_2A.Forms
                         break;
                 }
             }
+            #endregion
 
             DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2);
             if (dlg.ShowDialog() == DialogResult.Yes)
@@ -360,22 +364,27 @@ namespace INT69DB_2A.Forms
                 #endregion
 
                 item.ID = this.labelID.Text;
-                item.Password = this.labelPassword.Text;
+                if (isNewReg == true)
-                item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text);
+                    item.Password = this.SelectedUserItem.ResetPW;
-                item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text);
+                else
-
+                    item.Password = this.CurrentUserPassword;
-                //item.IsAdmin = this.cbAdministrator.Checked;
+                if (this.ParentForm.SystemConfig.IsPart11 == true)
-
-                if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin)
                 {
-                    if (this.ParentForm.SystemConfig.IsPart11 == true)
+                    item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text);
-                        item.ActiveLevel = 9;
+                    item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text);
                 }
                 else
                 {
-                    item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1;
+                    item.ExpireId = -1;
+                    item.ExpirePassword = -1;
                 }
 
+                //item.IsAdmin = this.cbAdministrator.Checked;
+                if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin)
+                    item.ActiveLevel = 9;
+                else
+                    item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1;
+
                 menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX];
                 for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++)
                     menuId.fMenu[i] = false;
@@ -403,6 +412,8 @@ namespace INT69DB_2A.Forms
 
                 //UserManager.UserManager_AutoLogoutSetTimeout(this.ParentForm.ParentForm.SystemConfig.AUTOMATIC_LOGOUT, this.ParentForm.ParentForm.FlagAutomaticLogoutWarningTime);
                 #endregion
+
+                this.buttonSave.Visible = false;
             }
         }
         private void UserNew()
@@ -696,6 +707,7 @@ namespace INT69DB_2A.Forms
                 this.labelPassword.Text = item.Password;
             else
                 this.labelPassword.Text = this.PasswordToAsterisk(item.Password);
+            this.CurrentUserPassword = item.Password;
 
             this.UpdateAccessRightDisplay(item.ActiveLevel);
             this.buttonSave.Visible = false;

INT69DB_2A/Version.txt

@@ -15,6 +15,11 @@
 	멀티형 2~6열 스틱 계량기
 */
 
+@ Ver 6.6.2 by CJY
+	- 2026.03.12
+	- Ver 6.6.1 Modify
+	- (버그수정)단순 로그인 기능 사용 시, admin 비번 변경하면 Level1로 변하는 버그 수정 -> 수정 안되어있어서 수정함
+
 @ Ver 6.6.1 by LSJ
 	- 2026.01.16
 	- Ver 6.6.0 Modify
@@ -138,7 +143,6 @@
         -> draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
       627/2 = 313
       627/16 = 39
->>>>>>> 5d6775a ( - ?<3F>í…Œ?¬íŒ© ?”ì²­?¬í•­ 추ê?)
 
 @ Ver 5.2.1 by CJY
 	- 2024.08.21