diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs index 8acbb64..153521e 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; -using System.Runtime.Remoting.Channels; using System.Text; using System.Windows.Forms; @@ -151,7 +150,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl break; } string vehicleType = ""; - switch(nowUserList[i].VehicleType) + switch (nowUserList[i].VehicleType) { case EVehicleType.Large_Down: vehicleType = "대형(4.5톤 미만)"; @@ -178,7 +177,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl nowUserList[i].Phone, nowUserList[i].Address, nowUserList[i].Area, - + vehicleType, nowUserList[i].CargoVehicleNumber, nowUserList[i].CargoVehicleName, @@ -268,9 +267,9 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl } else { - amount = Global.GlobalSettings.CargoOversizedFee; + amount = Global.GlobalSettings.CargoOversizedFee; } - + amount = amount * 12; // 한달치 string cargoNumber = dataGridView_List.SelectedRows[0].Cells[9].Value.ToString(); var message = $"선태하신 차량 {cargoNumber}을 연장하시겠습니까?\r\n연장금액 : {String.Format("{0:n0}", amount)}원"; @@ -423,7 +422,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl MessageBoxIcon.Question); if (result == DialogResult.No) return; - + CertificateInformation certificateInformation = Database.GetUserCertificate(no); Promotion promotion = new Promotion("증명서 인증 기간", "증명 시작일", "증명 종료일"); DialogResult promotionDialogResult = promotion.ShowDialog(); @@ -446,6 +445,8 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl int lastNo = Database.GetLastCertificate(nowDateTime.Year); lastNo++; certificateInformation.IssueNumber = nowDateTime.Year.ToString() + "-C" + lastNo.ToString(); + certificateInformation.StartDate = promotion.StartDate; + certificateInformation.EndDate = promotion.EndDate; SetCertificateInformation setCertificateInformation = new SetCertificateInformation(); setCertificateInformation.No = certificateInformation.IssueNumber; @@ -539,13 +540,13 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl var status = Database.CheckPaymentStatus(no); if (status == EPaymentStatus.Delete) { - DialogResult dialogResult = MetroMessageBox.Show(this, "해당 사용자는 이미 삭제된 사용자입니다. 복구 하시겠습니까?", "Information", MessageBoxButtons.YesNo, MessageBoxIcon.Information); - if(dialogResult== DialogResult.No ) + DialogResult dialogResult = MetroMessageBox.Show(this, "해당 사용자는 이미 삭제된 사용자입니다. 복구 하시겠습니까?", "Information", MessageBoxButtons.YesNo, MessageBoxIcon.Information); + if (dialogResult == DialogResult.No) { return; } bool result = Database.DeleteUserUndo(no); - if(result) + if (result) { MetroMessageBox.Show(this, "성공적으로 복구 하였습니다..", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); DataChange(); @@ -563,8 +564,8 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl MetroMessageBox.Show(this, "현재 사용자는 삭제처리할수 없는 사용자 입니다.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - - + + Database.DeleteUser(no); MetroMessageBox.Show(this, "해당 사용자를 제거 완료했습니다.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); DataChange();