diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.Designer.cs index 942b713..fbcdbb4 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.Designer.cs @@ -284,9 +284,9 @@ this.metroComboBox_ChangeAreaType.FormattingEnabled = true; this.metroComboBox_ChangeAreaType.ItemHeight = 23; this.metroComboBox_ChangeAreaType.Items.AddRange(new object[] { + "이용 불가", "대형", - "특대형", - "미할당"}); + "특대형"}); this.metroComboBox_ChangeAreaType.Location = new System.Drawing.Point(109, 16); this.metroComboBox_ChangeAreaType.Name = "metroComboBox_ChangeAreaType"; this.metroComboBox_ChangeAreaType.Size = new System.Drawing.Size(161, 29); diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs index 1dcc500..ec5fcaf 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs @@ -1,9 +1,7 @@ using MetroFramework; using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; -using System.Security.Cryptography.X509Certificates; using System.Windows.Forms; namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl @@ -42,8 +40,8 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl listViewItem.Text = areaSetting.No.ToString(); listViewItem.SubItems.Add(areaSetting.AreaName); string typeString = GetAreaTypeString(areaSetting.AreaType); - - listViewItem.SubItems.Add(typeString); + + listViewItem.SubItems.Add(typeString); return listViewItem; } @@ -85,7 +83,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl areaSetting.AreaType = (EAreaType)metroComboBox_NewAreaType.SelectedIndex; areaSetting.No = Database.SetAreaSetting(areaSetting); metroListView_Area.Items.Add(CreateListViewItem(areaSetting)); - + mAreaSettings.Add(areaSetting); metroTextBox_NewAreaName.Text = string.Empty; MetroMessageBox.Show(this, "추가 하였습니다.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); metroTextBox_NewAreaName.Focus(); @@ -101,7 +99,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl } int no = Convert.ToInt32(metroListView_Area.SelectedItems[0].Text); AreaSetting areaSetting = mAreaSettings.Single(x => x.No == no); - if(areaName == areaSetting.AreaName) + if (areaName == areaSetting.AreaName) { MetroMessageBox.Show(this, "이름이 변경되지 않았습니다..", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -127,7 +125,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl private void metroButton__ChangeAreaType_Click(object sender, EventArgs e) { int changeType = metroComboBox_ChangeAreaType.SelectedIndex; - if(changeType == -1) + if (changeType == -1) { MetroMessageBox.Show(this, "구역 타입이 선택되지 않았습니다.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -135,7 +133,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl EAreaType eAreaType = (EAreaType)changeType; int no = Convert.ToInt32(metroListView_Area.SelectedItems[0].Text); AreaSetting areaSetting = mAreaSettings.Single(x => x.No == no); - if(areaSetting.AreaType == eAreaType) + if (areaSetting.AreaType == eAreaType) { MetroMessageBox.Show(this, "구역 타입이 변경되지 않았습니다.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -155,14 +153,14 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl private void metroListView_Area_SelectedIndexChanged(object sender, EventArgs e) { - if(metroListView_Area.SelectedItems.Count < 1) + if (metroListView_Area.SelectedItems.Count < 1) { return; } int no = Convert.ToInt32(metroListView_Area.SelectedItems[0].Text); - AreaSetting areaSetting = mAreaSettings.Single(x => x.No == no); + AreaSetting areaSetting = mAreaSettings.Single(x => x.No == no); metroTextBox_ChangeAreaName.Text = areaSetting.AreaName; - metroComboBox_ChangeAreaType.SelectedIndex = Convert.ToInt32(areaSetting.AreaType)-1; + metroComboBox_ChangeAreaType.SelectedIndex = Convert.ToInt32(areaSetting.AreaType); } } } \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs index 019611c..92ff02a 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs @@ -153,14 +153,14 @@ namespace HSUCO_Cargo_Garage_Operation_Program public List Large { get; set; } public List OverSized { get; set; } } - + public struct LeftUserInformation { public int Large { get; set; } public int OverSized { get; set; } } - + public struct SetUserListInformation {