diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/ManualPermission.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/ManualPermission.cs index b9bf4ed..d99156d 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/ManualPermission.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/ManualPermission.cs @@ -7,17 +7,15 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm { public partial class ManualPermission : MetroForm { - private string _prifix = string.Empty; - public int selectArea; + public int selectArea { get; set; } - public ManualPermission(string prifix, List areas) + public ManualPermission(List areas) { InitializeComponent(); - _prifix = prifix; metroComboBox_Area.Items.Clear(); foreach (int i in areas) { - metroComboBox_Area.Items.Add($"{prifix}-{i}"); + metroComboBox_Area.Items.Add($"{i}"); } } @@ -30,7 +28,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm else { string text = metroComboBox_Area.Items[metroComboBox_Area.SelectedIndex].ToString(); - text = text.Replace($"{_prifix}-", ""); selectArea = Convert.ToInt32(text); DialogResult = DialogResult.OK; } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs index 3c23db0..21024b4 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs @@ -126,7 +126,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm var result = Database.UpdateUserData(_updateUserInformation); if (result) { - MetroMessageBox.Show(this, "변경이 완료되었습니다..", "이용자 정보 수정", MessageBoxButtons.OK, MessageBoxIcon.Information); + MetroMessageBox.Show(this, "변경이 완료되었습니다.", "이용자 정보 수정", MessageBoxButtons.OK, MessageBoxIcon.Information); } DialogResult = DialogResult.OK; diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs index 1caf96b..150e491 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs @@ -113,15 +113,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.DataSource = dataTable; dataGridView_List.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - /* - dataGridView_List.Columns[0].MinimumWidth = 100; - dataGridView_List.Columns[0].FillWeight = 100; - - dataGridView_List.Columns[1].MinimumWidth = 100; - dataGridView_List.Columns[1].FillWeight = 100; - dataGridView_List.Columns[2].MinimumWidth = 60; - dataGridView_List.Columns[2].FillWeight = 60; - */ } private void metroButton_Search_Click(object sender, EventArgs e) => DataChange(); @@ -178,14 +169,14 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl { stringBuilder = new StringBuilder(); stringBuilder.AppendLine("현재 당첨 가능한 사람/자리 가 없습니다."); - stringBuilder.AppendLine($"대　형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); + stringBuilder.AppendLine($"대\u3000형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); stringBuilder.Append($"특대형 대기인원/남은자리 : {leftUserInformation.OverSized}/{leftAreaInformation.OverSized.Count}"); MetroMessageBox.Show(this, stringBuilder.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } stringBuilder = new StringBuilder(); stringBuilder.AppendLine("다음 사항을 추첨하시겠습니까?"); - stringBuilder.AppendLine($"대　형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); + stringBuilder.AppendLine($"대\u3000형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); stringBuilder.Append($"특대형 대기인원/남은자리 : {leftUserInformation.OverSized}/{leftAreaInformation.OverSized.Count}"); dialogResult = MetroMessageBox.Show(this, stringBuilder.ToString(), "Error", MessageBoxButtons.YesNo, MessageBoxIcon.Information); if (dialogResult == DialogResult.Yes) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs index b544faa..1dcc500 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/AreaSettingControl.cs @@ -100,7 +100,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl return; } int no = Convert.ToInt32(metroListView_Area.SelectedItems[0].Text); - AreaSetting areaSetting = mAreaSettings.Where(x => x.No == no).Single(); + AreaSetting areaSetting = mAreaSettings.Single(x => x.No == no); if(areaName == areaSetting.AreaName) { MetroMessageBox.Show(this, "이름이 변경되지 않았습니다..", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -134,7 +134,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl } EAreaType eAreaType = (EAreaType)changeType; int no = Convert.ToInt32(metroListView_Area.SelectedItems[0].Text); - AreaSetting areaSetting = mAreaSettings.Where(x => x.No == no).Single(); + AreaSetting areaSetting = mAreaSettings.Single(x => x.No == no); if(areaSetting.AreaType == eAreaType) { MetroMessageBox.Show(this, "구역 타입이 변경되지 않았습니다.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs index 336f1ca..0ed1458 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs @@ -186,7 +186,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl { stringBuilder = new StringBuilder(); stringBuilder.AppendLine("현재 당첨 가능한 사람/자리 가 없습니다."); - stringBuilder.AppendLine($"대　형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); + stringBuilder.AppendLine($"대\u3000형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); stringBuilder.Append($"특대형 대기인원/남은자리 : {leftUserInformation.OverSized}/{leftAreaInformation.OverSized.Count}"); MetroMessageBox.Show(this, stringBuilder.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -194,7 +194,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl } stringBuilder = new StringBuilder(); stringBuilder.AppendLine("다음 사항을 추첨하시겠습니까?"); - stringBuilder.AppendLine($"대　형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); + stringBuilder.AppendLine($"대\u3000형 대기인원/남은자리 : {leftUserInformation.Large}/{leftAreaInformation.Large.Count}"); stringBuilder.Append($"특대형 대기인원/남은자리 : {leftUserInformation.OverSized}/{leftAreaInformation.OverSized.Count}"); dialogResult = MetroMessageBox.Show(this, stringBuilder.ToString(), "Error", MessageBoxButtons.YesNo, MessageBoxIcon.Information); if (dialogResult == DialogResult.Yes) @@ -265,7 +265,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl return; } - ManualPermission manualPermission = new ManualPermission(eVehicleType == EVehicleType.Large_Down || eVehicleType == EVehicleType.Large_Up ? "대형" : "특대형", leftArea); + ManualPermission manualPermission = new ManualPermission(leftArea); DialogResult result = manualPermission.ShowDialog(); if (result == DialogResult.OK) { diff --git a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs index 5c6ed82..e9bbea4 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs @@ -162,7 +162,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program public struct SetUserListInformation { public string No { get; set; } - public string Area { get; set; } + public int Area { get; set; } public string ApplicantNo { get; set; } public int UID { get; set; } public string CargoVehicleNumber { get; set; } diff --git a/HSUCO_Cargo_Garage_Operation_Program/Database.cs b/HSUCO_Cargo_Garage_Operation_Program/Database.cs index 6f3f353..3165af0 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs @@ -609,7 +609,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program } } } - query = $"SELECT COUNT(*) FROM UserList Where Area='{area}' AND ('{startDateTime.DateOnly()}' < DateEnd OR '{endDateTime.DateOnly()}' > DateStart) And (PaymentStatus={(int)EPaymentStatus.StandBy} OR PaymentStatus={(int)EPaymentStatus.Use})"; + query = $"SELECT COUNT(*) FROM UserList Where Area={area} AND ('{startDateTime.DateOnly()}' < DateEnd OR '{endDateTime.DateOnly()}' > DateStart) And (PaymentStatus={(int)EPaymentStatus.StandBy} OR PaymentStatus={(int)EPaymentStatus.Use})"; using (var command = _sqLiteConnection.CreateCommand()) { command.CommandText = query; @@ -852,20 +852,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program } List setUserListInformationFinal = new List(); - string test = ""; for (int i = 0; i < setUserListInformationLarge.Count; i++) { - var mm = setUserListInformationLarge.Where(x => x.UID == setUserListInformationLarge[i].UID); - test += mm.Count(); - SetUserListInformation setUserListInformation = setUserListInformationLarge[i]; - setUserListInformation.Area = "대형-" + leftAreaInformation.Large[i]; + setUserListInformation.Area = leftAreaInformation.Large[i]; setUserListInformationFinal.Add(setUserListInformation); } for (int i = 0; i < setUserListInformationOversized.Count; i++) { SetUserListInformation setUserListInformation = setUserListInformationOversized[i]; - setUserListInformation.Area = "특대형-" + leftAreaInformation.OverSized[i]; + setUserListInformation.Area = leftAreaInformation.OverSized[i]; setUserListInformationFinal.Add(setUserListInformation); } var result = SetUserList(setUserListInformationFinal, leftAreaInformation.StartDateTime, endDate); @@ -923,7 +919,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program } } } - setUserListInformation.Area = setUserListInformation.VehicleType == EVehicleType.Large_Down || setUserListInformation.VehicleType == EVehicleType.Large_Up ? $"대형-{area}" : $"특대형-{area}"; + setUserListInformation.Area = area; var result = SetUserList(new List() { setUserListInformation }, startDate, endDate); return result.Count != 0; } @@ -973,13 +969,13 @@ namespace HSUCO_Cargo_Garage_Operation_Program for (int i = 0; i < setUserListInformationLarge.Count; i++) { SetUserListInformation setUserListInformation = setUserListInformationLarge[i]; - setUserListInformation.Area = "대형-" + leftAreaInformation.Large[i]; + setUserListInformation.Area = leftAreaInformation.Large[i]; setUserListInformationFinal.Add(setUserListInformation); } for (int i = 0; i < setUserListInformationOversized.Count; i++) { SetUserListInformation setUserListInformation = setUserListInformationOversized[i]; - setUserListInformation.Area = "특대형-" + leftAreaInformation.OverSized[i]; + setUserListInformation.Area = leftAreaInformation.OverSized[i]; setUserListInformationFinal.Add(setUserListInformation); } var result = SetUserList(setUserListInformationFinal, leftAreaInformation.StartDateTime, endDate); @@ -995,7 +991,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program for (int i = 0; i < setUserListInformation.Count; i++) { string query = $"INSERT INTO UserList(No, Area, ApplicantNo, ApplicantDate, UID, Date, DateStart, DateEnd, ExtensionStatus, PaymentStatus) " + - $"VALUES('{noPrefix + lastNo}','{setUserListInformation[i].Area}','{setUserListInformation[i].ApplicantNo}','{setUserListInformation[i].Date.DateTimeDatabase()}',{setUserListInformation[i].UID},'{DateTime.Now.DateTimeDatabase()}','{startDate.DateOnly()}','{endDate.DateOnly()}',0,{(int)EPaymentStatus.StandBy})"; + $"VALUES('{noPrefix + lastNo}',{setUserListInformation[i].Area},'{setUserListInformation[i].ApplicantNo}','{setUserListInformation[i].Date.DateTimeDatabase()}',{setUserListInformation[i].UID},'{DateTime.Now.DateTimeDatabase()}','{startDate.DateOnly()}','{endDate.DateOnly()}',0,{(int)EPaymentStatus.StandBy})"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -1009,7 +1005,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program command.ExecuteNonQuery(); } ResultSetUserListInformation ResultSetUserListInformation = new ResultSetUserListInformation(); - ResultSetUserListInformation.Area = setUserListInformation[i].Area; + ResultSetUserListInformation.Area = GetAreaName(setUserListInformation[i].Area); ResultSetUserListInformation.No = noPrefix + lastNo; ResultSetUserListInformation.ApplicantNo = setUserListInformation[i].ApplicantNo; ResultSetUserListInformation.CargoVehicleNumber = setUserListInformation[i].CargoVehicleNumber;