- (버그수정) Part11이 아닌 로그인 사용 시, 만료일 뜨는 버그 수정
- (버그수정) Password가 label - *로 표시되어 생기는 버그 수정master
parent
33c01ae072
commit
1ba15c0319
|
@ -142,7 +142,7 @@ namespace INT69DC_7C.Forms
|
||||||
}
|
}
|
||||||
private void DefaultSetting()
|
private void DefaultSetting()
|
||||||
{
|
{
|
||||||
this.labelDisplayVer.Text = "12.3.0";
|
this.labelDisplayVer.Text = "12.3.1";
|
||||||
|
|
||||||
if(this.ParentForm.SystemConfig.EquipmentMode == 7)
|
if(this.ParentForm.SystemConfig.EquipmentMode == 7)
|
||||||
this.labelTitleMainboardName.Text = "INT68M-2A";
|
this.labelTitleMainboardName.Text = "INT68M-2A";
|
||||||
|
|
|
@ -12041,6 +12041,12 @@ namespace INT69DC_7C.Forms
|
||||||
{
|
{
|
||||||
this.InitializeUserManager();
|
this.InitializeUserManager();
|
||||||
this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.LogOut;
|
this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.LogOut;
|
||||||
|
|
||||||
|
if (this.SystemConfig.IsOptPart11 == false)
|
||||||
|
UserManager.UserManager_AutoLogoutTimeoutPause();
|
||||||
|
|
||||||
|
// UserManager_GetUserListName
|
||||||
|
this.timerUserList.Enabled = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.NotLogin;
|
this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.NotLogin;
|
||||||
|
@ -12048,6 +12054,7 @@ namespace INT69DC_7C.Forms
|
||||||
if (this.SystemConfig.IsOptPart11 == true)
|
if (this.SystemConfig.IsOptPart11 == true)
|
||||||
{
|
{
|
||||||
this.InitializeAES();
|
this.InitializeAES();
|
||||||
|
this.SetTrackingHistoryData(DataStore.TrackingOperation.PowerOn, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 폼생성
|
// 폼생성
|
||||||
|
@ -12077,9 +12084,6 @@ namespace INT69DC_7C.Forms
|
||||||
|
|
||||||
if (this.SystemConfig.IsOptFeedbackBoardUse == true && this.SystemConfig.Serial3Mode == 4)
|
if (this.SystemConfig.IsOptFeedbackBoardUse == true && this.SystemConfig.Serial3Mode == 4)
|
||||||
this.UartCom3FeedbackBoardBooting();
|
this.UartCom3FeedbackBoardBooting();
|
||||||
|
|
||||||
// UserManager_GetUserListName
|
|
||||||
this.timerUserList.Enabled = true;
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@ namespace INT69DC_7C.Forms
|
||||||
|
|
||||||
private string BeforeID;
|
private string BeforeID;
|
||||||
private string BeforePassword;
|
private string BeforePassword;
|
||||||
|
private string CurrentUserPassword;
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Constructor
|
#region Constructor
|
||||||
|
@ -133,6 +134,7 @@ namespace INT69DC_7C.Forms
|
||||||
this.PasswordChar = false;
|
this.PasswordChar = false;
|
||||||
this.BeforeID = "";
|
this.BeforeID = "";
|
||||||
this.BeforePassword = "";
|
this.BeforePassword = "";
|
||||||
|
this.CurrentUserPassword = "";
|
||||||
|
|
||||||
this.UpdateAccessRightComboBoxDisplay();
|
this.UpdateAccessRightComboBoxDisplay();
|
||||||
this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
|
this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
|
||||||
|
@ -317,20 +319,24 @@ namespace INT69DC_7C.Forms
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
item.ID = this.labelID.Text;
|
item.ID = this.labelID.Text;
|
||||||
item.Password = this.labelPassword.Text;
|
item.Password = this.CurrentUserPassword;
|
||||||
item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text);
|
if (this.ParentForm.SystemConfig.IsOptPart11 == true)
|
||||||
item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text);
|
{
|
||||||
|
item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text);
|
||||||
|
item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
item.ExpireId = 0;
|
||||||
|
item.ExpirePassword = 0;
|
||||||
|
}
|
||||||
|
|
||||||
//item.IsAdmin = this.cbAdministrator.Checked;
|
//item.IsAdmin = this.cbAdministrator.Checked;
|
||||||
|
|
||||||
if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin)
|
if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin)
|
||||||
{
|
|
||||||
item.ActiveLevel = 9;
|
item.ActiveLevel = 9;
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1;
|
item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1;
|
||||||
}
|
|
||||||
|
|
||||||
menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX];
|
menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX];
|
||||||
for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++)
|
for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++)
|
||||||
|
@ -647,6 +653,7 @@ namespace INT69DC_7C.Forms
|
||||||
this.labelPassword.Text = item.Password;
|
this.labelPassword.Text = item.Password;
|
||||||
else
|
else
|
||||||
this.labelPassword.Text = this.PasswordToAsterisk(item.Password);
|
this.labelPassword.Text = this.PasswordToAsterisk(item.Password);
|
||||||
|
this.CurrentUserPassword = item.Password;
|
||||||
|
|
||||||
this.UpdateAccessRightDisplay(item.ActiveLevel);
|
this.UpdateAccessRightDisplay(item.ActiveLevel);
|
||||||
this.buttonSave.Visible = false;
|
this.buttonSave.Visible = false;
|
||||||
|
|
|
@ -23,6 +23,13 @@
|
||||||
멀티형 8,10,12열 컨베어/스틱 계량기
|
멀티형 8,10,12열 컨베어/스틱 계량기
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ Ver 12.3.1 by CJY
|
||||||
|
- 2025.07.07
|
||||||
|
- Ver 12.3.0 Modify
|
||||||
|
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
|
||||||
|
- (버그수정) Part11이 아닌 로그인 사용 시, 만료일 뜨는 버그 수정
|
||||||
|
- (버그수정) Password가 label - *로 표시되어 생기는 버그 수정
|
||||||
|
|
||||||
@ Ver 12.3.0 by LSJ
|
@ Ver 12.3.0 by LSJ
|
||||||
- 2025.02.27
|
- 2025.02.27
|
||||||
- Ver 12.2.1 Modify
|
- Ver 12.2.1 Modify
|
||||||
|
|
Loading…
Reference in New Issue