유저설정 테스트 및 코드 정리 완료

INT69DB_2A/Forms/FormInformation.cs

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

INT69DB_2A/Forms/FormMenu.cs

@@ -410,20 +410,20 @@ namespace INT69DB_2A.Forms
                     this.buttonOption.Visible = true;
                     break;
                 case DataStore.UserGroup.NotLogin:
-                    this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInformation;
+                    this.buttonInformation.Enabled = true;
-                    this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuDataBackup;
+                    this.buttonDataBackup.Enabled = true;
-                    this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuConfiguration;
+                    this.buttonConfiguration.Enabled = true;
-                    this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCommunication;
+                    this.buttonCommunication.Enabled = true;
-                    this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCalibration;
+                    this.buttonCalibration.Enabled = true;
 
-                    this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuSystem;
+                    this.buttonSystem.Enabled = true;
-                    this.buttonMotor.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuMotor;
+                    this.buttonMotor.Enabled = true;
-                    this.buttonUpdate.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuUpdate;
+                    this.buttonUpdate.Enabled = true;
-                    this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization;
+                    this.buttonInitialization.Enabled = true;
-                    this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuIOTest;
+                    this.buttonIOTest.Enabled = true;
 
-                    this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment;
+                    this.buttonEquipment.Enabled = true;
-                    this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime;
+                    this.buttonTime.Enabled = true;
 
                     this.buttonDataViewer.Visible = false;
                     this.buttonDataStatistics.Visible = false;

INT69DB_2A/Forms/FormUserEditor.cs

@@ -338,6 +338,15 @@ namespace INT69DB_2A.Forms
             else
                 return Color.DarkGray;
         }
+        private string PasswordToAsterisk(string sValue)
+        {
+            string temp = "";
+
+            for (int i = 0; i < sValue.Length; i++)
+                temp += "*";
+
+            return temp;
+        }
         private void CheckBoxCheckedAsLevel(DataStore.UserGroup level)
         {
             switch (level)
@@ -475,6 +484,7 @@ namespace INT69DB_2A.Forms
             this.labelExpiryDateOfPassword2.Text = "yyyy.mm.DD";
 
             this.comboBoxAccessRight.Visible = true;
+            this.comboBoxAccessRight.Enabled = true;
             this.comboBoxAccessRight.BringToFront();
             this.UpdateAccessRightComboBoxDisplay();
             this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
@@ -587,8 +597,14 @@ namespace INT69DB_2A.Forms
         {
             this.SetEnableID(false);
 
+            // ID
             this.labelID.Text = item.ID;
+            // Password
+            if(item.Password == this.SelectedUserItem.ResetPW)
                 this.labelPassword.Text = item.Password;
+            else
+                this.labelPassword.Text = this.PasswordToAsterisk(item.Password);
+
             this.UpdateAccessRightDisplay(item.ActiveLevel);
             this.buttonSave.Visible = false;
 
@@ -1035,7 +1051,7 @@ namespace INT69DB_2A.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)
             {
@@ -1236,18 +1252,20 @@ namespace INT69DB_2A.Forms
             
             if (index == 0)
             {
-                this.SetEnablePassword(true);
-
                 UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
             }
             else if (index > 0)
             {
-                this.SetEnablePassword(false);
-
                 if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index].ToString())
-                    this.buttonDelete.Visible = false;
+                {
+                    this.SetEnablePassword(true);
+                    this.buttonResetPW.Visible = false;
+                }
                 else
-                    this.buttonDelete.Visible = true;
+                {
+                    this.SetEnablePassword(false);
+                    this.buttonResetPW.Visible = true;
+                }
 
                 UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
             }

INT69DB_2A/Version.txt

@@ -14,6 +14,17 @@
 	멀티형 2~6열 스틱 계량기
 */
 
+@ Ver 5.2.0 by CJY
+	- 2024.08.20
+	- Ver 5.1.0 Modify
+	- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
+	- FormMenu 
+	  UpdateDisplayMenuAccess()
+	  NotLogin 수정
+            - 유저설정
+              Level3 본인에 한해서 비밀번호 변경 가능하도록 수정
+              admin을 제외한 다른 유저는 Reset만 가능
+
 @ Ver 5.1.0 by LSJ
 	- 2023.12.28
 	- Ver 5.0.1 Modify

INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Debug/INT69DB_2A_ImageDll.csproj.FileListAbsolute.txt

@@ -1,14 +0,0 @@
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\bin\Debug\INT69DB_2A_ImageDll.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\bin\Debug\INT69DB_2A_ImageDll.pdb
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\ResolveAssemblyReference.cache
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.Resource1.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.csproj.GenerateResource.Cache
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.pdb
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\bin\Debug\INT69DB_2A_ImageDll.dll
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\bin\Debug\INT69DB_2A_ImageDll.pdb
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.Resource1.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.csproj.GenerateResource.Cache
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.dll
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\obj\Debug\INT69DB_2A_ImageDll.pdb