유저 패스워드 변경 관련 수정

로그인 미사용 시 메뉴접근 수정

INT69DC_7C/Forms/FormInformation.cs

@@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms
         }
         private void DefaultSetting()
         {
-            this.labelDisplayVer.Text = "11.3.0";
+            this.labelDisplayVer.Text = "11.4.0";
             if(this.ParentForm.SystemConfig.EquipmentMode == 7)
                 this.labelTitleMainboardName.Text = "INT68M-2A";
             else

INT69DC_7C/Forms/FormMenu.cs

@@ -495,21 +495,23 @@ namespace INT69DC_7C.Forms
                     break;
                 case DataStore.UserGroup.NotLogin:
                     #region NotLogin
-                    this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInformation;
+                    // true
-                    this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuDataBackup;
+                    this.buttonInformation.Enabled = true;
-                    this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuConfiguration;
+                    this.buttonDataBackup.Enabled = true;
-                    this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCommunication;
+                    this.buttonConfiguration.Enabled = true;
-                    this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCalibration;
+                    this.buttonCommunication.Enabled = true;
+                    this.buttonCalibration.Enabled = true;
 
-                    this.buttonSysConfig.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuSystem;
+                    this.buttonSysConfig.Enabled = true;
-                    this.buttonMotorSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuMotor;
+                    this.buttonMotorSetting.Enabled = true;
-                    this.buttonUpdate.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuUpdate;
+                    this.buttonUpdate.Enabled = true;
-                    this.buttonFactoryInitialize.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization;
+                    this.buttonFactoryInitialize.Enabled = true;
-                    this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuIOTest;
+                    this.buttonIOTest.Enabled = true;
-
-                    this.buttonEquipmentSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment;
-                    this.buttonTimeSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime;
 
+                    this.buttonEquipmentSetting.Enabled = true;
+                    this.buttonTimeSetting.Enabled = true;
+                    
+                    // false
                     this.buttonEquipmentTest.Visible = false;
                     this.buttonOptionSetting.Visible = false;
                     this.buttonUser.Enabled = false;

INT69DC_7C/Forms/FormUserEditor.cs

@@ -613,10 +613,22 @@ namespace INT69DC_7C.Forms
         }
         private void UpdateSelectUserDisplay(UserItem item)
         {
+            string pass = "";
             this.SetEnableID(false);
 
+            // ID
             this.labelID.Text = item.ID;
-            this.labelPassword.Text = item.Password;
+            // Password
+            if (this.SelectedUserItem.IsFirstPassword == 1)
+                this.labelPassword.Text = item.Password;
+            else
+            {
+                for (int i = 0; i < item.Password.Length; i++)
+                    pass = pass + '*';
+
+                this.labelPassword.Text = pass;
+            }
+            
             this.UpdateAccessRightDisplay(item.ActiveLevel);
             this.buttonSave.Visible = false;
 
@@ -1055,7 +1067,7 @@ namespace INT69DC_7C.Forms
         private void labelPassword_Click(object sender, EventArgs e)
         {
             string value = "";
-            DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text);
+            DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.SelectedUserItem.Password);
             if (keyboard.ShowDialog() == DialogResult.OK)
             {
                 value = keyboard.RetStringValue;
@@ -1258,12 +1270,19 @@ namespace INT69DC_7C.Forms
             }
             else if (index > 0)
             {
-                this.SetEnablePassword(false);
 
                 if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index].ToString())
+                {
+                    this.SetEnablePassword(true);
                     this.buttonDelete.Visible = false;
+                    this.buttonResetPW.Visible = false;
+                }
                 else
+                {
+                    this.SetEnablePassword(false);
                     this.buttonDelete.Visible = true;
+                    this.buttonResetPW.Visible = true;
+                }
 
                 UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
             }

INT69DC_7C/Version.txt

@@ -15,6 +15,14 @@
 	멀티형 8,10,12열 컨베어/스틱 계량기
 */
 
+@ Ver 11.4.0 by LSJ
+	- 2024.08.20
+	- Ver 11.3.0 Modify
+	- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
+	- FormMenu 
+	  UpdateDisplayMenuAccess()
+	   NotLogin ¼öÁ¤
+
 @ Ver 11.3.0 by LSJ
 	- 2024.08.14
 	- Ver 11.2.1 Modify