chojy
/
INT69DB_2A
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

유저삭제, 로그부분, 버그 수정 등

master
DESKTOP-999R8N3\CJY 2023-09-22 10:26:17 +09:00
parent b8709e5f2e
commit 6dbde695fe
26 changed files with 390 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
INT69DB_2A/DialogForms/DialogFormDataStatistics.cs
View File

@ -183,6 +183,7 @@ namespace INT69DB_2A.DialogForms
private void DisplayTreeViewUpdate2() private void DisplayTreeViewUpdate2()
{ {
int fileCount = 0; int fileCount = 0;
string[] fileName;
//TreeNode node; //TreeNode node;
List<string> years = new List<string>(); List<string> years = new List<string>();
List<string> months = new List<string>(); List<string> months = new List<string>();
@ -249,7 +250,8 @@ namespace INT69DB_2A.DialogForms
for (int k = 0; k < this.ListInspectionFile[i].Months[j].Days.Count; k++) for (int k = 0; k < this.ListInspectionFile[i].Months[j].Days.Count; k++)
{ {
nodeMonth.Nodes.Add(this.ListInspectionFile[i].Months[j].Days[k]); fileName = this.ListInspectionFile[i].Months[j].Days[k].Split('.');
nodeMonth.Nodes.Add(fileName[0]);
fileCount++; fileCount++;
} }
node.Nodes.Add(nodeMonth); node.Nodes.Add(nodeMonth);
@ -312,25 +314,25 @@ namespace INT69DB_2A.DialogForms
{ {
fileName = e.Node.Text; fileName = e.Node.Text;
this.ParentForm.SelectFilePath = string.Format("{0}{1}", this.ParentForm.ParentForm.PathDataBackupFolder, fileName); this.ParentForm.SelectFilePath = string.Format("{0}{1}.csv", this.ParentForm.ParentForm.PathDataBackupFolder, fileName);
name = fileName.Split('_'); name = fileName.Split('_');
this.labelFileName.Text = fileName; this.labelFileName.Text = fileName;
this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(0, 4), name[0].Substring(4, 2), name[0].Substring(6, 2)); this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(0, 4), name[0].Substring(4, 2), name[0].Substring(6, 2));
this.labelProductNo.Text = name[1].Substring(0, name[1].Length - 4); this.labelProductNo.Text = name[1];
} }
else else
{ {
if (e.Node.Text.Length > 10) if (e.Node.Text.Length > 10)
{ {
fileName = e.Node.Text; fileName = e.Node.Text;
pathFileName = string.Format("{0}{1}\\{2}\\{3}", pathFileName = string.Format("{0}{1}\\{2}\\{3}.csv",
this.ParentForm.ParentForm.PathDataInspectionFolder, fileName.Substring(1, 4), int.Parse(fileName.Substring(5, 2)), fileName); this.ParentForm.ParentForm.PathDataInspectionFolder, fileName.Substring(1, 4), int.Parse(fileName.Substring(5, 2)), fileName);
this.ParentForm.SelectFilePath = pathFileName; this.ParentForm.SelectFilePath = pathFileName;
name = fileName.Split('_'); name = fileName.Split('_');
this.labelFileName.Text = fileName; this.labelFileName.Text = fileName;
this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(1, 4), name[0].Substring(5, 2), name[0].Substring(7, 2)); this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(1, 4), name[0].Substring(5, 2), name[0].Substring(7, 2));
this.labelProductNo.Text = name[1].Substring(0, name[1].Length - 4); this.labelProductNo.Text = name[1];
} }
} }
} }

23
INT69DB_2A/DialogForms/DialogFormHistoryData.cs
View File

@ -28,7 +28,7 @@ namespace INT69DB_2A.DialogForms
this.ParentForm = parent; this.ParentForm = parent;
this.InitializeDesign(); this.InitializeDesign();
this.InitializeContnrol(); this.InitializeControl();
this.DefaultSetting(); this.DefaultSetting();
} }
#endregion #endregion
@ -70,7 +70,7 @@ namespace INT69DB_2A.DialogForms
} }
} }
private void InitializeContnrol() private void InitializeControl()
{ {
int x = 0, y = 0; int x = 0, y = 0;
@ -84,6 +84,10 @@ namespace INT69DB_2A.DialogForms
{ {
this.DisplayTreeViewUpdate(); this.DisplayTreeViewUpdate();
this.checkBoxTypeAlarm.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm;
this.checkBoxTypeOperation.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation;
this.checkBoxTypeParameter.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter;
this.labelNodeIndex.Text = "-"; this.labelNodeIndex.Text = "-";
this.labelFileName.Text = "-"; this.labelFileName.Text = "-";
this.labelDate.Text = "-"; this.labelDate.Text = "-";
@ -132,6 +136,7 @@ namespace INT69DB_2A.DialogForms
private void DisplayTreeViewUpdate() private void DisplayTreeViewUpdate()
{ {
int fileCount = 0; int fileCount = 0;
string[] fileName;
//TreeNode node; //TreeNode node;
List<DataBackupYear> listHistoryFile = new List<DataBackupYear>(); List<DataBackupYear> listHistoryFile = new List<DataBackupYear>();
List<string> years = new List<string>(); List<string> years = new List<string>();
@ -199,7 +204,8 @@ namespace INT69DB_2A.DialogForms
for (int k = 0; k < listHistoryFile[i].Months[j].Days.Count; k++) for (int k = 0; k < listHistoryFile[i].Months[j].Days.Count; k++)
{ {
nodeMonth.Nodes.Add(listHistoryFile[i].Months[j].Days[k]); fileName = listHistoryFile[i].Months[j].Days[k].Split('.');
nodeMonth.Nodes.Add(fileName[0]);
fileCount++; fileCount++;
} }
node.Nodes.Add(nodeMonth); node.Nodes.Add(nodeMonth);
@ -208,15 +214,6 @@ namespace INT69DB_2A.DialogForms
} }
} }
} }
public void DisplayRefresh()
{
this.DisplayTreeViewUpdate();
this.checkBoxTypeAlarm.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm;
this.checkBoxTypeOperation.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation;
this.checkBoxTypeParameter.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter;
}
#endregion #endregion
#region Event Handler #region Event Handler
@ -242,7 +239,7 @@ namespace INT69DB_2A.DialogForms
year = this.SeletedFilePath.Substring(1, 4); year = this.SeletedFilePath.Substring(1, 4);
iMonth = int.Parse(this.SeletedFilePath.Substring(5, 2)); iMonth = int.Parse(this.SeletedFilePath.Substring(5, 2));
month = iMonth.ToString(); month = iMonth.ToString();
path = string.Format("{0}{1}\\{2}\\{3}", this.ParentForm.ParentForm.PathDataHistoryFolder, year, month, this.SeletedFilePath); path = string.Format("{0}{1}\\{2}\\{3}.csv", this.ParentForm.ParentForm.PathDataHistoryFolder, year, month, this.SeletedFilePath);
ret = this.ParentForm.DataRead(path); ret = this.ParentForm.DataRead(path);
if (ret == 0) if (ret == 0)

4
INT69DB_2A/DialogForms/DialogFormLogOn.cs
View File

@ -273,7 +273,7 @@ namespace INT69DB_2A.DialogForms
id = this.ParentForm.SystemConfig.CurrentUser.ID; id = this.ParentForm.SystemConfig.CurrentUser.ID;
pass = this.textBoxID.Text; pass = this.textBoxID.Text;
Console.WriteLine(string.Format("UserManager_UserModifyPW : {0}, {1}", id, pass)); //Console.WriteLine(string.Format("UserManager_UserModifyPW : {0}, {1}", id, pass));
ret = UserManager.UserManager_UserModifyPWDirect(id, pass); ret = UserManager.UserManager_UserModifyPWDirect(id, pass);
} }
else else
@ -281,7 +281,7 @@ namespace INT69DB_2A.DialogForms
id = this.ParentForm.ChildFormMainDisplay.ChangeID; id = this.ParentForm.ChildFormMainDisplay.ChangeID;
pass = this.textBoxID.Text; pass = this.textBoxID.Text;
Console.WriteLine(string.Format("UserManager_UserModifyPW : {0}, {1}", id, pass)); //Console.WriteLine(string.Format("UserManager_UserModifyPW : {0}, {1}", id, pass));
ret = UserManager.UserManager_UserModifyPWDirect(id, pass); ret = UserManager.UserManager_UserModifyPWDirect(id, pass);
} }

16
INT69DB_2A/DialogForms/DialogFormYesNo.cs
View File

@ -86,6 +86,10 @@ namespace INT69DB_2A.DialogForms
this.labelErrorCode.Text = "이더넷"; this.labelErrorCode.Text = "이더넷";
this.labelMessage1.Text = "로컬IP주소 자동으로 설정하시겠습니까?"; this.labelMessage1.Text = "로컬IP주소 자동으로 설정하시겠습니까?";
break; break;
case 17:
this.labelErrorCode.Text = "로그인";
this.labelMessage1.Text = "비밀번호를 초기화 하시겠습니까?";
break;
default: default:
break; break;
} }
@ -153,6 +157,10 @@ namespace INT69DB_2A.DialogForms
this.labelErrorCode.Text = "Ethernet"; this.labelErrorCode.Text = "Ethernet";
this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?"; this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?";
break; break;
case 17:
this.labelErrorCode.Text = "Login";
this.labelMessage1.Text = "Do you want to reset your password?";
break;
default: default:
break; break;
} }
@ -224,6 +232,10 @@ namespace INT69DB_2A.DialogForms
this.labelErrorCode.Text = "以太网"; this.labelErrorCode.Text = "以太网";
this.labelMessage1.Text = "是否要将本地 IP 地址设置为 DHCP？"; this.labelMessage1.Text = "是否要将本地 IP 地址设置为 DHCP？";
break; break;
case 17:
this.labelErrorCode.Text = "登录";
this.labelMessage1.Text = "您想重置密码吗？";
break;
default: default:
break; break;
} }
@ -290,6 +302,10 @@ namespace INT69DB_2A.DialogForms
this.labelErrorCode.Text = "Ethernet"; this.labelErrorCode.Text = "Ethernet";
this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?"; this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?";
break; break;
case 17:
this.labelErrorCode.Text = "Přihlásit se";
this.labelMessage1.Text = "Chcete obnovit své heslo?";
break;
default: default:
break; break;
} }

7
INT69DB_2A/Forms/FormCalibration.cs
View File

@ -384,7 +384,8 @@ namespace INT69DB_2A.Forms
value = Helper.StringZeroFillDigits4(this.comboBoxDigit.SelectedItem.ToString()); value = Helper.StringZeroFillDigits4(this.comboBoxDigit.SelectedItem.ToString());
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3003_Digit, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3003_Digit, value);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalDigit, value, "", ""); if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalDigit, "", "", value);
} }
private void labelBalanceWeight_Click(object sender, EventArgs e) private void labelBalanceWeight_Click(object sender, EventArgs e)
@ -412,7 +413,7 @@ namespace INT69DB_2A.Forms
value = Helper.StringZeroFillDigits7(this.labelBalanceWeight.Text.Replace(".", "")); value = Helper.StringZeroFillDigits7(this.labelBalanceWeight.Text.Replace(".", ""));
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3002_BalanceWeight, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3002_BalanceWeight, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalBalWeight, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalBalWeight, "", before, after);
} }
} }
@ -443,7 +444,7 @@ namespace INT69DB_2A.Forms
value = Helper.StringZeroFillDigits7(this.labelMaxWeight.Text.Replace(".", "")); value = Helper.StringZeroFillDigits7(this.labelMaxWeight.Text.Replace(".", ""));
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3001_MaxWeight, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3001_MaxWeight, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalMaxWeight, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalMaxWeight, "", before, after);
} }
} }

29
INT69DB_2A/Forms/FormCommunication.cs
View File

@ -240,6 +240,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.EthernetClientConnect(); this.ParentForm.EthernetClientConnect();
} }
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.TryEthernetStart, detail); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.TryEthernetStart, detail);
} }
private void EthernetStop() private void EthernetStop()
@ -262,6 +263,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.EthernetClientDisconnect(); this.ParentForm.EthernetClientDisconnect();
} }
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.TryEthernetStop, detail); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.TryEthernetStop, detail);
} }
private void EthernetDataTestSend() private void EthernetDataTestSend()
@ -818,6 +820,7 @@ namespace INT69DB_2A.Forms
{ {
if (this.labelServerStatus.Text != ">Start") if (this.labelServerStatus.Text != ">Start")
this.labelServerStatus.Text = ">Start"; this.labelServerStatus.Text = ">Start";
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetConnect, "Server"); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetConnect, "Server");
this.labelConnectedIP.Text = "-"; this.labelConnectedIP.Text = "-";
@ -829,6 +832,7 @@ namespace INT69DB_2A.Forms
{ {
if (this.labelServerStatus.Text != ">Stop") if (this.labelServerStatus.Text != ">Stop")
this.labelServerStatus.Text = ">Stop"; this.labelServerStatus.Text = ">Stop";
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Server"); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Server");
} }
} }
@ -895,7 +899,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPOpMode, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPOpMode, "", before, after);
} }
private void comboBoxMode_SelectedIndexChanged(object sender, EventArgs e) private void comboBoxMode_SelectedIndexChanged(object sender, EventArgs e)
@ -919,7 +923,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
after = this.comboBoxMode.SelectedItem.ToString(); after = this.comboBoxMode.SelectedItem.ToString();
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPComMode, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPComMode, "", before, after);
this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode); this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode);
@ -948,7 +952,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Mod_StartAddr, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Mod_StartAddr, "", before, after);
} }
} }
@ -1004,7 +1008,7 @@ namespace INT69DB_2A.Forms
} }
} }
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalIPConfig, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalIPConfig, "", before, after);
DialogFormMessage msg = new DialogFormMessage(18, this.ParentForm.SystemConfig.Language); DialogFormMessage msg = new DialogFormMessage(18, this.ParentForm.SystemConfig.Language);
@ -1282,21 +1286,21 @@ namespace INT69DB_2A.Forms
this.ParentForm.smartConfigs.IPSettings.DeviceIP = string.Format("{0}.{1}.{2}.{3}", this.ParentForm.smartConfigs.IPSettings.DeviceIP = string.Format("{0}.{1}.{2}.{3}",
this.labelLocalIP1.Text, this.labelLocalIP2.Text, this.labelLocalIP3.Text, this.labelLocalIP4.Text); this.labelLocalIP1.Text, this.labelLocalIP2.Text, this.labelLocalIP3.Text, this.labelLocalIP4.Text);
after = this.ParentForm.smartConfigs.IPSettings.DeviceIP; after = this.ParentForm.smartConfigs.IPSettings.DeviceIP;
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalIPAddress, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalIPAddress, "", before, after);
before = this.ParentForm.smartConfigs.IPSettings.SubNetMask; before = this.ParentForm.smartConfigs.IPSettings.SubNetMask;
this.ParentForm.smartConfigs.IPSettings.SubNetMask = string.Format("{0}.{1}.{2}.{3}", this.ParentForm.smartConfigs.IPSettings.SubNetMask = string.Format("{0}.{1}.{2}.{3}",
this.labelLocalSubnetMask1.Text, this.labelLocalSubnetMask2.Text, this.labelLocalSubnetMask3.Text, this.labelLocalSubnetMask4.Text); this.labelLocalSubnetMask1.Text, this.labelLocalSubnetMask2.Text, this.labelLocalSubnetMask3.Text, this.labelLocalSubnetMask4.Text);
after = this.ParentForm.smartConfigs.IPSettings.SubNetMask; after = this.ParentForm.smartConfigs.IPSettings.SubNetMask;
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalSubnetMask, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalSubnetMask, "", before, after);
before = this.ParentForm.smartConfigs.IPSettings.GateWay; before = this.ParentForm.smartConfigs.IPSettings.GateWay;
this.ParentForm.smartConfigs.IPSettings.GateWay = string.Format("{0}.{1}.{2}.{3}", this.ParentForm.smartConfigs.IPSettings.GateWay = string.Format("{0}.{1}.{2}.{3}",
this.labelLocalGateway1.Text, this.labelLocalGateway2.Text, this.labelLocalGateway3.Text, this.labelLocalGateway4.Text); this.labelLocalGateway1.Text, this.labelLocalGateway2.Text, this.labelLocalGateway3.Text, this.labelLocalGateway4.Text);
after = this.ParentForm.smartConfigs.IPSettings.GateWay; after = this.ParentForm.smartConfigs.IPSettings.GateWay;
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalGateway, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalGateway, "", before, after);
this.ParentForm.smartConfigs.IPSettings.Save(); this.ParentForm.smartConfigs.IPSettings.Save();
@ -1324,7 +1328,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SystemConfig.EthernetLocalPort = myKeyPad.IntValue; this.ParentForm.SystemConfig.EthernetLocalPort = myKeyPad.IntValue;
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalPort, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalPort, "", before, after);
} }
} }
@ -1429,14 +1433,14 @@ namespace INT69DB_2A.Forms
before = this.ParentForm.SystemConfig.EthernetServerPort.ToString(); before = this.ParentForm.SystemConfig.EthernetServerPort.ToString();
this.ParentForm.SystemConfig.EthernetServerPort = int.Parse(this.labelHostPort.Text); this.ParentForm.SystemConfig.EthernetServerPort = int.Parse(this.labelHostPort.Text);
after = this.ParentForm.SystemConfig.EthernetServerPort.ToString(); after = this.ParentForm.SystemConfig.EthernetServerPort.ToString();
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPServerPort, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPServerPort, "", before, after);
before = this.ParentForm.SystemConfig.EthernetServerAddress; before = this.ParentForm.SystemConfig.EthernetServerAddress;
this.ParentForm.SystemConfig.EthernetServerAddress = string.Format("{0}.{1}.{2}.{3}", this.ParentForm.SystemConfig.EthernetServerAddress = string.Format("{0}.{1}.{2}.{3}",
this.labelHostIP1.Text, this.labelHostIP2.Text, this.labelHostIP3.Text, this.labelHostIP4.Text); this.labelHostIP1.Text, this.labelHostIP2.Text, this.labelHostIP3.Text, this.labelHostIP4.Text);
after = this.ParentForm.SystemConfig.EthernetServerAddress; after = this.ParentForm.SystemConfig.EthernetServerAddress;
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPServerIPAddress, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPServerIPAddress, "", before, after);
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
@ -1474,10 +1478,11 @@ namespace INT69DB_2A.Forms
afterMode = this.ReturnCommunicationModeName(comboBox, this.ParentForm.SystemConfig.Serial3Mode); afterMode = this.ReturnCommunicationModeName(comboBox, this.ParentForm.SystemConfig.Serial3Mode);
afterBaudrate = this.ParentForm.SystemConfig.Serial3BaudRate.ToString(); afterBaudrate = this.ParentForm.SystemConfig.Serial3BaudRate.ToString();
if (beforeMode != afterMode) if (this.ParentForm.SystemConfig.IsPart11 == true)
{
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Com3Mode, "", beforeMode, afterMode); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Com3Mode, "", beforeMode, afterMode);
if (beforeBaudrate != afterBaudrate)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Com3Baudrate, "", beforeBaudrate, afterBaudrate); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Com3Baudrate, "", beforeBaudrate, afterBaudrate);
}
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);

19
INT69DB_2A/Forms/FormConfiguration.cs
View File

@ -308,7 +308,7 @@ namespace INT69DB_2A.Forms
after = "OFF"; after = "OFF";
} }
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDoubleEntry, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDoubleEntry, "", before, after);
} }
private void buttonBypassMode_Click(object sender, EventArgs e) private void buttonBypassMode_Click(object sender, EventArgs e)
@ -340,7 +340,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._1201_Bypass, sb.ToString()); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._1201_Bypass, sb.ToString());
} }
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcBypass, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcBypass, "", before, after);
} }
private void buttonScreen_Click(object sender, EventArgs e) private void buttonScreen_Click(object sender, EventArgs e)
@ -380,7 +380,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4001_ZeroTime, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4001_ZeroTime, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroTime, "", before, after);
} }
} }
@ -411,7 +411,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4002_ZeroRange, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4002_ZeroRange, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroRange, "", before, after);
} }
} }
@ -441,7 +441,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6006_Chattering, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6006_Chattering, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcChattering, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcChattering, "", before, after);
} }
} }
@ -471,7 +471,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6001_BuzzerOnTime, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6001_BuzzerOnTime, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcBuzzerRunTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcBuzzerRunTime, "", before, after);
} }
} }
@ -501,7 +501,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6002_RelayRunTime, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6002_RelayRunTime, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcRelayRunTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcRelayRunTime, "", before, after);
} }
} }
@ -521,7 +521,7 @@ namespace INT69DB_2A.Forms
after = this.comboBoxZeroParameterVariate.SelectedItem.ToString(); after = this.comboBoxZeroParameterVariate.SelectedItem.ToString();
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after);
} }
private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e) private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e)
@ -535,9 +535,10 @@ namespace INT69DB_2A.Forms
this.ParentForm.SystemConfig.DecimalPlaces = this.comboBoxDecimalPlaces.SelectedIndex; this.ParentForm.SystemConfig.DecimalPlaces = this.comboBoxDecimalPlaces.SelectedIndex;
after = this.comboBoxDecimalPlaces.SelectedItem.ToString(); after = this.comboBoxDecimalPlaces.SelectedItem.ToString();
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDecimalpoint, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDecimalpoint, "", before, after);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
} }
#endregion #endregion

27
INT69DB_2A/Forms/FormDataBackup_Part11.cs
View File

@ -381,6 +381,8 @@ namespace INT69DB_2A.Forms
msg.ShowDialog(); msg.ShowDialog();
return; return;
} }
this.UpdateDisplayOtherFile();
} }
private void SplashStart() private void SplashStart()
@ -424,10 +426,14 @@ namespace INT69DB_2A.Forms
{ {
List<string> listFile = new List<string>(); List<string> listFile = new List<string>();
Dictionary<string, int> dirNames = new Dictionary<string, int>(); Dictionary<string, int> dirNames = new Dictionary<string, int>();
string[] fileName;
#region File List 품번 순서데로 정렬 #region File List 품번 순서데로 정렬
foreach (FileInfo file in files) foreach (FileInfo file in files)
dirNames.Add(file.Name, int.Parse(file.Name.Substring(10, 1))); {
fileName = file.Name.Split('_');
dirNames.Add(file.Name, int.Parse(fileName[1].Substring(0, fileName[1].Length - 4)));
}
var vrList = dirNames.OrderBy(x => x.Value); var vrList = dirNames.OrderBy(x => x.Value);
foreach (var v in vrList) foreach (var v in vrList)
@ -493,7 +499,7 @@ namespace INT69DB_2A.Forms
if (tree.Nodes[i].Nodes[j].Nodes[k].Checked == true) if (tree.Nodes[i].Nodes[j].Nodes[k].Checked == true)
{ {
//listSelectedFile.Add(tree.Nodes[i].Nodes[j].Nodes[k].Text); //listSelectedFile.Add(tree.Nodes[i].Nodes[j].Nodes[k].Text);
listSelectedFile.Add(string.Format("{0}\\{1}\\{2}", tree.Nodes[i].Text, tree.Nodes[i].Nodes[j].Text, tree.Nodes[i].Nodes[j].Nodes[k].Text)); listSelectedFile.Add(string.Format("{0}\\{1}\\{2}.csv", tree.Nodes[i].Text, tree.Nodes[i].Nodes[j].Text, tree.Nodes[i].Nodes[j].Nodes[k].Text));
} }
} }
} }
@ -508,6 +514,7 @@ namespace INT69DB_2A.Forms
private void UpdateDisplayInspectionFile() private void UpdateDisplayInspectionFile()
{ {
int fileCount = 0; int fileCount = 0;
string[] fileName;
//TreeNode node; //TreeNode node;
List<string> years = new List<string>(); List<string> years = new List<string>();
List<string> months = new List<string>(); List<string> months = new List<string>();
@ -574,7 +581,8 @@ namespace INT69DB_2A.Forms
for (int k = 0; k < this.ListInspectionFile[i].Months[j].Days.Count; k++) for (int k = 0; k < this.ListInspectionFile[i].Months[j].Days.Count; k++)
{ {
nodeMonth.Nodes.Add(this.ListInspectionFile[i].Months[j].Days[k]); fileName = this.ListInspectionFile[i].Months[j].Days[k].Split('.');
nodeMonth.Nodes.Add(fileName[0]);
fileCount++; fileCount++;
} }
node.Nodes.Add(nodeMonth); node.Nodes.Add(nodeMonth);
@ -588,6 +596,7 @@ namespace INT69DB_2A.Forms
private void UpdateDisplayHistoryFile() private void UpdateDisplayHistoryFile()
{ {
int fileCount = 0; int fileCount = 0;
string[] fileName;
//TreeNode node; //TreeNode node;
List<string> years = new List<string>(); List<string> years = new List<string>();
List<string> months = new List<string>(); List<string> months = new List<string>();
@ -654,7 +663,8 @@ namespace INT69DB_2A.Forms
for (int k = 0; k < this.ListHistoryFile[i].Months[j].Days.Count; k++) for (int k = 0; k < this.ListHistoryFile[i].Months[j].Days.Count; k++)
{ {
nodeMonth.Nodes.Add(this.ListHistoryFile[i].Months[j].Days[k]); fileName = this.ListHistoryFile[i].Months[j].Days[k].Split('.');
nodeMonth.Nodes.Add(fileName[0]);
fileCount++; fileCount++;
} }
node.Nodes.Add(nodeMonth); node.Nodes.Add(nodeMonth);
@ -667,6 +677,7 @@ namespace INT69DB_2A.Forms
private void UpdateDisplayOtherFile() private void UpdateDisplayOtherFile()
{ {
bool directoryCheck = false; bool directoryCheck = false;
string[] fileName;
this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormDataBackup; this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormDataBackup;
@ -682,7 +693,15 @@ namespace INT69DB_2A.Forms
this.listBoxOther.Items.Clear(); this.listBoxOther.Items.Clear();
foreach (FileInfo file in files) foreach (FileInfo file in files)
{
if (file.Name.Substring(0, 1) == "S")
{
fileName = file.Name.Split('.');
this.listBoxOther.Items.Add(fileName[0]);
}
else
this.listBoxOther.Items.Add(file.Name); this.listBoxOther.Items.Add(file.Name);
}
this.labelOtherFileCount.Text = this.listBoxOther.Items.Count.ToString(); this.labelOtherFileCount.Text = this.listBoxOther.Items.Count.ToString();
} }

6
INT69DB_2A/Forms/FormEquipmentSetting.cs
View File

@ -10,6 +10,7 @@ using System.Windows.Forms;
using INT69DB_2A.DialogForms; using INT69DB_2A.DialogForms;
using INT69DB_2A_ImageDll; using INT69DB_2A_ImageDll;
using SmartX; using SmartX;
using INT69DB_2A.Part11_UserManager;
namespace INT69DB_2A.Forms namespace INT69DB_2A.Forms
{ {
@ -452,8 +453,13 @@ namespace INT69DB_2A.Forms
if (this.buttonLogin.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) if (this.buttonLogin.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
this.ParentForm.SystemConfig.IsLogin = true; this.ParentForm.SystemConfig.IsLogin = true;
else else
{
this.ParentForm.SystemConfig.IsLogin = false; this.ParentForm.SystemConfig.IsLogin = false;
// Delete user list
UserManager.UserManager_UserAllDel();
}
// 스텝모터 종류 // 스텝모터 종류
if (this.comboBoxStepMotorType.SelectedIndex == 1) if (this.comboBoxStepMotorType.SelectedIndex == 1)
this.ParentForm.SystemConfig.StepMotorType = (int)DataStore.StepMotorType.EDB_ALL_P; this.ParentForm.SystemConfig.StepMotorType = (int)DataStore.StepMotorType.EDB_ALL_P;

2
INT69DB_2A/Forms/FormIOTest.Designer.cs generated
View File

@ -2074,7 +2074,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoScroll = true; this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(800, 600); this.ClientSize = new System.Drawing.Size(803, 620);
this.Controls.Add(this.groupBoxPLC); this.Controls.Add(this.groupBoxPLC);
this.Controls.Add(this.buttonPLC1); this.Controls.Add(this.buttonPLC1);
this.Controls.Add(this.smartGroupBox2); this.Controls.Add(this.smartGroupBox2);

6
INT69DB_2A/Forms/FormInitialization.cs
View File

@ -9,6 +9,7 @@ using System.Windows.Forms;
using System.IO; using System.IO;
using INT69DB_2A_ImageDll; using INT69DB_2A_ImageDll;
using INT69DB_2A.Part11_UserManager;
namespace INT69DB_2A.Forms namespace INT69DB_2A.Forms
{ {
@ -393,6 +394,10 @@ namespace INT69DB_2A.Forms
this.ParentForm.smartFileIO.WriteStructure_End(); this.ParentForm.smartFileIO.WriteStructure_End();
this.ParentForm.smartFileIO.Close(); this.ParentForm.smartFileIO.Close();
} }
private void ResetUserListFile()
{
UserManager.UserManager_UserAllDel();
}
public void DisplayRefresh() public void DisplayRefresh()
{ {
@ -403,6 +408,7 @@ namespace INT69DB_2A.Forms
this.progressBarResetBar.Value = 0; this.progressBarResetBar.Value = 0;
this.TransmissionRemoveFile(); this.TransmissionRemoveFile();
this.ResetUserListFile();
this.progressBarResetBar.Value += 10; this.progressBarResetBar.Value += 10;
this.ResetProductFile(); this.ResetProductFile();
this.progressBarResetBar.Value += 10; this.progressBarResetBar.Value += 10;

36
INT69DB_2A/Forms/FormMain.cs
View File

@ -3396,6 +3396,7 @@ namespace INT69DB_2A.Forms
if (null == strRecvMsg) if (null == strRecvMsg)
{ {
this.DelegateTextStatusOut(">Server Out"); this.DelegateTextStatusOut(">Server Out");
this.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Client");
this.IsEthernetThreadStop = true; this.IsEthernetThreadStop = true;
break; break;
} }
@ -7452,41 +7453,6 @@ namespace INT69DB_2A.Forms
#endregion #endregion
#region Backup #region Backup
public List<string> GetSeletedNodeList(TreeView tree)
{
int yearCNT, monthCNT, dayCNT;
List<string> listSelectedFile = new List<string>();
yearCNT = tree.Nodes.Count;
if (yearCNT != 0)
{
for (int i = 0; i < yearCNT; i++)
{
monthCNT = tree.Nodes[i].Nodes.Count;
if (monthCNT != 0)
{
for (int j = 0; j < monthCNT; j++)
{
dayCNT = tree.Nodes[i].Nodes[j].Nodes.Count;
if (dayCNT != 0)
{
for (int k = 0; k < dayCNT; k++)
{
//if (tree.Nodes[i].Nodes[j].Nodes[k].Checked == true)
//{
//listSelectedFile.Add(tree.Nodes[i].Nodes[j].Nodes[k].Text);
listSelectedFile.Add(string.Format("{0}\\{1}\\{2}", tree.Nodes[i].Text, tree.Nodes[i].Nodes[j].Text, tree.Nodes[i].Nodes[j].Nodes[k].Text));
//}
}
}
}
}
}
}
return listSelectedFile;
}
private void DeleteLogFile(string path, DataStore.E_DataType type) private void DeleteLogFile(string path, DataStore.E_DataType type)
{ {
string dataFolderPath = ""; string dataFolderPath = "";

44
INT69DB_2A/Forms/FormMainDisplay.cs
View File

@ -461,7 +461,7 @@ namespace INT69DB_2A.Forms
expiryDay = user.GetPasswordExpiryDday(); expiryDay = user.GetPasswordExpiryDday();
if (expiryDay >= -10) if (expiryDay >= -10)
{ {
Console.WriteLine("password : " + expiryDay.ToString()); //Console.WriteLine("password : " + expiryDay.ToString());
DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 2, expiryDay.ToString()); DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 2, expiryDay.ToString());
if (myDlg.ShowDialog() == DialogResult.Yes) if (myDlg.ShowDialog() == DialogResult.Yes)
{ {
@ -479,9 +479,9 @@ namespace INT69DB_2A.Forms
UserManager.UserMgr_user_info_t userInfo = new UserManager.UserMgr_user_info_t(); UserManager.UserMgr_user_info_t userInfo = new UserManager.UserMgr_user_info_t();
UserManager.UserManager_UserLoginDirect(id, pass, ref userInfo); UserManager.UserManager_UserLoginDirect(id, pass, ref userInfo);
Console.WriteLine(string.Format("status : {0}", userInfo.status)); //Console.WriteLine(string.Format("status : {0}", userInfo.status));
Console.WriteLine("ID : " + id); //Console.WriteLine("ID : " + id);
Console.WriteLine("pass : " + pass); //Console.WriteLine("pass : " + pass);
if (userInfo.status == 0) if (userInfo.status == 0)
{ {
@ -518,6 +518,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true;
this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level;
this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW;
#endregion #endregion
this.UI_Invoke(delegate this.UI_Invoke(delegate
@ -552,7 +553,6 @@ namespace INT69DB_2A.Forms
} }
else if (result == DialogResult.Abort) else if (result == DialogResult.Abort)
{ {
// 비밀 번호 변경 띄우기 // 비밀 번호 변경 띄우기
DialogFormLogOn logOn1 = new DialogFormLogOn(this.ParentForm, false, true); DialogFormLogOn logOn1 = new DialogFormLogOn(this.ParentForm, false, true);
if (logOn1.ShowDialog() == DialogResult.OK) if (logOn1.ShowDialog() == DialogResult.OK)
@ -1240,6 +1240,7 @@ namespace INT69DB_2A.Forms
} }
public void ProductChange(int productNumber) public void ProductChange(int productNumber)
{ {
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "",
this.ParentForm.SystemConfig.ProductNumber.ToString(), productNumber.ToString()); this.ParentForm.SystemConfig.ProductNumber.ToString(), productNumber.ToString());
@ -1389,15 +1390,15 @@ namespace INT69DB_2A.Forms
} }
public void CallBackUserListModifyInfoDataEvent(UserManager.UserMgr_user_info_t userInfo) public void CallBackUserListModifyInfoDataEvent(UserManager.UserMgr_user_info_t userInfo)
{ {
Console.WriteLine("status : " + userInfo.status.ToString()); //Console.WriteLine("status : " + userInfo.status.ToString());
Console.WriteLine("ID : " + userInfo.user_id); //Console.WriteLine("ID : " + userInfo.user_id);
Console.WriteLine("pass : " + userInfo.user_pw); //Console.WriteLine("pass : " + userInfo.user_pw);
if (userInfo.status == 0) if (userInfo.status == 0)
{ {
Console.WriteLine("Group : " + this.ParentForm.SystemConfig.CurrentUser.Group.ToString()); //Console.WriteLine("Group : " + this.ParentForm.SystemConfig.CurrentUser.Group.ToString());
if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.LogOut) if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.LogOut)
{ {
Console.WriteLine("DirectLogin"); //Console.WriteLine("DirectLogin");
this.DirectLogin(userInfo.user_id, userInfo.user_pw); this.DirectLogin(userInfo.user_id, userInfo.user_pw);
} }
else else
@ -1434,6 +1435,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true;
this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level;
this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW;
} }
} }
} }
@ -2517,7 +2519,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentFeedBackRangeItem.SetRange(int.Parse(this.ParentForm.CurrentProductItem.OverRange), this.ParentForm.CurrentFeedBackRangeItem.SetRange(int.Parse(this.ParentForm.CurrentProductItem.OverRange),
int.Parse(this.ParentForm.CurrentProductItem.PassRange), int.Parse(this.ParentForm.CurrentProductItem.UnderRange)); int.Parse(this.ParentForm.CurrentProductItem.PassRange), int.Parse(this.ParentForm.CurrentProductItem.UnderRange));
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, "", before, after);
} }
} }
@ -2559,7 +2561,7 @@ namespace INT69DB_2A.Forms
value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.PassRange); value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.PassRange);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2003_PassRange, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2003_PassRange, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, "", before, after);
} }
} }
@ -2604,7 +2606,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentFeedBackRangeItem.SetRange(int.Parse(this.ParentForm.CurrentProductItem.OverRange), this.ParentForm.CurrentFeedBackRangeItem.SetRange(int.Parse(this.ParentForm.CurrentProductItem.OverRange),
int.Parse(this.ParentForm.CurrentProductItem.PassRange), int.Parse(this.ParentForm.CurrentProductItem.UnderRange)); int.Parse(this.ParentForm.CurrentProductItem.PassRange), int.Parse(this.ParentForm.CurrentProductItem.UnderRange));
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, "", before, after);
} }
} }
@ -2643,7 +2645,7 @@ namespace INT69DB_2A.Forms
value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.TareRange); value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.TareRange);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2005_TareRange, value); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2005_TareRange, value);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, "", before, after);
} }
} }
@ -2655,6 +2657,7 @@ namespace INT69DB_2A.Forms
this.Part11AutomaticLogoutReset(); this.Part11AutomaticLogoutReset();
this.ParentForm.TransferData(CommunicationCommand.Zero, CommunicationID.SubBoardAll); this.ParentForm.TransferData(CommunicationCommand.Zero, CommunicationID.SubBoardAll);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Zero, ""); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Zero, "");
} }
private void buttonClear_Click(object sender, EventArgs e) private void buttonClear_Click(object sender, EventArgs e)
@ -2767,7 +2770,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterDelayTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterDelayTime, "", before, after);
} }
} }
@ -2803,7 +2806,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterRunTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterRunTime, "", before, after);
} }
} }
@ -2840,7 +2843,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, "", before, after);
} }
} }
@ -2876,7 +2879,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, "", before, after);
} }
} }
@ -2912,7 +2915,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, "", before, after);
} }
} }
@ -2948,7 +2951,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRunTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRunTime, "", before, after);
} }
} }
@ -3105,6 +3108,7 @@ namespace INT69DB_2A.Forms
this.Part11AutomaticLogoutReset(); this.Part11AutomaticLogoutReset();
this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard); this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MainCut, ""); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MainCut, "");
} }

6
INT69DB_2A/Forms/FormMotorSetting.cs
View File

@ -2341,13 +2341,13 @@ namespace INT69DB_2A.Forms
this.buttonSave.Visible = false; this.buttonSave.Visible = false;
if (this.BeforeDirection != this.AfterDirection) if (this.ParentForm.SystemConfig.IsPart11 == true)
{
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorDirection, "", this.BeforeDirection, this.AfterDirection); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorDirection, "", this.BeforeDirection, this.AfterDirection);
if (beforeAnglePass != afterAnglePass)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAnglePass, "", beforeAnglePass, afterAnglePass); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAnglePass, "", beforeAnglePass, afterAnglePass);
if (beforeAngleNG != afterAngleNG)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAngleNG, "", beforeAngleNG, afterAngleNG); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAngleNG, "", beforeAngleNG, afterAngleNG);
} }
}
#endregion #endregion
} }
} }

32
INT69DB_2A/Forms/FormOption.Designer.cs generated
View File

@ -39,6 +39,7 @@
this.buttonPart11 = new SmartX.SmartButton(); this.buttonPart11 = new SmartX.SmartButton();
this.labelTitlePart11 = new SmartX.SmartLabel(); this.labelTitlePart11 = new SmartX.SmartLabel();
this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.smartLabel3 = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout(); this.smartGroupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -160,7 +161,7 @@
this.buttonStatistics.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonStatistics.DownImage"))); this.buttonStatistics.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonStatistics.DownImage")));
this.buttonStatistics.GroupID = 0; this.buttonStatistics.GroupID = 0;
this.buttonStatistics.InitVisible = true; this.buttonStatistics.InitVisible = true;
this.buttonStatistics.Location = new System.Drawing.Point(408, 214); this.buttonStatistics.Location = new System.Drawing.Point(272, 238);
this.buttonStatistics.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonStatistics.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonStatistics.Name = "buttonStatistics"; this.buttonStatistics.Name = "buttonStatistics";
this.buttonStatistics.NestedClickEventPrevent = false; this.buttonStatistics.NestedClickEventPrevent = false;
@ -190,7 +191,7 @@
this.labelTitleStatistics.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleStatistics.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.labelTitleStatistics.InitVisible = true; this.labelTitleStatistics.InitVisible = true;
this.labelTitleStatistics.LineSpacing = 0F; this.labelTitleStatistics.LineSpacing = 0F;
this.labelTitleStatistics.Location = new System.Drawing.Point(202, 214); this.labelTitleStatistics.Location = new System.Drawing.Point(66, 238);
this.labelTitleStatistics.Name = "labelTitleStatistics"; this.labelTitleStatistics.Name = "labelTitleStatistics";
this.labelTitleStatistics.Size = new System.Drawing.Size(200, 25); this.labelTitleStatistics.Size = new System.Drawing.Size(200, 25);
this.labelTitleStatistics.TabIndex = 223; this.labelTitleStatistics.TabIndex = 223;
@ -212,7 +213,7 @@
this.buttonPart11.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.DownImage"))); this.buttonPart11.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.DownImage")));
this.buttonPart11.GroupID = 0; this.buttonPart11.GroupID = 0;
this.buttonPart11.InitVisible = true; this.buttonPart11.InitVisible = true;
this.buttonPart11.Location = new System.Drawing.Point(408, 183); this.buttonPart11.Location = new System.Drawing.Point(272, 176);
this.buttonPart11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonPart11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonPart11.Name = "buttonPart11"; this.buttonPart11.Name = "buttonPart11";
this.buttonPart11.NestedClickEventPrevent = false; this.buttonPart11.NestedClickEventPrevent = false;
@ -241,7 +242,7 @@
this.labelTitlePart11.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitlePart11.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.labelTitlePart11.InitVisible = true; this.labelTitlePart11.InitVisible = true;
this.labelTitlePart11.LineSpacing = 0F; this.labelTitlePart11.LineSpacing = 0F;
this.labelTitlePart11.Location = new System.Drawing.Point(202, 183); this.labelTitlePart11.Location = new System.Drawing.Point(66, 176);
this.labelTitlePart11.Name = "labelTitlePart11"; this.labelTitlePart11.Name = "labelTitlePart11";
this.labelTitlePart11.Size = new System.Drawing.Size(200, 25); this.labelTitlePart11.Size = new System.Drawing.Size(200, 25);
this.labelTitlePart11.TabIndex = 221; this.labelTitlePart11.TabIndex = 221;
@ -255,6 +256,7 @@
this.smartGroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180))))); this.smartGroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox = null;
this.smartGroupBox1.BackPictureBox1 = null; this.smartGroupBox1.BackPictureBox1 = null;
this.smartGroupBox1.Controls.Add(this.smartLabel3);
this.smartGroupBox1.Controls.Add(this.labelTitlePart11); this.smartGroupBox1.Controls.Add(this.labelTitlePart11);
this.smartGroupBox1.Controls.Add(this.buttonStatistics); this.smartGroupBox1.Controls.Add(this.buttonStatistics);
this.smartGroupBox1.Controls.Add(this.buttonPart11); this.smartGroupBox1.Controls.Add(this.buttonPart11);
@ -273,6 +275,27 @@
this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.Text = "smartGroupBox1";
this.smartGroupBox1.TextColor = System.Drawing.Color.Black; this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
// //
// smartLabel3
//
this.smartLabel3.BackColor = System.Drawing.Color.Silver;
this.smartLabel3.BackPictureBox = this.smartForm1;
this.smartLabel3.BackPictureBox1 = null;
this.smartLabel3.BackPictureBox2 = null;
this.smartLabel3.BorderColor = System.Drawing.Color.Black;
this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.smartLabel3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel3.ForeColor = System.Drawing.Color.DarkRed;
this.smartLabel3.InitVisible = true;
this.smartLabel3.LineSpacing = 0F;
this.smartLabel3.Location = new System.Drawing.Point(272, 207);
this.smartLabel3.Name = "smartLabel3";
this.smartLabel3.Size = new System.Drawing.Size(474, 25);
this.smartLabel3.TabIndex = 231;
this.smartLabel3.Text = "※ Part11 ON : activate [Login], [Data backup], [Statistics]";
this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel3.Wordwrap = false;
//
// FormOption // FormOption
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -305,5 +328,6 @@
private SmartX.SmartButton buttonPart11; private SmartX.SmartButton buttonPart11;
private SmartX.SmartLabel labelTitlePart11; private SmartX.SmartLabel labelTitlePart11;
private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartGroupBox smartGroupBox1;
private SmartX.SmartLabel smartLabel3;
} }
} }

8
INT69DB_2A/Forms/FormOption.cs
View File

@ -10,6 +10,7 @@ using System.Windows.Forms;
using INT69DB_2A_ImageDll; using INT69DB_2A_ImageDll;
using INT69DB_2A.DialogForms; using INT69DB_2A.DialogForms;
using SmartX; using SmartX;
using INT69DB_2A.Part11_UserManager;
namespace INT69DB_2A.Forms namespace INT69DB_2A.Forms
{ {
@ -111,7 +112,14 @@ namespace INT69DB_2A.Forms
this.ParentForm.SystemConfig.IsLogin = true; this.ParentForm.SystemConfig.IsLogin = true;
} }
else else
{
this.ParentForm.SystemConfig.IsPart11 = false; this.ParentForm.SystemConfig.IsPart11 = false;
this.ParentForm.SystemConfig.IsDataBackup = false;
this.ParentForm.SystemConfig.IsLogin = false;
// Delete user list
UserManager.UserManager_UserAllDel();
}
// 데이터 통계 기능 사용 유무 // 데이터 통계 기능 사용 유무
if (this.buttonStatistics.ButtonStatus == SmartButton.BUTSTATUS.DOWN) if (this.buttonStatistics.ButtonStatus == SmartButton.BUTSTATUS.DOWN)

10
INT69DB_2A/Forms/FormSystemSetting.cs
View File

@ -830,6 +830,7 @@ namespace INT69DB_2A.Forms
after = this.textBoxProductName.Text; after = this.textBoxProductName.Text;
number = this.SelectedProductItem.Number.ToString(); number = this.SelectedProductItem.Number.ToString();
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeName, number, this.BeforeName, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeName, number, this.BeforeName, after);
} }
} }
@ -875,6 +876,7 @@ namespace INT69DB_2A.Forms
after = this.textBoxLotNo.Text; after = this.textBoxLotNo.Text;
number = this.SelectedProductItem.Number.ToString(); number = this.SelectedProductItem.Number.ToString();
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeLOT, number, this.BeforeLot, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeLOT, number, this.BeforeLot, after);
} }
} }
@ -968,7 +970,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, "", before, after);
} }
} }
@ -997,7 +999,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, "", before, after);
} }
} }
@ -1025,7 +1027,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, "", before, after);
} }
} }
@ -1053,7 +1055,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, "", before, after);
} }
} }

3
INT69DB_2A/Forms/FormTimeSetting.cs
View File

@ -132,7 +132,8 @@ namespace INT69DB_2A.Forms
this.TimerForTimeSetting.Enabled = true; this.TimerForTimeSetting.Enabled = true;
this.buttonSave.Visible = false; this.buttonSave.Visible = false;
if (after != "" && before != after) if (this.ParentForm.SystemConfig.IsPart11 == true)
if (after != "")
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeTime, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeTime, "", before, after);
} }

238
INT69DB_2A/Forms/FormUserEditor.Designer.cs generated
View File

@ -31,7 +31,6 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormUserEditor)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormUserEditor));
this.smartForm1 = new SmartX.SmartForm(); this.smartForm1 = new SmartX.SmartForm();
this.labelTitle = new SmartX.SmartLabel(); this.labelTitle = new SmartX.SmartLabel();
this.listBoxUserList = new SmartX.SmartListBox();
this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.labelAutoLogoutWarning = new SmartX.SmartLabel(); this.labelAutoLogoutWarning = new SmartX.SmartLabel();
this.comboBoxAccessRight = new System.Windows.Forms.ComboBox(); this.comboBoxAccessRight = new System.Windows.Forms.ComboBox();
@ -53,6 +52,7 @@
this.labelTitleExpiryDateOfAccount = new SmartX.SmartLabel(); this.labelTitleExpiryDateOfAccount = new SmartX.SmartLabel();
this.labelTitleAccessRight = new SmartX.SmartLabel(); this.labelTitleAccessRight = new SmartX.SmartLabel();
this.smartGroupBox2 = new SmartX.SmartGroupBox(); this.smartGroupBox2 = new SmartX.SmartGroupBox();
this.labelEquipment = new SmartX.SmartLabel();
this.labelMenu = new SmartX.SmartLabel(); this.labelMenu = new SmartX.SmartLabel();
this.labelMain = new SmartX.SmartLabel(); this.labelMain = new SmartX.SmartLabel();
this.labelViewer = new SmartX.SmartLabel(); this.labelViewer = new SmartX.SmartLabel();
@ -82,7 +82,8 @@
this.buttonNew = new SmartX.SmartButton(); this.buttonNew = new SmartX.SmartButton();
this.buttonBack = new SmartX.SmartButton(); this.buttonBack = new SmartX.SmartButton();
this.buttonGroupEditor = new SmartX.SmartButton(); this.buttonGroupEditor = new SmartX.SmartButton();
this.labelEquipment = new SmartX.SmartLabel(); this.buttonResetPW = new SmartX.SmartButton();
this.listBoxUserList = new System.Windows.Forms.ListBox();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout(); this.smartGroupBox1.SuspendLayout();
this.smartGroupBox2.SuspendLayout(); this.smartGroupBox2.SuspendLayout();
@ -110,7 +111,7 @@
this.labelTitle.BackPictureBox2 = null; this.labelTitle.BackPictureBox2 = null;
this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderColor = System.Drawing.Color.Black;
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle.Font = new System.Drawing.Font("New Gulim", 23F, System.Drawing.FontStyle.Bold); this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold);
this.labelTitle.ForeColor = System.Drawing.Color.White; this.labelTitle.ForeColor = System.Drawing.Color.White;
this.labelTitle.InitVisible = true; this.labelTitle.InitVisible = true;
this.labelTitle.LineSpacing = 0F; this.labelTitle.LineSpacing = 0F;
@ -123,46 +124,12 @@
this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle.Wordwrap = false; this.labelTitle.Wordwrap = false;
// //
// listBoxUserList
//
this.listBoxUserList.BackColor = System.Drawing.Color.White;
this.listBoxUserList.BackPictureBox = null;
this.listBoxUserList.BackPictureBox1 = null;
this.listBoxUserList.BackPictureBox2 = null;
this.listBoxUserList.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxUserList.ColumnDelimiter = '\0';
this.listBoxUserList.ColumnOffsets = null;
this.listBoxUserList.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold);
this.listBoxUserList.FontColor = System.Drawing.Color.Black;
this.listBoxUserList.InitVisible = true;
this.listBoxUserList.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxUserList.ItemOffsetGap = 5;
this.listBoxUserList.ItemOffsetX = 5;
this.listBoxUserList.ItemOffsetY = 0;
this.listBoxUserList.Location = new System.Drawing.Point(12, 77);
this.listBoxUserList.MouseMoveEventSpace = 3;
this.listBoxUserList.MouseMoveSpace = 10;
this.listBoxUserList.Name = "listBoxUserList";
this.listBoxUserList.OutLineColor = System.Drawing.SystemColors.ControlText;
this.listBoxUserList.SelectColor = System.Drawing.Color.DarkBlue;
this.listBoxUserList.SelectFilled = true;
this.listBoxUserList.SelectFontColor = System.Drawing.Color.White;
this.listBoxUserList.SelectItemIndex = -1;
this.listBoxUserList.SeparationlineColor1 = System.Drawing.Color.Gray;
this.listBoxUserList.SeparationlineColor2 = System.Drawing.Color.LightGray;
this.listBoxUserList.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
this.listBoxUserList.SeparationlineVisibleBottom = true;
this.listBoxUserList.SeparationlineVisibleTop = true;
this.listBoxUserList.Size = new System.Drawing.Size(226, 438);
this.listBoxUserList.TabIndex = 426;
this.listBoxUserList.Text = "smartListBox1";
this.listBoxUserList.SelectedIndexChanged += new System.EventHandler(this.listBoxUserList_SelectedIndexChanged);
//
// smartGroupBox1 // smartGroupBox1
// //
this.smartGroupBox1.BackColor = System.Drawing.Color.White; this.smartGroupBox1.BackColor = System.Drawing.Color.White;
this.smartGroupBox1.BackPictureBox = this.smartForm1; this.smartGroupBox1.BackPictureBox = this.smartForm1;
this.smartGroupBox1.BackPictureBox1 = null; this.smartGroupBox1.BackPictureBox1 = null;
this.smartGroupBox1.Controls.Add(this.buttonResetPW);
this.smartGroupBox1.Controls.Add(this.labelAutoLogoutWarning); this.smartGroupBox1.Controls.Add(this.labelAutoLogoutWarning);
this.smartGroupBox1.Controls.Add(this.comboBoxAccessRight); this.smartGroupBox1.Controls.Add(this.comboBoxAccessRight);
this.smartGroupBox1.Controls.Add(this.labelAccessRightAdmin); this.smartGroupBox1.Controls.Add(this.labelAccessRightAdmin);
@ -223,7 +190,7 @@
// //
// comboBoxAccessRight // comboBoxAccessRight
// //
this.comboBoxAccessRight.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Regular); this.comboBoxAccessRight.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Regular);
this.comboBoxAccessRight.Location = new System.Drawing.Point(209, 67); this.comboBoxAccessRight.Location = new System.Drawing.Point(209, 67);
this.comboBoxAccessRight.Name = "comboBoxAccessRight"; this.comboBoxAccessRight.Name = "comboBoxAccessRight";
this.comboBoxAccessRight.Size = new System.Drawing.Size(270, 26); this.comboBoxAccessRight.Size = new System.Drawing.Size(270, 26);
@ -260,9 +227,9 @@
this.smartSeparatorLine2.Line2Visible = true; this.smartSeparatorLine2.Line2Visible = true;
this.smartSeparatorLine2.Line2Width = 1F; this.smartSeparatorLine2.Line2Width = 1F;
this.smartSeparatorLine2.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal; this.smartSeparatorLine2.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal;
this.smartSeparatorLine2.Location = new System.Drawing.Point(3, 376); this.smartSeparatorLine2.Location = new System.Drawing.Point(45, 376);
this.smartSeparatorLine2.Name = "smartSeparatorLine2"; this.smartSeparatorLine2.Name = "smartSeparatorLine2";
this.smartSeparatorLine2.Size = new System.Drawing.Size(543, 2); this.smartSeparatorLine2.Size = new System.Drawing.Size(501, 2);
this.smartSeparatorLine2.TabIndex = 237; this.smartSeparatorLine2.TabIndex = 237;
this.smartSeparatorLine2.Text = "smartSeparatorLine2"; this.smartSeparatorLine2.Text = "smartSeparatorLine2";
// //
@ -275,9 +242,9 @@
this.smartSeparatorLine1.Line2Visible = true; this.smartSeparatorLine1.Line2Visible = true;
this.smartSeparatorLine1.Line2Width = 1F; this.smartSeparatorLine1.Line2Width = 1F;
this.smartSeparatorLine1.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal; this.smartSeparatorLine1.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal;
this.smartSeparatorLine1.Location = new System.Drawing.Point(3, 283); this.smartSeparatorLine1.Location = new System.Drawing.Point(45, 283);
this.smartSeparatorLine1.Name = "smartSeparatorLine1"; this.smartSeparatorLine1.Name = "smartSeparatorLine1";
this.smartSeparatorLine1.Size = new System.Drawing.Size(543, 2); this.smartSeparatorLine1.Size = new System.Drawing.Size(501, 2);
this.smartSeparatorLine1.TabIndex = 236; this.smartSeparatorLine1.TabIndex = 236;
this.smartSeparatorLine1.Text = "smartSeparatorLine1"; this.smartSeparatorLine1.Text = "smartSeparatorLine1";
// //
@ -457,9 +424,9 @@
this.labelTitleAutomaticLogoutTime.ForeColor = System.Drawing.Color.White; this.labelTitleAutomaticLogoutTime.ForeColor = System.Drawing.Color.White;
this.labelTitleAutomaticLogoutTime.InitVisible = true; this.labelTitleAutomaticLogoutTime.InitVisible = true;
this.labelTitleAutomaticLogoutTime.LineSpacing = 0F; this.labelTitleAutomaticLogoutTime.LineSpacing = 0F;
this.labelTitleAutomaticLogoutTime.Location = new System.Drawing.Point(3, 393); this.labelTitleAutomaticLogoutTime.Location = new System.Drawing.Point(45, 393);
this.labelTitleAutomaticLogoutTime.Name = "labelTitleAutomaticLogoutTime"; this.labelTitleAutomaticLogoutTime.Name = "labelTitleAutomaticLogoutTime";
this.labelTitleAutomaticLogoutTime.Size = new System.Drawing.Size(200, 26); this.labelTitleAutomaticLogoutTime.Size = new System.Drawing.Size(158, 26);
this.labelTitleAutomaticLogoutTime.TabIndex = 227; this.labelTitleAutomaticLogoutTime.TabIndex = 227;
this.labelTitleAutomaticLogoutTime.Text = "Auto logout time"; this.labelTitleAutomaticLogoutTime.Text = "Auto logout time";
this.labelTitleAutomaticLogoutTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitleAutomaticLogoutTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -516,11 +483,11 @@
this.labelTitleExpiryDateOfPassword.ForeColor = System.Drawing.Color.White; this.labelTitleExpiryDateOfPassword.ForeColor = System.Drawing.Color.White;
this.labelTitleExpiryDateOfPassword.InitVisible = true; this.labelTitleExpiryDateOfPassword.InitVisible = true;
this.labelTitleExpiryDateOfPassword.LineSpacing = 0F; this.labelTitleExpiryDateOfPassword.LineSpacing = 0F;
this.labelTitleExpiryDateOfPassword.Location = new System.Drawing.Point(3, 332); this.labelTitleExpiryDateOfPassword.Location = new System.Drawing.Point(45, 332);
this.labelTitleExpiryDateOfPassword.Name = "labelTitleExpiryDateOfPassword"; this.labelTitleExpiryDateOfPassword.Name = "labelTitleExpiryDateOfPassword";
this.labelTitleExpiryDateOfPassword.Size = new System.Drawing.Size(200, 26); this.labelTitleExpiryDateOfPassword.Size = new System.Drawing.Size(158, 26);
this.labelTitleExpiryDateOfPassword.TabIndex = 225; this.labelTitleExpiryDateOfPassword.TabIndex = 225;
this.labelTitleExpiryDateOfPassword.Text = "Expiry date (Password)"; this.labelTitleExpiryDateOfPassword.Text = "Expiry date (PW)";
this.labelTitleExpiryDateOfPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitleExpiryDateOfPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleExpiryDateOfPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleExpiryDateOfPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleExpiryDateOfPassword.Wordwrap = false; this.labelTitleExpiryDateOfPassword.Wordwrap = false;
@ -537,11 +504,11 @@
this.labelTitleExpiryDateOfAccount.ForeColor = System.Drawing.Color.White; this.labelTitleExpiryDateOfAccount.ForeColor = System.Drawing.Color.White;
this.labelTitleExpiryDateOfAccount.InitVisible = true; this.labelTitleExpiryDateOfAccount.InitVisible = true;
this.labelTitleExpiryDateOfAccount.LineSpacing = 0F; this.labelTitleExpiryDateOfAccount.LineSpacing = 0F;
this.labelTitleExpiryDateOfAccount.Location = new System.Drawing.Point(3, 301); this.labelTitleExpiryDateOfAccount.Location = new System.Drawing.Point(45, 301);
this.labelTitleExpiryDateOfAccount.Name = "labelTitleExpiryDateOfAccount"; this.labelTitleExpiryDateOfAccount.Name = "labelTitleExpiryDateOfAccount";
this.labelTitleExpiryDateOfAccount.Size = new System.Drawing.Size(200, 26); this.labelTitleExpiryDateOfAccount.Size = new System.Drawing.Size(158, 26);
this.labelTitleExpiryDateOfAccount.TabIndex = 223; this.labelTitleExpiryDateOfAccount.TabIndex = 223;
this.labelTitleExpiryDateOfAccount.Text = "Expiry date (Account)"; this.labelTitleExpiryDateOfAccount.Text = "Expiry date (ID)";
this.labelTitleExpiryDateOfAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitleExpiryDateOfAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleExpiryDateOfAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleExpiryDateOfAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleExpiryDateOfAccount.Wordwrap = false; this.labelTitleExpiryDateOfAccount.Wordwrap = false;
@ -558,9 +525,9 @@
this.labelTitleAccessRight.ForeColor = System.Drawing.Color.White; this.labelTitleAccessRight.ForeColor = System.Drawing.Color.White;
this.labelTitleAccessRight.InitVisible = true; this.labelTitleAccessRight.InitVisible = true;
this.labelTitleAccessRight.LineSpacing = 0F; this.labelTitleAccessRight.LineSpacing = 0F;
this.labelTitleAccessRight.Location = new System.Drawing.Point(3, 67); this.labelTitleAccessRight.Location = new System.Drawing.Point(45, 67);
this.labelTitleAccessRight.Name = "labelTitleAccessRight"; this.labelTitleAccessRight.Name = "labelTitleAccessRight";
this.labelTitleAccessRight.Size = new System.Drawing.Size(200, 26); this.labelTitleAccessRight.Size = new System.Drawing.Size(158, 26);
this.labelTitleAccessRight.TabIndex = 221; this.labelTitleAccessRight.TabIndex = 221;
this.labelTitleAccessRight.Text = "Access right"; this.labelTitleAccessRight.Text = "Access right";
this.labelTitleAccessRight.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitleAccessRight.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -597,14 +564,32 @@
this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
this.smartGroupBox2.Image = null; this.smartGroupBox2.Image = null;
this.smartGroupBox2.InitVisible = true; this.smartGroupBox2.InitVisible = true;
this.smartGroupBox2.Location = new System.Drawing.Point(-3, 99); this.smartGroupBox2.Location = new System.Drawing.Point(36, 101);
this.smartGroupBox2.Name = "smartGroupBox2"; this.smartGroupBox2.Name = "smartGroupBox2";
this.smartGroupBox2.RoundRadius = 5; this.smartGroupBox2.RoundRadius = 5;
this.smartGroupBox2.Size = new System.Drawing.Size(553, 176); this.smartGroupBox2.Size = new System.Drawing.Size(514, 176);
this.smartGroupBox2.TabIndex = 217; this.smartGroupBox2.TabIndex = 217;
this.smartGroupBox2.Text = "Access right"; this.smartGroupBox2.Text = "Access right";
this.smartGroupBox2.TextColor = System.Drawing.Color.Black; this.smartGroupBox2.TextColor = System.Drawing.Color.Black;
// //
// labelEquipment
//
this.labelEquipment.BackPictureBox = this.smartForm1;
this.labelEquipment.BackPictureBox1 = null;
this.labelEquipment.BackPictureBox2 = null;
this.labelEquipment.BorderColor = System.Drawing.Color.Black;
this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelEquipment.InitVisible = true;
this.labelEquipment.LineSpacing = 0F;
this.labelEquipment.Location = new System.Drawing.Point(382, 71);
this.labelEquipment.Name = "labelEquipment";
this.labelEquipment.Size = new System.Drawing.Size(110, 18);
this.labelEquipment.TabIndex = 243;
this.labelEquipment.Text = "Equipment";
this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelEquipment.Wordwrap = false;
//
// labelMenu // labelMenu
// //
this.labelMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41))))); this.labelMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
@ -617,9 +602,9 @@
this.labelMenu.ForeColor = System.Drawing.Color.White; this.labelMenu.ForeColor = System.Drawing.Color.White;
this.labelMenu.InitVisible = true; this.labelMenu.InitVisible = true;
this.labelMenu.LineSpacing = 0F; this.labelMenu.LineSpacing = 0F;
this.labelMenu.Location = new System.Drawing.Point(148, 20); this.labelMenu.Location = new System.Drawing.Point(150, 21);
this.labelMenu.Name = "labelMenu"; this.labelMenu.Name = "labelMenu";
this.labelMenu.Size = new System.Drawing.Size(387, 20); this.labelMenu.Size = new System.Drawing.Size(342, 20);
this.labelMenu.TabIndex = 242; this.labelMenu.TabIndex = 242;
this.labelMenu.Text = "Menu"; this.labelMenu.Text = "Menu";
this.labelMenu.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelMenu.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -638,9 +623,9 @@
this.labelMain.ForeColor = System.Drawing.Color.White; this.labelMain.ForeColor = System.Drawing.Color.White;
this.labelMain.InitVisible = true; this.labelMain.InitVisible = true;
this.labelMain.LineSpacing = 0F; this.labelMain.LineSpacing = 0F;
this.labelMain.Location = new System.Drawing.Point(17, 20); this.labelMain.Location = new System.Drawing.Point(22, 21);
this.labelMain.Name = "labelMain"; this.labelMain.Name = "labelMain";
this.labelMain.Size = new System.Drawing.Size(125, 20); this.labelMain.Size = new System.Drawing.Size(110, 20);
this.labelMain.TabIndex = 241; this.labelMain.TabIndex = 241;
this.labelMain.Text = "Main"; this.labelMain.Text = "Main";
this.labelMain.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelMain.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -656,9 +641,9 @@
this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelViewer.InitVisible = true; this.labelViewer.InitVisible = true;
this.labelViewer.LineSpacing = 0F; this.labelViewer.LineSpacing = 0F;
this.labelViewer.Location = new System.Drawing.Point(410, 118); this.labelViewer.Location = new System.Drawing.Point(382, 119);
this.labelViewer.Name = "labelViewer"; this.labelViewer.Name = "labelViewer";
this.labelViewer.Size = new System.Drawing.Size(125, 18); this.labelViewer.Size = new System.Drawing.Size(110, 18);
this.labelViewer.TabIndex = 240; this.labelViewer.TabIndex = 240;
this.labelViewer.Text = "Viewer"; this.labelViewer.Text = "Viewer";
this.labelViewer.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelViewer.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -674,9 +659,9 @@
this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStatistics.InitVisible = true; this.labelStatistics.InitVisible = true;
this.labelStatistics.LineSpacing = 0F; this.labelStatistics.LineSpacing = 0F;
this.labelStatistics.Location = new System.Drawing.Point(410, 94); this.labelStatistics.Location = new System.Drawing.Point(382, 95);
this.labelStatistics.Name = "labelStatistics"; this.labelStatistics.Name = "labelStatistics";
this.labelStatistics.Size = new System.Drawing.Size(125, 18); this.labelStatistics.Size = new System.Drawing.Size(110, 18);
this.labelStatistics.TabIndex = 239; this.labelStatistics.TabIndex = 239;
this.labelStatistics.Text = "Statistics"; this.labelStatistics.Text = "Statistics";
this.labelStatistics.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelStatistics.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -692,9 +677,9 @@
this.labelUpdate.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelUpdate.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelUpdate.InitVisible = true; this.labelUpdate.InitVisible = true;
this.labelUpdate.LineSpacing = 0F; this.labelUpdate.LineSpacing = 0F;
this.labelUpdate.Location = new System.Drawing.Point(279, 94); this.labelUpdate.Location = new System.Drawing.Point(266, 95);
this.labelUpdate.Name = "labelUpdate"; this.labelUpdate.Name = "labelUpdate";
this.labelUpdate.Size = new System.Drawing.Size(125, 18); this.labelUpdate.Size = new System.Drawing.Size(110, 18);
this.labelUpdate.TabIndex = 238; this.labelUpdate.TabIndex = 238;
this.labelUpdate.Text = "Update"; this.labelUpdate.Text = "Update";
this.labelUpdate.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelUpdate.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -710,9 +695,9 @@
this.labelIOTest.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelIOTest.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelIOTest.InitVisible = true; this.labelIOTest.InitVisible = true;
this.labelIOTest.LineSpacing = 0F; this.labelIOTest.LineSpacing = 0F;
this.labelIOTest.Location = new System.Drawing.Point(279, 70); this.labelIOTest.Location = new System.Drawing.Point(266, 71);
this.labelIOTest.Name = "labelIOTest"; this.labelIOTest.Name = "labelIOTest";
this.labelIOTest.Size = new System.Drawing.Size(125, 18); this.labelIOTest.Size = new System.Drawing.Size(110, 18);
this.labelIOTest.TabIndex = 237; this.labelIOTest.TabIndex = 237;
this.labelIOTest.Text = "I/O Test"; this.labelIOTest.Text = "I/O Test";
this.labelIOTest.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelIOTest.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -728,9 +713,9 @@
this.labelMotor.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelMotor.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelMotor.InitVisible = true; this.labelMotor.InitVisible = true;
this.labelMotor.LineSpacing = 0F; this.labelMotor.LineSpacing = 0F;
this.labelMotor.Location = new System.Drawing.Point(279, 46); this.labelMotor.Location = new System.Drawing.Point(266, 47);
this.labelMotor.Name = "labelMotor"; this.labelMotor.Name = "labelMotor";
this.labelMotor.Size = new System.Drawing.Size(125, 18); this.labelMotor.Size = new System.Drawing.Size(110, 18);
this.labelMotor.TabIndex = 236; this.labelMotor.TabIndex = 236;
this.labelMotor.Text = "Motor"; this.labelMotor.Text = "Motor";
this.labelMotor.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelMotor.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -746,9 +731,9 @@
this.labelSystem.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelSystem.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelSystem.InitVisible = true; this.labelSystem.InitVisible = true;
this.labelSystem.LineSpacing = 0F; this.labelSystem.LineSpacing = 0F;
this.labelSystem.Location = new System.Drawing.Point(148, 142); this.labelSystem.Location = new System.Drawing.Point(150, 143);
this.labelSystem.Name = "labelSystem"; this.labelSystem.Name = "labelSystem";
this.labelSystem.Size = new System.Drawing.Size(125, 18); this.labelSystem.Size = new System.Drawing.Size(110, 18);
this.labelSystem.TabIndex = 235; this.labelSystem.TabIndex = 235;
this.labelSystem.Text = "System"; this.labelSystem.Text = "System";
this.labelSystem.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelSystem.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -764,9 +749,9 @@
this.labelDataBackup.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelDataBackup.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelDataBackup.InitVisible = true; this.labelDataBackup.InitVisible = true;
this.labelDataBackup.LineSpacing = 0F; this.labelDataBackup.LineSpacing = 0F;
this.labelDataBackup.Location = new System.Drawing.Point(410, 46); this.labelDataBackup.Location = new System.Drawing.Point(382, 47);
this.labelDataBackup.Name = "labelDataBackup"; this.labelDataBackup.Name = "labelDataBackup";
this.labelDataBackup.Size = new System.Drawing.Size(125, 18); this.labelDataBackup.Size = new System.Drawing.Size(110, 18);
this.labelDataBackup.TabIndex = 234; this.labelDataBackup.TabIndex = 234;
this.labelDataBackup.Text = "Data Backup"; this.labelDataBackup.Text = "Data Backup";
this.labelDataBackup.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelDataBackup.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -782,9 +767,9 @@
this.labelCalibration.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelCalibration.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelCalibration.InitVisible = true; this.labelCalibration.InitVisible = true;
this.labelCalibration.LineSpacing = 0F; this.labelCalibration.LineSpacing = 0F;
this.labelCalibration.Location = new System.Drawing.Point(148, 118); this.labelCalibration.Location = new System.Drawing.Point(150, 119);
this.labelCalibration.Name = "labelCalibration"; this.labelCalibration.Name = "labelCalibration";
this.labelCalibration.Size = new System.Drawing.Size(125, 18); this.labelCalibration.Size = new System.Drawing.Size(110, 18);
this.labelCalibration.TabIndex = 232; this.labelCalibration.TabIndex = 232;
this.labelCalibration.Text = "Calibration"; this.labelCalibration.Text = "Calibration";
this.labelCalibration.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelCalibration.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -800,9 +785,9 @@
this.labelCommunication.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelCommunication.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelCommunication.InitVisible = true; this.labelCommunication.InitVisible = true;
this.labelCommunication.LineSpacing = 0F; this.labelCommunication.LineSpacing = 0F;
this.labelCommunication.Location = new System.Drawing.Point(148, 94); this.labelCommunication.Location = new System.Drawing.Point(150, 95);
this.labelCommunication.Name = "labelCommunication"; this.labelCommunication.Name = "labelCommunication";
this.labelCommunication.Size = new System.Drawing.Size(125, 18); this.labelCommunication.Size = new System.Drawing.Size(110, 18);
this.labelCommunication.TabIndex = 231; this.labelCommunication.TabIndex = 231;
this.labelCommunication.Text = "Communication"; this.labelCommunication.Text = "Communication";
this.labelCommunication.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelCommunication.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -820,9 +805,9 @@
this.labelTime.ForeColor = System.Drawing.Color.Black; this.labelTime.ForeColor = System.Drawing.Color.Black;
this.labelTime.InitVisible = true; this.labelTime.InitVisible = true;
this.labelTime.LineSpacing = 0F; this.labelTime.LineSpacing = 0F;
this.labelTime.Location = new System.Drawing.Point(279, 142); this.labelTime.Location = new System.Drawing.Point(266, 143);
this.labelTime.Name = "labelTime"; this.labelTime.Name = "labelTime";
this.labelTime.Size = new System.Drawing.Size(125, 18); this.labelTime.Size = new System.Drawing.Size(110, 18);
this.labelTime.TabIndex = 230; this.labelTime.TabIndex = 230;
this.labelTime.Text = "Time"; this.labelTime.Text = "Time";
this.labelTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -838,9 +823,9 @@
this.labelInitialization.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelInitialization.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelInitialization.InitVisible = true; this.labelInitialization.InitVisible = true;
this.labelInitialization.LineSpacing = 0F; this.labelInitialization.LineSpacing = 0F;
this.labelInitialization.Location = new System.Drawing.Point(279, 118); this.labelInitialization.Location = new System.Drawing.Point(266, 119);
this.labelInitialization.Name = "labelInitialization"; this.labelInitialization.Name = "labelInitialization";
this.labelInitialization.Size = new System.Drawing.Size(125, 18); this.labelInitialization.Size = new System.Drawing.Size(110, 18);
this.labelInitialization.TabIndex = 229; this.labelInitialization.TabIndex = 229;
this.labelInitialization.Text = "Initialization"; this.labelInitialization.Text = "Initialization";
this.labelInitialization.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInitialization.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -856,9 +841,9 @@
this.labelConfiguration.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelConfiguration.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelConfiguration.InitVisible = true; this.labelConfiguration.InitVisible = true;
this.labelConfiguration.LineSpacing = 0F; this.labelConfiguration.LineSpacing = 0F;
this.labelConfiguration.Location = new System.Drawing.Point(148, 70); this.labelConfiguration.Location = new System.Drawing.Point(150, 71);
this.labelConfiguration.Name = "labelConfiguration"; this.labelConfiguration.Name = "labelConfiguration";
this.labelConfiguration.Size = new System.Drawing.Size(125, 18); this.labelConfiguration.Size = new System.Drawing.Size(110, 18);
this.labelConfiguration.TabIndex = 228; this.labelConfiguration.TabIndex = 228;
this.labelConfiguration.Text = "Configuration"; this.labelConfiguration.Text = "Configuration";
this.labelConfiguration.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelConfiguration.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -874,9 +859,9 @@
this.labelInformation.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelInformation.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelInformation.InitVisible = true; this.labelInformation.InitVisible = true;
this.labelInformation.LineSpacing = 0F; this.labelInformation.LineSpacing = 0F;
this.labelInformation.Location = new System.Drawing.Point(148, 46); this.labelInformation.Location = new System.Drawing.Point(150, 47);
this.labelInformation.Name = "labelInformation"; this.labelInformation.Name = "labelInformation";
this.labelInformation.Size = new System.Drawing.Size(125, 18); this.labelInformation.Size = new System.Drawing.Size(110, 18);
this.labelInformation.TabIndex = 227; this.labelInformation.TabIndex = 227;
this.labelInformation.Text = "Information"; this.labelInformation.Text = "Information";
this.labelInformation.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInformation.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -892,9 +877,9 @@
this.labelSubMenu.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelSubMenu.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelSubMenu.InitVisible = true; this.labelSubMenu.InitVisible = true;
this.labelSubMenu.LineSpacing = 0F; this.labelSubMenu.LineSpacing = 0F;
this.labelSubMenu.Location = new System.Drawing.Point(17, 118); this.labelSubMenu.Location = new System.Drawing.Point(22, 119);
this.labelSubMenu.Name = "labelSubMenu"; this.labelSubMenu.Name = "labelSubMenu";
this.labelSubMenu.Size = new System.Drawing.Size(125, 18); this.labelSubMenu.Size = new System.Drawing.Size(110, 18);
this.labelSubMenu.TabIndex = 226; this.labelSubMenu.TabIndex = 226;
this.labelSubMenu.Text = "SubMenu"; this.labelSubMenu.Text = "SubMenu";
this.labelSubMenu.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelSubMenu.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -910,9 +895,9 @@
this.labelClear.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelClear.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelClear.InitVisible = true; this.labelClear.InitVisible = true;
this.labelClear.LineSpacing = 0F; this.labelClear.LineSpacing = 0F;
this.labelClear.Location = new System.Drawing.Point(17, 94); this.labelClear.Location = new System.Drawing.Point(22, 95);
this.labelClear.Name = "labelClear"; this.labelClear.Name = "labelClear";
this.labelClear.Size = new System.Drawing.Size(125, 18); this.labelClear.Size = new System.Drawing.Size(110, 18);
this.labelClear.TabIndex = 225; this.labelClear.TabIndex = 225;
this.labelClear.Text = "Clear"; this.labelClear.Text = "Clear";
this.labelClear.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelClear.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -928,9 +913,9 @@
this.labelWeightSetting.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelWeightSetting.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelWeightSetting.InitVisible = true; this.labelWeightSetting.InitVisible = true;
this.labelWeightSetting.LineSpacing = 0F; this.labelWeightSetting.LineSpacing = 0F;
this.labelWeightSetting.Location = new System.Drawing.Point(17, 70); this.labelWeightSetting.Location = new System.Drawing.Point(22, 71);
this.labelWeightSetting.Name = "labelWeightSetting"; this.labelWeightSetting.Name = "labelWeightSetting";
this.labelWeightSetting.Size = new System.Drawing.Size(125, 18); this.labelWeightSetting.Size = new System.Drawing.Size(110, 18);
this.labelWeightSetting.TabIndex = 224; this.labelWeightSetting.TabIndex = 224;
this.labelWeightSetting.Text = "Weight Setting"; this.labelWeightSetting.Text = "Weight Setting";
this.labelWeightSetting.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelWeightSetting.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -948,9 +933,9 @@
this.labelProductNo.ForeColor = System.Drawing.Color.Black; this.labelProductNo.ForeColor = System.Drawing.Color.Black;
this.labelProductNo.InitVisible = true; this.labelProductNo.InitVisible = true;
this.labelProductNo.LineSpacing = 0F; this.labelProductNo.LineSpacing = 0F;
this.labelProductNo.Location = new System.Drawing.Point(17, 46); this.labelProductNo.Location = new System.Drawing.Point(22, 47);
this.labelProductNo.Name = "labelProductNo"; this.labelProductNo.Name = "labelProductNo";
this.labelProductNo.Size = new System.Drawing.Size(125, 18); this.labelProductNo.Size = new System.Drawing.Size(110, 18);
this.labelProductNo.TabIndex = 223; this.labelProductNo.TabIndex = 223;
this.labelProductNo.Text = "ProductNo"; this.labelProductNo.Text = "ProductNo";
this.labelProductNo.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelProductNo.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -989,9 +974,9 @@
this.labelTitlePassword.ForeColor = System.Drawing.Color.White; this.labelTitlePassword.ForeColor = System.Drawing.Color.White;
this.labelTitlePassword.InitVisible = true; this.labelTitlePassword.InitVisible = true;
this.labelTitlePassword.LineSpacing = 0F; this.labelTitlePassword.LineSpacing = 0F;
this.labelTitlePassword.Location = new System.Drawing.Point(3, 35); this.labelTitlePassword.Location = new System.Drawing.Point(45, 35);
this.labelTitlePassword.Name = "labelTitlePassword"; this.labelTitlePassword.Name = "labelTitlePassword";
this.labelTitlePassword.Size = new System.Drawing.Size(200, 26); this.labelTitlePassword.Size = new System.Drawing.Size(158, 26);
this.labelTitlePassword.TabIndex = 2; this.labelTitlePassword.TabIndex = 2;
this.labelTitlePassword.Text = "Password"; this.labelTitlePassword.Text = "Password";
this.labelTitlePassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitlePassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -1030,9 +1015,9 @@
this.labelTitleID.ForeColor = System.Drawing.Color.White; this.labelTitleID.ForeColor = System.Drawing.Color.White;
this.labelTitleID.InitVisible = true; this.labelTitleID.InitVisible = true;
this.labelTitleID.LineSpacing = 0F; this.labelTitleID.LineSpacing = 0F;
this.labelTitleID.Location = new System.Drawing.Point(3, 3); this.labelTitleID.Location = new System.Drawing.Point(45, 3);
this.labelTitleID.Name = "labelTitleID"; this.labelTitleID.Name = "labelTitleID";
this.labelTitleID.Size = new System.Drawing.Size(200, 26); this.labelTitleID.Size = new System.Drawing.Size(158, 26);
this.labelTitleID.TabIndex = 0; this.labelTitleID.TabIndex = 0;
this.labelTitleID.Text = "ID"; this.labelTitleID.Text = "ID";
this.labelTitleID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitleID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -1217,23 +1202,45 @@
this.buttonGroupEditor.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonGroupEditor.UpImage"))); this.buttonGroupEditor.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonGroupEditor.UpImage")));
this.buttonGroupEditor.Click += new System.EventHandler(this.buttonGroupEditor_Click); this.buttonGroupEditor.Click += new System.EventHandler(this.buttonGroupEditor_Click);
// //
// labelEquipment // buttonResetPW
// //
this.labelEquipment.BackPictureBox = this.smartForm1; this.buttonResetPW.BackPictureBox = null;
this.labelEquipment.BackPictureBox1 = null; this.buttonResetPW.BackPictureBox1 = null;
this.labelEquipment.BackPictureBox2 = null; this.buttonResetPW.BackPictureBox2 = null;
this.labelEquipment.BorderColor = System.Drawing.Color.Black; this.buttonResetPW.ButtonColor = System.Drawing.Color.Gainsboro;
this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None; this.buttonResetPW.ButtonImageAutoSize = true;
this.labelEquipment.InitVisible = true; this.buttonResetPW.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.labelEquipment.LineSpacing = 0F; this.buttonResetPW.DisableImage = null;
this.labelEquipment.Location = new System.Drawing.Point(410, 70); this.buttonResetPW.DownImage = null;
this.labelEquipment.Name = "labelEquipment"; this.buttonResetPW.GroupID = 0;
this.labelEquipment.Size = new System.Drawing.Size(125, 18); this.buttonResetPW.InitVisible = true;
this.labelEquipment.TabIndex = 243; this.buttonResetPW.Location = new System.Drawing.Point(485, 35);
this.labelEquipment.Text = "Equipment"; this.buttonResetPW.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.buttonResetPW.Name = "buttonResetPW";
this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.buttonResetPW.NestedClickEventPrevent = false;
this.labelEquipment.Wordwrap = false; this.buttonResetPW.OutlinePixel = 1;
this.buttonResetPW.RepeatInterval = 200;
this.buttonResetPW.RepeatIntervalAccelerate = null;
this.buttonResetPW.SafeInterval = 200;
this.buttonResetPW.Size = new System.Drawing.Size(57, 26);
this.buttonResetPW.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonResetPW.TabIndex = 244;
this.buttonResetPW.Text = "Reset";
this.buttonResetPW.TextColor = System.Drawing.Color.Black;
this.buttonResetPW.TextDownColor = System.Drawing.Color.White;
this.buttonResetPW.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonResetPW.TextLocation = new System.Drawing.Point(0, 0);
this.buttonResetPW.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonResetPW.UpImage = null;
this.buttonResetPW.Click += new System.EventHandler(this.buttonResetPW_Click);
//
// listBoxUserList
//
this.listBoxUserList.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.listBoxUserList.Location = new System.Drawing.Point(9, 77);
this.listBoxUserList.Name = "listBoxUserList";
this.listBoxUserList.Size = new System.Drawing.Size(265, 439);
this.listBoxUserList.TabIndex = 443;
// //
// FormUserEditor // FormUserEditor
// //
@ -1241,6 +1248,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoScroll = true; this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(800, 600); this.ClientSize = new System.Drawing.Size(800, 600);
this.Controls.Add(this.listBoxUserList);
this.Controls.Add(this.buttonGroupEditor); this.Controls.Add(this.buttonGroupEditor);
this.Controls.Add(this.buttonBack); this.Controls.Add(this.buttonBack);
this.Controls.Add(this.buttonDelete); this.Controls.Add(this.buttonDelete);
@ -1248,7 +1256,6 @@
this.Controls.Add(this.buttonSave); this.Controls.Add(this.buttonSave);
this.Controls.Add(this.smartGroupBox1); this.Controls.Add(this.smartGroupBox1);
this.Controls.Add(this.buttonNew); this.Controls.Add(this.buttonNew);
this.Controls.Add(this.listBoxUserList);
this.Controls.Add(this.labelTitle); this.Controls.Add(this.labelTitle);
this.Controls.Add(this.smartForm1); this.Controls.Add(this.smartForm1);
this.Name = "FormUserEditor"; this.Name = "FormUserEditor";
@ -1264,7 +1271,6 @@
private SmartX.SmartForm smartForm1; private SmartX.SmartForm smartForm1;
private SmartX.SmartLabel labelTitle; private SmartX.SmartLabel labelTitle;
private SmartX.SmartListBox listBoxUserList;
private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartGroupBox smartGroupBox1;
private SmartX.SmartLabel labelTitleAccessRight; private SmartX.SmartLabel labelTitleAccessRight;
private SmartX.SmartGroupBox smartGroupBox2; private SmartX.SmartGroupBox smartGroupBox2;
@ -1316,5 +1322,7 @@
public SmartX.SmartLabel labelAccessRightAdmin; public SmartX.SmartLabel labelAccessRightAdmin;
public SmartX.SmartLabel labelAutoLogoutWarning; public SmartX.SmartLabel labelAutoLogoutWarning;
private SmartX.SmartLabel labelEquipment; private SmartX.SmartLabel labelEquipment;
private SmartX.SmartButton buttonResetPW;
public System.Windows.Forms.ListBox listBoxUserList;
} }
} }

71
INT69DB_2A/Forms/FormUserEditor.cs
View File

@ -145,6 +145,8 @@ namespace INT69DB_2A.Forms
} }
private void SetEnablePassword(bool value) private void SetEnablePassword(bool value)
{ {
value = false;
this.labelPassword.Enabled = value; this.labelPassword.Enabled = value;
if (value == true) if (value == true)
@ -176,7 +178,7 @@ namespace INT69DB_2A.Forms
string code = "", message1 = "", message2 = "", detail = ""; string code = "", message1 = "", message2 = "", detail = "";
bool isNewReg = false; bool isNewReg = false;
if (this.listBoxUserList.SelectItemIndex == -1) if (this.listBoxUserList.SelectedIndex == -1)
isNewReg = true; isNewReg = true;
else else
isNewReg = false; isNewReg = false;
@ -328,7 +330,7 @@ namespace INT69DB_2A.Forms
private void UserNew() private void UserNew()
{ {
this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged); this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged);
this.listBoxUserList.SelectItemIndex = -1; this.listBoxUserList.SelectedIndex = -1;
this.listBoxUserList.SelectedIndexChanged += new EventHandler(this.listBoxUserList_SelectedIndexChanged); this.listBoxUserList.SelectedIndexChanged += new EventHandler(this.listBoxUserList_SelectedIndexChanged);
this.UpdateInitializeUserDisplay(this.ParentForm.SystemConfig); this.UpdateInitializeUserDisplay(this.ParentForm.SystemConfig);
@ -476,7 +478,7 @@ namespace INT69DB_2A.Forms
this.SelectedUserItem = new UserItem(); this.SelectedUserItem = new UserItem();
this.labelID.Text = ""; this.labelID.Text = "";
this.labelPassword.Text = ""; this.labelPassword.Text = this.SelectedUserItem.ResetPW;
this.labelExpiryDateOfAccount.Text = "180"; this.labelExpiryDateOfAccount.Text = "180";
this.labelExpiryDateOfPassword.Text = "90"; this.labelExpiryDateOfPassword.Text = "90";
this.labelExpiryDateOfAccount2.Text = "yyyy.mm.DD"; this.labelExpiryDateOfAccount2.Text = "yyyy.mm.DD";
@ -502,7 +504,7 @@ namespace INT69DB_2A.Forms
this.labelAutomaticLogoutTime.Text = system.AutomaticLogout.ToString(); this.labelAutomaticLogoutTime.Text = system.AutomaticLogout.ToString();
this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged); this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged);
this.listBoxUserList.SelectItemIndex = -1; this.listBoxUserList.SelectedIndex = -1;
this.listBoxUserList.SelectedIndexChanged += new EventHandler(this.listBoxUserList_SelectedIndexChanged); this.listBoxUserList.SelectedIndexChanged += new EventHandler(this.listBoxUserList_SelectedIndexChanged);
} }
private void UpdateCurrentUserItem(UserManager.UserMgr_user_list_t item) private void UpdateCurrentUserItem(UserManager.UserMgr_user_list_t item)
@ -528,10 +530,10 @@ namespace INT69DB_2A.Forms
else else
this.SelectedUserItem.Group = DataStore.UserGroup.None; this.SelectedUserItem.Group = DataStore.UserGroup.None;
Console.WriteLine(item.password_register_date.GetDateTime()); //Console.WriteLine(item.password_register_date.GetDateTime());
Console.WriteLine(item.id_login_date.GetDateTime()); //Console.WriteLine(item.id_login_date.GetDateTime());
Console.WriteLine(item.id_expire_date.GetDateTime()); //Console.WriteLine(item.id_expire_date.GetDateTime());
Console.WriteLine(item.password_expire_date.GetDateTime()); //Console.WriteLine(item.password_expire_date.GetDateTime());
DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null); DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.SelectedUserItem.DatePasswordRegister = time; this.SelectedUserItem.DatePasswordRegister = time;
@ -570,10 +572,10 @@ namespace INT69DB_2A.Forms
else if (item.active_level == 10) else if (item.active_level == 10)
this.SelectedUserItem.Group = DataStore.UserGroup.Developer; this.SelectedUserItem.Group = DataStore.UserGroup.Developer;
Console.WriteLine(item.password_register_date.GetDateTime()); //Console.WriteLine(item.password_register_date.GetDateTime());
Console.WriteLine(item.id_login_date.GetDateTime()); //Console.WriteLine(item.id_login_date.GetDateTime());
Console.WriteLine(item.id_expire_date.GetDateTime()); //Console.WriteLine(item.id_expire_date.GetDateTime());
Console.WriteLine(item.password_expire_date.GetDateTime()); //Console.WriteLine(item.password_expire_date.GetDateTime());
DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null); DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.SelectedUserItem.DatePasswordRegister = time; this.SelectedUserItem.DatePasswordRegister = time;
@ -669,9 +671,9 @@ namespace INT69DB_2A.Forms
} }
private void UpdateUserListBoxDisplay(List<string> items) private void UpdateUserListBoxDisplay(List<string> items)
{ {
this.listBoxUserList.ClearAll(); this.listBoxUserList.Items.Clear();
for (int i = 1; i < items.Count; i++) for (int i = 1; i < items.Count; i++)
this.listBoxUserList.AddItem(items[i]); this.listBoxUserList.Items.Add(items[i]);
} }
private void UpdateAccessRightDisplay(int level) private void UpdateAccessRightDisplay(int level)
{ {
@ -771,7 +773,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.ListDllUserName.Add(user.user_id); this.ParentForm.ListDllUserName.Add(user.user_id);
this.UpdateUserListBoxDisplay(this.ParentForm.ListDllUserName); this.UpdateUserListBoxDisplay(this.ParentForm.ListDllUserName);
this.listBoxUserList.SelectItemIndex = this.listBoxUserList.ItemCount - 1; this.listBoxUserList.SelectedIndex = this.listBoxUserList.Items.Count - 1;
this.buttonDelete.Visible = true; this.buttonDelete.Visible = true;
this.buttonSave.Visible = false; this.buttonSave.Visible = false;
@ -831,7 +833,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.UserEditor, detail); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.UserEditor, detail);
// 메시지 박스 교체 // 메시지 박스 교체
UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[this.listBoxUserList.SelectItemIndex]); UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0); DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0);
dlg.ShowDialog(); dlg.ShowDialog();
@ -850,7 +852,7 @@ namespace INT69DB_2A.Forms
this.SelectedUserItem.IsLockAccount = user.flock_status_account == 0 ? false : true; this.SelectedUserItem.IsLockAccount = user.flock_status_account == 0 ? false : true;
this.SelectedUserItem.IsLockPassword = user.flock_status_password == 0 ? false : true; this.SelectedUserItem.IsLockPassword = user.flock_status_password == 0 ? false : true;
UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[this.listBoxUserList.SelectItemIndex]); UserManager.UserManager_GetUserListID(this.SelectedUserItem.ID);
} }
} }
public void CallBackUserListDeleteDataEvent(UserManager.UserMgr_user_del_t user) public void CallBackUserListDeleteDataEvent(UserManager.UserMgr_user_del_t user)
@ -984,14 +986,39 @@ namespace INT69DB_2A.Forms
if (this.listBoxUserList.Items.Count <= 1) if (this.listBoxUserList.Items.Count <= 1)
return; return;
if (this.listBoxUserList.SelectItemIndex <= 0) if (this.listBoxUserList.SelectedIndex <= 0)
return; return;
string id = this.listBoxUserList.Items[this.listBoxUserList.SelectItemIndex]; string id = this.listBoxUserList.Items[this.listBoxUserList.SelectedIndex].ToString();
UserManager.UserManager_UserDel(id); UserManager.UserManager_UserDel(id);
} }
} }
private void buttonResetPW_Click(object sender, EventArgs e)
{
int ret = 0;
string id = "", pw = "";
if (this.listBoxUserList.Items.Count <= 1)
return;
if (this.listBoxUserList.SelectedIndex <= 0)
return;
// 메시지
// 비밀번호를 초기화 하시겠습니까?
DialogFormYesNo dlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 17);
if (dlg.ShowDialog() == DialogResult.Yes)
{
id = this.SelectedUserItem.ID;
pw = this.SelectedUserItem.ResetPW;
ret = UserManager.UserManager_UserResetPWDirect(id, pw);
if (ret == 0)
this.labelPassword.Text = pw;
}
}
private void buttonGroupEditor_Click(object sender, EventArgs e) private void buttonGroupEditor_Click(object sender, EventArgs e)
{ {
@ -1217,16 +1244,16 @@ namespace INT69DB_2A.Forms
private void listBoxUserList_SelectedIndexChanged(object sender, EventArgs e) private void listBoxUserList_SelectedIndexChanged(object sender, EventArgs e)
{ {
int index = this.listBoxUserList.SelectItemIndex; int index = this.listBoxUserList.SelectedIndex;
if (index != -1) if (index != -1)
{ {
if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index]) if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index].ToString())
this.buttonDelete.Visible = false; this.buttonDelete.Visible = false;
else else
this.buttonDelete.Visible = true; this.buttonDelete.Visible = true;
UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[index]); UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[index].ToString());
} }
} }
#endregion #endregion

7
INT69DB_2A/Part11_UserManager/UserItem.cs
View File

@ -12,6 +12,7 @@ namespace INT69DB_2A.Part11_UserManager
#region Field #region Field
private string m_ID; private string m_ID;
private string m_Password; private string m_Password;
private string m_ResetPW;
private int m_ExpireId; private int m_ExpireId;
private int m_ExpirePassword; private int m_ExpirePassword;
@ -51,6 +52,11 @@ namespace INT69DB_2A.Part11_UserManager
get { return this.m_Password; } get { return this.m_Password; }
set { this.m_Password = value; } set { this.m_Password = value; }
} }
public string ResetPW
{
get { return this.m_ResetPW; }
private set { this.m_ResetPW = value; }
}
public int ExpireId public int ExpireId
{ {
@ -125,6 +131,7 @@ namespace INT69DB_2A.Part11_UserManager
{ {
this.ID = "-"; this.ID = "-";
this.Password = "-"; this.Password = "-";
this.ResetPW = "Password12!";
this.ExpireId = 0; this.ExpireId = 0;
this.ExpirePassword = 0; this.ExpirePassword = 0;

3
INT69DB_2A/Part11_UserManager/UserManager.Define.cs
View File

@ -131,6 +131,9 @@ namespace INT69DB_2A.Part11_UserManager
[DllImport(PathDll, CallingConvention = CallingConvention.Winapi)] [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
private static extern int DLL_UserMgr_UserModifyID(IntPtr user_org_id, IntPtr user_new_id); private static extern int DLL_UserMgr_UserModifyID(IntPtr user_org_id, IntPtr user_new_id);
[DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
private static extern int DLL_UserMgr_UserResetPWDirect(IntPtr user_id, IntPtr user_pw);
[DllImport(PathDll, CallingConvention = CallingConvention.Winapi)] [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
private static extern int DLL_UserMgr_UserModifyOthers(IntPtr user_id, int fadmin, int expire_pw, int expire_account, int active_level); private static extern int DLL_UserMgr_UserModifyOthers(IntPtr user_id, int fadmin, int expire_pw, int expire_account, int active_level);

11
INT69DB_2A/Part11_UserManager/UserManager.cs
View File

@ -147,6 +147,17 @@ namespace INT69DB_2A.Part11_UserManager
return ret; return ret;
} }
public static int UserManager_UserResetPWDirect(String sID, String sNewPW)
{
int ret = 0;
IntPtr pID = Marshal.StringToBSTR(sID.ToString());
IntPtr pPW = Marshal.StringToBSTR(sNewPW.ToString());
ret = DLL_UserMgr_UserResetPWDirect(pID, pPW);
return ret;
}
public static void UserManager_UserModifyID(String sID, String sNewID) public static void UserManager_UserModifyID(String sID, String sNewID)
{ {

7
INT69DB_2A/Version.txt
View File

@ -19,11 +19,12 @@
- Ver 4.5.0 Modify - Ver 4.5.0 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21) - Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- (V4.5.1) 영문화면 영문 변경 안되는 버그 수정 - (V4.5.1) 영문화면 영문 변경 안되는 버그 수정
- 모터설정 - 모터 테스트(COM1, RS485)
'정회전' 동작 안하는 버그 수정
- Part 11 적용 - Part 11 적용
INT69DC_7C V11.0.0 참조 INT69DC_7C V11.0.0 참조
데이터 백업 스틱 2모드에서 통합 저장 방식으로 변경함
PW 초기값 : Password12!
- 모터설정 - 모터 테스트(COM1, RS485)
'정회전' 동작 안하는 버그 수정
- Level1, 2 default 그룹 bool값 적용 - Level1, 2 default 그룹 bool값 적용
- 데이터뷰어 - 파일 선택창에 필터 추가 - 데이터뷰어 - 파일 선택창에 필터 추가

6
INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.resx
View File

@ -514,9 +514,6 @@
<data name="engBypassCountUp" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="engBypassCountUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\engBypassCountUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Resources\engBypassCountUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="chnBackgroundUserLogin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\chnBackgroundUserLogin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="korBackgroundUserLogin" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="korBackgroundUserLogin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\korBackgroundUserLogin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Resources\korBackgroundUserLogin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -1108,4 +1105,7 @@
<data name="LoginImage2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="LoginImage2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\LoginImage2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Resources\LoginImage2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="chnBackgroundUserLogin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\chnBackgroundUserLogin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

BIN
INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll
View File

Binary file not shown.