From 1926b9f4fc705103ea3b1bc7bbbb8225c9a0b147 Mon Sep 17 00:00:00 2001 From: Crudelis Date: Fri, 22 Sep 2023 14:05:49 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EA=B0=9C=EB=B0=9C=EB=B0=8F?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 사용자 정보 수정 기능 추가 - 사용자 삭제 기능 개발 - 자잘한 버그 수정 --- .../CustomForm/UpdateUserData.Designer.cs | 443 ++++++++++++++++++ .../CustomForm/UpdateUserData.cs | 118 +++++ .../CustomForm/UpdateUserData.resx | 120 +++++ .../ApplicantControl.Designer.cs | 1 - .../ApplicantList.Designer.cs | 51 +- .../CustomUserControl/ApplicantList.cs | 41 +- .../CustomUserControl/UserList.Designer.cs | 33 +- .../CustomUserControl/UserList.cs | 31 +- .../CustomUserControl/WaitingList.Designer.cs | 19 +- .../CustomUserControl/WaitingList.cs | 37 +- .../DataModel.cs | 25 +- .../Database.cs | 75 ++- .../{TextFile1.txt => DevelopReadMe.txt} | 0 ...SUCO_Cargo_Garage_Operation_Program.csproj | 9 + .../PrintCertificate.cs | 6 +- .../PrintFilingReceipt.cs | 6 +- 16 files changed, 915 insertions(+), 100 deletions(-) create mode 100644 HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs create mode 100644 HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs create mode 100644 HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.resx rename HSUCO_Cargo_Garage_Operation_Program/{TextFile1.txt => DevelopReadMe.txt} (100%) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs new file mode 100644 index 0000000..0f60131 --- /dev/null +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs @@ -0,0 +1,443 @@ +namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm +{ + partial class UpdateUserData + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.metroComboBox_VehicleType = new MetroFramework.Controls.MetroComboBox(); + this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); + this.metroTextBox_PersonalNumber = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel3 = new MetroFramework.Controls.MetroLabel(); + this.metroTextBox_PassengerVehicleName = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel2 = new MetroFramework.Controls.MetroLabel(); + this.metroTextBox_CargoVehicleName = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); + this.maskedTextBox_Phone = new System.Windows.Forms.MaskedTextBox(); + this.metroTextBox_Address = new MetroFramework.Controls.MetroTextBox(); + this.metroTextBox_Name = new MetroFramework.Controls.MetroTextBox(); + this.metroTextBox_PassengerVehicleNumber = new MetroFramework.Controls.MetroTextBox(); + this.metroTextBox_CargoVehicleNumber = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel_Address = new MetroFramework.Controls.MetroLabel(); + this.metroLabel_Phone = new MetroFramework.Controls.MetroLabel(); + this.metroLabel_Name = new MetroFramework.Controls.MetroLabel(); + this.metroLabel_PassengerVehicleNumber = new MetroFramework.Controls.MetroLabel(); + this.metroLabel_CargoVehicleNumber = new MetroFramework.Controls.MetroLabel(); + this.metroButton_Cancel = new MetroFramework.Controls.MetroButton(); + this.metroButton_Update = new MetroFramework.Controls.MetroButton(); + this.SuspendLayout(); + // + // metroComboBox_VehicleType + // + this.metroComboBox_VehicleType.FormattingEnabled = true; + this.metroComboBox_VehicleType.ItemHeight = 23; + this.metroComboBox_VehicleType.Items.AddRange(new object[] { + "대형(4.5톤 미만)", + "특대형(4.5톤 이상)"}); + this.metroComboBox_VehicleType.Location = new System.Drawing.Point(139, 200); + this.metroComboBox_VehicleType.Name = "metroComboBox_VehicleType"; + this.metroComboBox_VehicleType.Size = new System.Drawing.Size(203, 29); + this.metroComboBox_VehicleType.TabIndex = 27; + this.metroComboBox_VehicleType.UseSelectable = true; + // + // metroLabel4 + // + this.metroLabel4.AutoSize = true; + this.metroLabel4.Location = new System.Drawing.Point(30, 200); + this.metroLabel4.Name = "metroLabel4"; + this.metroLabel4.Size = new System.Drawing.Size(101, 19); + this.metroLabel4.TabIndex = 35; + this.metroLabel4.Text = "차 량  구 분"; + // + // metroTextBox_PersonalNumber + // + // + // + // + this.metroTextBox_PersonalNumber.CustomButton.Image = null; + this.metroTextBox_PersonalNumber.CustomButton.Location = new System.Drawing.Point(108, 1); + this.metroTextBox_PersonalNumber.CustomButton.Name = ""; + this.metroTextBox_PersonalNumber.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_PersonalNumber.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_PersonalNumber.CustomButton.TabIndex = 1; + this.metroTextBox_PersonalNumber.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_PersonalNumber.CustomButton.UseSelectable = true; + this.metroTextBox_PersonalNumber.CustomButton.Visible = false; + this.metroTextBox_PersonalNumber.Lines = new string[0]; + this.metroTextBox_PersonalNumber.Location = new System.Drawing.Point(140, 278); + this.metroTextBox_PersonalNumber.MaxLength = 32767; + this.metroTextBox_PersonalNumber.Name = "metroTextBox_PersonalNumber"; + this.metroTextBox_PersonalNumber.PasswordChar = '\0'; + this.metroTextBox_PersonalNumber.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_PersonalNumber.SelectedText = ""; + this.metroTextBox_PersonalNumber.SelectionLength = 0; + this.metroTextBox_PersonalNumber.SelectionStart = 0; + this.metroTextBox_PersonalNumber.ShortcutsEnabled = true; + this.metroTextBox_PersonalNumber.Size = new System.Drawing.Size(130, 23); + this.metroTextBox_PersonalNumber.TabIndex = 29; + this.metroTextBox_PersonalNumber.UseSelectable = true; + this.metroTextBox_PersonalNumber.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_PersonalNumber.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel3 + // + this.metroLabel3.AutoSize = true; + this.metroLabel3.Location = new System.Drawing.Point(30, 270); + this.metroLabel3.Name = "metroLabel3"; + this.metroLabel3.Size = new System.Drawing.Size(105, 38); + this.metroLabel3.TabIndex = 34; + this.metroLabel3.Text = "생 년  월 일\r\n (법인등록번호)"; + // + // metroTextBox_PassengerVehicleName + // + // + // + // + this.metroTextBox_PassengerVehicleName.CustomButton.Image = null; + this.metroTextBox_PassengerVehicleName.CustomButton.Location = new System.Drawing.Point(180, 1); + this.metroTextBox_PassengerVehicleName.CustomButton.Name = ""; + this.metroTextBox_PassengerVehicleName.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_PassengerVehicleName.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_PassengerVehicleName.CustomButton.TabIndex = 1; + this.metroTextBox_PassengerVehicleName.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_PassengerVehicleName.CustomButton.UseSelectable = true; + this.metroTextBox_PassengerVehicleName.CustomButton.Visible = false; + this.metroTextBox_PassengerVehicleName.Lines = new string[0]; + this.metroTextBox_PassengerVehicleName.Location = new System.Drawing.Point(140, 166); + this.metroTextBox_PassengerVehicleName.MaxLength = 32767; + this.metroTextBox_PassengerVehicleName.Name = "metroTextBox_PassengerVehicleName"; + this.metroTextBox_PassengerVehicleName.PasswordChar = '\0'; + this.metroTextBox_PassengerVehicleName.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_PassengerVehicleName.SelectedText = ""; + this.metroTextBox_PassengerVehicleName.SelectionLength = 0; + this.metroTextBox_PassengerVehicleName.SelectionStart = 0; + this.metroTextBox_PassengerVehicleName.ShortcutsEnabled = true; + this.metroTextBox_PassengerVehicleName.Size = new System.Drawing.Size(202, 23); + this.metroTextBox_PassengerVehicleName.TabIndex = 26; + this.metroTextBox_PassengerVehicleName.UseSelectable = true; + this.metroTextBox_PassengerVehicleName.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_PassengerVehicleName.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel2 + // + this.metroLabel2.AutoSize = true; + this.metroLabel2.Location = new System.Drawing.Point(30, 170); + this.metroLabel2.Name = "metroLabel2"; + this.metroLabel2.Size = new System.Drawing.Size(101, 19); + this.metroLabel2.TabIndex = 33; + this.metroLabel2.Text = "차  종(승용)"; + // + // metroTextBox_CargoVehicleName + // + // + // + // + this.metroTextBox_CargoVehicleName.CustomButton.Image = null; + this.metroTextBox_CargoVehicleName.CustomButton.Location = new System.Drawing.Point(180, 1); + this.metroTextBox_CargoVehicleName.CustomButton.Name = ""; + this.metroTextBox_CargoVehicleName.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_CargoVehicleName.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_CargoVehicleName.CustomButton.TabIndex = 1; + this.metroTextBox_CargoVehicleName.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_CargoVehicleName.CustomButton.UseSelectable = true; + this.metroTextBox_CargoVehicleName.CustomButton.Visible = false; + this.metroTextBox_CargoVehicleName.Lines = new string[0]; + this.metroTextBox_CargoVehicleName.Location = new System.Drawing.Point(140, 106); + this.metroTextBox_CargoVehicleName.MaxLength = 32767; + this.metroTextBox_CargoVehicleName.Name = "metroTextBox_CargoVehicleName"; + this.metroTextBox_CargoVehicleName.PasswordChar = '\0'; + this.metroTextBox_CargoVehicleName.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_CargoVehicleName.SelectedText = ""; + this.metroTextBox_CargoVehicleName.SelectionLength = 0; + this.metroTextBox_CargoVehicleName.SelectionStart = 0; + this.metroTextBox_CargoVehicleName.ShortcutsEnabled = true; + this.metroTextBox_CargoVehicleName.Size = new System.Drawing.Size(202, 23); + this.metroTextBox_CargoVehicleName.TabIndex = 22; + this.metroTextBox_CargoVehicleName.UseSelectable = true; + this.metroTextBox_CargoVehicleName.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_CargoVehicleName.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel1 + // + this.metroLabel1.AutoSize = true; + this.metroLabel1.Location = new System.Drawing.Point(30, 110); + this.metroLabel1.Name = "metroLabel1"; + this.metroLabel1.Size = new System.Drawing.Size(101, 19); + this.metroLabel1.TabIndex = 32; + this.metroLabel1.Text = "차  종(화물)"; + // + // maskedTextBox_Phone + // + this.maskedTextBox_Phone.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.maskedTextBox_Phone.Location = new System.Drawing.Point(140, 328); + this.maskedTextBox_Phone.Mask = "000-9000-0000"; + this.maskedTextBox_Phone.Name = "maskedTextBox_Phone"; + this.maskedTextBox_Phone.Size = new System.Drawing.Size(89, 21); + this.maskedTextBox_Phone.TabIndex = 30; + // + // metroTextBox_Address + // + // + // + // + this.metroTextBox_Address.CustomButton.Image = null; + this.metroTextBox_Address.CustomButton.Location = new System.Drawing.Point(291, 1); + this.metroTextBox_Address.CustomButton.Name = ""; + this.metroTextBox_Address.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_Address.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_Address.CustomButton.TabIndex = 1; + this.metroTextBox_Address.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_Address.CustomButton.UseSelectable = true; + this.metroTextBox_Address.CustomButton.Visible = false; + this.metroTextBox_Address.Lines = new string[0]; + this.metroTextBox_Address.Location = new System.Drawing.Point(140, 356); + this.metroTextBox_Address.MaxLength = 32767; + this.metroTextBox_Address.Name = "metroTextBox_Address"; + this.metroTextBox_Address.PasswordChar = '\0'; + this.metroTextBox_Address.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_Address.SelectedText = ""; + this.metroTextBox_Address.SelectionLength = 0; + this.metroTextBox_Address.SelectionStart = 0; + this.metroTextBox_Address.ShortcutsEnabled = true; + this.metroTextBox_Address.Size = new System.Drawing.Size(313, 23); + this.metroTextBox_Address.TabIndex = 31; + this.metroTextBox_Address.UseSelectable = true; + this.metroTextBox_Address.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_Address.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroTextBox_Name + // + // + // + // + this.metroTextBox_Name.CustomButton.Image = null; + this.metroTextBox_Name.CustomButton.Location = new System.Drawing.Point(108, 1); + this.metroTextBox_Name.CustomButton.Name = ""; + this.metroTextBox_Name.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_Name.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_Name.CustomButton.TabIndex = 1; + this.metroTextBox_Name.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_Name.CustomButton.UseSelectable = true; + this.metroTextBox_Name.CustomButton.Visible = false; + this.metroTextBox_Name.Lines = new string[0]; + this.metroTextBox_Name.Location = new System.Drawing.Point(140, 240); + this.metroTextBox_Name.MaxLength = 32767; + this.metroTextBox_Name.Name = "metroTextBox_Name"; + this.metroTextBox_Name.PasswordChar = '\0'; + this.metroTextBox_Name.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_Name.SelectedText = ""; + this.metroTextBox_Name.SelectionLength = 0; + this.metroTextBox_Name.SelectionStart = 0; + this.metroTextBox_Name.ShortcutsEnabled = true; + this.metroTextBox_Name.Size = new System.Drawing.Size(130, 23); + this.metroTextBox_Name.TabIndex = 28; + this.metroTextBox_Name.UseSelectable = true; + this.metroTextBox_Name.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_Name.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroTextBox_PassengerVehicleNumber + // + // + // + // + this.metroTextBox_PassengerVehicleNumber.CustomButton.Image = null; + this.metroTextBox_PassengerVehicleNumber.CustomButton.Location = new System.Drawing.Point(108, 1); + this.metroTextBox_PassengerVehicleNumber.CustomButton.Name = ""; + this.metroTextBox_PassengerVehicleNumber.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_PassengerVehicleNumber.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_PassengerVehicleNumber.CustomButton.TabIndex = 1; + this.metroTextBox_PassengerVehicleNumber.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_PassengerVehicleNumber.CustomButton.UseSelectable = true; + this.metroTextBox_PassengerVehicleNumber.CustomButton.Visible = false; + this.metroTextBox_PassengerVehicleNumber.Lines = new string[0]; + this.metroTextBox_PassengerVehicleNumber.Location = new System.Drawing.Point(140, 136); + this.metroTextBox_PassengerVehicleNumber.MaxLength = 32767; + this.metroTextBox_PassengerVehicleNumber.Name = "metroTextBox_PassengerVehicleNumber"; + this.metroTextBox_PassengerVehicleNumber.PasswordChar = '\0'; + this.metroTextBox_PassengerVehicleNumber.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_PassengerVehicleNumber.SelectedText = ""; + this.metroTextBox_PassengerVehicleNumber.SelectionLength = 0; + this.metroTextBox_PassengerVehicleNumber.SelectionStart = 0; + this.metroTextBox_PassengerVehicleNumber.ShortcutsEnabled = true; + this.metroTextBox_PassengerVehicleNumber.Size = new System.Drawing.Size(130, 23); + this.metroTextBox_PassengerVehicleNumber.TabIndex = 24; + this.metroTextBox_PassengerVehicleNumber.UseSelectable = true; + this.metroTextBox_PassengerVehicleNumber.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_PassengerVehicleNumber.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroTextBox_CargoVehicleNumber + // + // + // + // + this.metroTextBox_CargoVehicleNumber.CustomButton.Image = null; + this.metroTextBox_CargoVehicleNumber.CustomButton.Location = new System.Drawing.Point(108, 1); + this.metroTextBox_CargoVehicleNumber.CustomButton.Name = ""; + this.metroTextBox_CargoVehicleNumber.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_CargoVehicleNumber.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_CargoVehicleNumber.CustomButton.TabIndex = 1; + this.metroTextBox_CargoVehicleNumber.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_CargoVehicleNumber.CustomButton.UseSelectable = true; + this.metroTextBox_CargoVehicleNumber.CustomButton.Visible = false; + this.metroTextBox_CargoVehicleNumber.Lines = new string[0]; + this.metroTextBox_CargoVehicleNumber.Location = new System.Drawing.Point(140, 76); + this.metroTextBox_CargoVehicleNumber.MaxLength = 32767; + this.metroTextBox_CargoVehicleNumber.Name = "metroTextBox_CargoVehicleNumber"; + this.metroTextBox_CargoVehicleNumber.PasswordChar = '\0'; + this.metroTextBox_CargoVehicleNumber.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_CargoVehicleNumber.SelectedText = ""; + this.metroTextBox_CargoVehicleNumber.SelectionLength = 0; + this.metroTextBox_CargoVehicleNumber.SelectionStart = 0; + this.metroTextBox_CargoVehicleNumber.ShortcutsEnabled = true; + this.metroTextBox_CargoVehicleNumber.Size = new System.Drawing.Size(130, 23); + this.metroTextBox_CargoVehicleNumber.TabIndex = 19; + this.metroTextBox_CargoVehicleNumber.UseSelectable = true; + this.metroTextBox_CargoVehicleNumber.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_CargoVehicleNumber.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel_Address + // + this.metroLabel_Address.AutoSize = true; + this.metroLabel_Address.Location = new System.Drawing.Point(30, 360); + this.metroLabel_Address.Name = "metroLabel_Address"; + this.metroLabel_Address.Size = new System.Drawing.Size(101, 19); + this.metroLabel_Address.TabIndex = 25; + this.metroLabel_Address.Text = "주     소"; + // + // metroLabel_Phone + // + this.metroLabel_Phone.AutoSize = true; + this.metroLabel_Phone.Location = new System.Drawing.Point(30, 330); + this.metroLabel_Phone.Name = "metroLabel_Phone"; + this.metroLabel_Phone.Size = new System.Drawing.Size(103, 19); + this.metroLabel_Phone.TabIndex = 23; + this.metroLabel_Phone.Text = "연  락  처"; + // + // metroLabel_Name + // + this.metroLabel_Name.AutoSize = true; + this.metroLabel_Name.Location = new System.Drawing.Point(30, 240); + this.metroLabel_Name.Name = "metroLabel_Name"; + this.metroLabel_Name.Size = new System.Drawing.Size(101, 19); + this.metroLabel_Name.TabIndex = 21; + this.metroLabel_Name.Text = "이     름"; + // + // metroLabel_PassengerVehicleNumber + // + this.metroLabel_PassengerVehicleNumber.AutoSize = true; + this.metroLabel_PassengerVehicleNumber.Location = new System.Drawing.Point(30, 140); + this.metroLabel_PassengerVehicleNumber.Name = "metroLabel_PassengerVehicleNumber"; + this.metroLabel_PassengerVehicleNumber.Size = new System.Drawing.Size(101, 19); + this.metroLabel_PassengerVehicleNumber.TabIndex = 20; + this.metroLabel_PassengerVehicleNumber.Text = "차량번호(승용)"; + // + // metroLabel_CargoVehicleNumber + // + this.metroLabel_CargoVehicleNumber.AutoSize = true; + this.metroLabel_CargoVehicleNumber.Location = new System.Drawing.Point(30, 80); + this.metroLabel_CargoVehicleNumber.Name = "metroLabel_CargoVehicleNumber"; + this.metroLabel_CargoVehicleNumber.Size = new System.Drawing.Size(101, 19); + this.metroLabel_CargoVehicleNumber.TabIndex = 18; + this.metroLabel_CargoVehicleNumber.Text = "차량번호(화물)"; + // + // metroButton_Cancel + // + this.metroButton_Cancel.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton_Cancel.Location = new System.Drawing.Point(283, 406); + this.metroButton_Cancel.Name = "metroButton_Cancel"; + this.metroButton_Cancel.Size = new System.Drawing.Size(170, 50); + this.metroButton_Cancel.TabIndex = 37; + this.metroButton_Cancel.Text = "취 소"; + this.metroButton_Cancel.UseSelectable = true; + this.metroButton_Cancel.Click += new System.EventHandler(this.metroButton_Cancel_Click); + // + // metroButton_Update + // + this.metroButton_Update.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton_Update.Location = new System.Drawing.Point(100, 406); + this.metroButton_Update.Name = "metroButton_Update"; + this.metroButton_Update.Size = new System.Drawing.Size(170, 50); + this.metroButton_Update.TabIndex = 36; + this.metroButton_Update.Text = "수 정 "; + this.metroButton_Update.UseSelectable = true; + this.metroButton_Update.Click += new System.EventHandler(this.metroButton_Update_Click); + // + // UpdateUserData + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(490, 490); + this.Controls.Add(this.metroButton_Cancel); + this.Controls.Add(this.metroButton_Update); + this.Controls.Add(this.metroComboBox_VehicleType); + this.Controls.Add(this.metroLabel4); + this.Controls.Add(this.metroTextBox_PersonalNumber); + this.Controls.Add(this.metroLabel3); + this.Controls.Add(this.metroTextBox_PassengerVehicleName); + this.Controls.Add(this.metroLabel2); + this.Controls.Add(this.metroTextBox_CargoVehicleName); + this.Controls.Add(this.metroLabel1); + this.Controls.Add(this.maskedTextBox_Phone); + this.Controls.Add(this.metroTextBox_Address); + this.Controls.Add(this.metroTextBox_Name); + this.Controls.Add(this.metroTextBox_PassengerVehicleNumber); + this.Controls.Add(this.metroTextBox_CargoVehicleNumber); + this.Controls.Add(this.metroLabel_Address); + this.Controls.Add(this.metroLabel_Phone); + this.Controls.Add(this.metroLabel_Name); + this.Controls.Add(this.metroLabel_PassengerVehicleNumber); + this.Controls.Add(this.metroLabel_CargoVehicleNumber); + this.Name = "UpdateUserData"; + this.Text = "사용자 정보 수정"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private MetroFramework.Controls.MetroComboBox metroComboBox_VehicleType; + private MetroFramework.Controls.MetroLabel metroLabel4; + private MetroFramework.Controls.MetroTextBox metroTextBox_PersonalNumber; + private MetroFramework.Controls.MetroLabel metroLabel3; + private MetroFramework.Controls.MetroTextBox metroTextBox_PassengerVehicleName; + private MetroFramework.Controls.MetroLabel metroLabel2; + private MetroFramework.Controls.MetroTextBox metroTextBox_CargoVehicleName; + private MetroFramework.Controls.MetroLabel metroLabel1; + private System.Windows.Forms.MaskedTextBox maskedTextBox_Phone; + private MetroFramework.Controls.MetroTextBox metroTextBox_Address; + private MetroFramework.Controls.MetroTextBox metroTextBox_Name; + private MetroFramework.Controls.MetroTextBox metroTextBox_PassengerVehicleNumber; + private MetroFramework.Controls.MetroTextBox metroTextBox_CargoVehicleNumber; + private MetroFramework.Controls.MetroLabel metroLabel_Address; + private MetroFramework.Controls.MetroLabel metroLabel_Phone; + private MetroFramework.Controls.MetroLabel metroLabel_Name; + private MetroFramework.Controls.MetroLabel metroLabel_PassengerVehicleNumber; + private MetroFramework.Controls.MetroLabel metroLabel_CargoVehicleNumber; + private MetroFramework.Controls.MetroButton metroButton_Cancel; + private MetroFramework.Controls.MetroButton metroButton_Update; + } +} \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs new file mode 100644 index 0000000..0f5ed3c --- /dev/null +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs @@ -0,0 +1,118 @@ +using MetroFramework; +using MetroFramework.Forms; +using Microsoft.Office.Interop.Excel; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm +{ + public partial class UpdateUserData : MetroForm + { + private UpdateUserInformation _updateUserInformation; + public UpdateUserData(UpdateUserInformation updateUserInformation) + { + InitializeComponent(); + + _updateUserInformation = updateUserInformation; + UpdateControl(); + } + + public void UpdateControl() + { + if(_updateUserInformation.UserInformationType == EUserInformationType.ApplicantList) + { + metroComboBox_VehicleType.Enabled = true; + } + else + { + metroComboBox_VehicleType.Enabled = false; + } + + metroTextBox_CargoVehicleNumber.Text = _updateUserInformation.CargoVehicleNumber; + metroTextBox_CargoVehicleName.Text = _updateUserInformation.CargoVehicleName; + metroTextBox_PassengerVehicleNumber.Text = _updateUserInformation.PassengerVehicleNumber; + metroTextBox_PassengerVehicleName.Text = _updateUserInformation.PassengerVehicleName; + metroComboBox_VehicleType.SelectedIndex = (int)_updateUserInformation.VehicleType; + metroTextBox_Name.Text = _updateUserInformation.Name; + metroTextBox_PersonalNumber.Text = _updateUserInformation.PersonalNumber; + maskedTextBox_Phone.Text = _updateUserInformation.Phone; + metroTextBox_Address.Text = _updateUserInformation.Address; + } + + private void metroButton_Update_Click(object sender, EventArgs e) + { + bool change = false; + if(_updateUserInformation.CargoVehicleNumber != metroTextBox_CargoVehicleNumber.Text.Trim()) + { + change = true; + } + else if(_updateUserInformation.CargoVehicleName != metroTextBox_CargoVehicleName.Text.Trim()) + { + change = true; + } + else if (_updateUserInformation.PassengerVehicleNumber != metroTextBox_PassengerVehicleNumber.Text.Trim()) + { + change = true; + } + else if (_updateUserInformation.PassengerVehicleName != metroTextBox_PassengerVehicleName.Text.Trim()) + { + change = true; + } + else if (_updateUserInformation.VehicleType != (EVehicleType)metroComboBox_VehicleType.SelectedIndex) + { + change = true; + } + else if (_updateUserInformation.Name != metroTextBox_Name.Text.Trim()) + { + change = true; + } + + else if (_updateUserInformation.PersonalNumber != metroTextBox_PersonalNumber.Text.Trim()) + { + change = true; + } + else if (_updateUserInformation.Phone != maskedTextBox_Phone.Text.Trim()) + { + change = true; + } + else if (_updateUserInformation.Address != metroTextBox_Address.Text.Trim()) + { + change = true; + } + + + if (!change) + { + MetroMessageBox.Show(this, "변경된 내용이 없습니다.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _updateUserInformation.CargoVehicleNumber = metroTextBox_CargoVehicleNumber.Text.Trim(); + _updateUserInformation.CargoVehicleName = metroTextBox_CargoVehicleName.Text.Trim(); + _updateUserInformation.PassengerVehicleNumber = metroTextBox_PassengerVehicleNumber.Text.Trim(); + _updateUserInformation.PassengerVehicleName = metroTextBox_PassengerVehicleName.Text.Trim(); + _updateUserInformation.VehicleType = (EVehicleType)metroComboBox_VehicleType.SelectedIndex; + _updateUserInformation.Name = metroTextBox_Name.Text.Trim(); + _updateUserInformation.PersonalNumber = metroTextBox_PersonalNumber.Text.Trim(); + _updateUserInformation.Phone = maskedTextBox_Phone.Text.Trim(); + _updateUserInformation.Address = metroTextBox_Address.Text.Trim(); + + Database.UpdateUserData(_updateUserInformation); + + + DialogResult = DialogResult.OK; + } + + private void metroButton_Cancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + } + } +} diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.resx b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs index 9c2f6d1..0882316 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs @@ -423,7 +423,6 @@ this.metroComboBox_VehicleType.Size = new System.Drawing.Size(203, 29); this.metroComboBox_VehicleType.TabIndex = 6; this.metroComboBox_VehicleType.UseSelectable = true; - this.metroComboBox_VehicleType.SelectedIndex = 0; // // ApplicantControl // diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs index 0492680..78dbe36 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs @@ -28,8 +28,9 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.metroPanel1 = new MetroFramework.Controls.MetroPanel(); + this.metroButton_UpdateUserData = new MetroFramework.Controls.MetroButton(); this.metroButton_ExportExcel = new MetroFramework.Controls.MetroButton(); this.metroButton_Delete = new MetroFramework.Controls.MetroButton(); this.groupBox2 = new System.Windows.Forms.GroupBox(); @@ -41,7 +42,6 @@ this.metroButton_UpdateUser = new MetroFramework.Controls.MetroButton(); this.dataGridView_List = new System.Windows.Forms.DataGridView(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.metroButton1 = new MetroFramework.Controls.MetroButton(); this.metroPanel1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView_List)).BeginInit(); @@ -49,7 +49,7 @@ // // metroPanel1 // - this.metroPanel1.Controls.Add(this.metroButton1); + this.metroPanel1.Controls.Add(this.metroButton_UpdateUserData); this.metroPanel1.Controls.Add(this.metroButton_ExportExcel); this.metroPanel1.Controls.Add(this.metroButton_Delete); this.metroPanel1.Controls.Add(this.groupBox2); @@ -68,6 +68,18 @@ this.metroPanel1.VerticalScrollbarHighlightOnWheel = false; this.metroPanel1.VerticalScrollbarSize = 10; // + // metroButton_UpdateUserData + // + this.metroButton_UpdateUserData.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.metroButton_UpdateUserData.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton_UpdateUserData.Location = new System.Drawing.Point(626, 230); + this.metroButton_UpdateUserData.Name = "metroButton_UpdateUserData"; + this.metroButton_UpdateUserData.Size = new System.Drawing.Size(121, 40); + this.metroButton_UpdateUserData.TabIndex = 11; + this.metroButton_UpdateUserData.Text = "정보 수정"; + this.metroButton_UpdateUserData.UseSelectable = true; + this.metroButton_UpdateUserData.Click += new System.EventHandler(this.metroButton_UpdateUserData_Click); + // // metroButton_ExportExcel // this.metroButton_ExportExcel.Anchor = System.Windows.Forms.AnchorStyles.Right; @@ -187,11 +199,11 @@ // this.metroButton_UpdateUser.Anchor = System.Windows.Forms.AnchorStyles.Right; this.metroButton_UpdateUser.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_UpdateUser.Location = new System.Drawing.Point(626, 138); + this.metroButton_UpdateUser.Location = new System.Drawing.Point(626, 120); this.metroButton_UpdateUser.Name = "metroButton_UpdateUser"; this.metroButton_UpdateUser.Size = new System.Drawing.Size(121, 40); this.metroButton_UpdateUser.TabIndex = 7; - this.metroButton_UpdateUser.Text = "당첨 처리"; + this.metroButton_UpdateUser.Text = "추첨 하기"; this.metroButton_UpdateUser.UseSelectable = true; this.metroButton_UpdateUser.Click += new System.EventHandler(this.metroButton_UpdateUser_Click); // @@ -202,14 +214,14 @@ | System.Windows.Forms.AnchorStyles.Right))); this.dataGridView_List.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dataGridView_List.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_List.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_List.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dataGridView_List.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView_List.Location = new System.Drawing.Point(20, 120); this.dataGridView_List.Name = "dataGridView_List"; @@ -219,17 +231,6 @@ this.dataGridView_List.Size = new System.Drawing.Size(600, 330); this.dataGridView_List.TabIndex = 6; // - // metroButton1 - // - this.metroButton1.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.metroButton1.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton1.Location = new System.Drawing.Point(626, 184); - this.metroButton1.Name = "metroButton1"; - this.metroButton1.Size = new System.Drawing.Size(121, 40); - this.metroButton1.TabIndex = 11; - this.metroButton1.Text = "수정"; - this.metroButton1.UseSelectable = true; - // // ApplicantList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -259,6 +260,6 @@ private MetroFramework.Controls.MetroLabel metroLabel1; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; private MetroFramework.Controls.MetroButton metroButton_ExportExcel; - private MetroFramework.Controls.MetroButton metroButton1; + private MetroFramework.Controls.MetroButton metroButton_UpdateUserData; } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs index 05bbc9e..9bfde05 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs @@ -95,27 +95,26 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl void metroButton_Delete_Click(object sender, EventArgs e) { - var allCount = dataGridView_List.SelectedRows.Count; - if (allCount == 0) return; + var selectCount = dataGridView_List.SelectedRows.Count; + if (selectCount == 0) return; + string no = dataGridView_List.SelectedRows[0].Cells[0].Value.ToString(); - var CargoVehicleNumber = new List(); - for (int i = 0; i < dataGridView_List.SelectedRows.Count; i++) - { - CargoVehicleNumber.Add(dataGridView_List.SelectedRows[i].Cells[0].Value.ToString()); - } - - var message = "선태하신 " + allCount + "건을 삭제 하시겠습니까?"; + var message = "선태하신 화물챠랑번호 " + dataGridView_List.SelectedRows[0].Cells[5].Value.ToString() + "을 삭제 하시겠습니까?"; if (MetroMessageBox.Show(this, message, "삭제", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) { - var deleteReason = new DeleteReason(); - - if (deleteReason.ShowDialog() == DialogResult.OK) + bool result = Database.DeleteApplicantList(no); + if (result) { - Database.DeleteInspection(CargoVehicleNumber, deleteReason.ResultName, deleteReason.ResultReason); + MetroMessageBox.Show(this, "삭제에 성공하였습니다.", "성공", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); DataChange(); } + else + { + MetroMessageBox.Show(this, "삭제에 실패하였습니다.", "성공", MessageBoxButtons.OKCancel, MessageBoxIcon.Error); + } + } } @@ -166,5 +165,21 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl var result = excelWrapper.WriteDataTableToExcel((DataTable)dataGridView_List.DataSource, "UserList", saveFileDialog.FileName, "이용자 리스트", Environment.MachineName, DateTime.Now); } } + + private void metroButton_UpdateUserData_Click(object sender, EventArgs e) + { + var selectCount = dataGridView_List.SelectedRows.Count; + if (selectCount == 0) return; + string no = dataGridView_List.SelectedRows[0].Cells[0].Value.ToString(); + + UpdateUserInformation updateUserInformation = Database.GetUserData(EUserInformationType.ApplicantList, no); + UpdateUserData updateUserData = new UpdateUserData(updateUserInformation); + DialogResult dialogResult = updateUserData.ShowDialog(); + if(dialogResult ==DialogResult.OK) + { + DataChange(); + } + + } } } \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs index 2b8150c..5fed8ed 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs @@ -34,7 +34,7 @@ this.metroRadioButton_UseUser = new MetroFramework.Controls.MetroRadioButton(); this.metroRadioButton_InspectionAll = new MetroFramework.Controls.MetroRadioButton(); this.metroPanel1 = new MetroFramework.Controls.MetroPanel(); - this.metroButton1 = new MetroFramework.Controls.MetroButton(); + this.metroButton_UpdateUserData = new MetroFramework.Controls.MetroButton(); this.metroButton_Certificate = new MetroFramework.Controls.MetroButton(); this.metroButton_ExportExcel = new MetroFramework.Controls.MetroButton(); this.metroButton_Refund = new MetroFramework.Controls.MetroButton(); @@ -100,7 +100,7 @@ // // metroPanel1 // - this.metroPanel1.Controls.Add(this.metroButton1); + this.metroPanel1.Controls.Add(this.metroButton_UpdateUserData); this.metroPanel1.Controls.Add(this.metroButton_Certificate); this.metroPanel1.Controls.Add(this.metroButton_ExportExcel); this.metroPanel1.Controls.Add(this.metroButton_Refund); @@ -121,22 +121,23 @@ this.metroPanel1.VerticalScrollbarHighlightOnWheel = false; this.metroPanel1.VerticalScrollbarSize = 10; // - // metroButton1 + // metroButton_UpdateUserData // - this.metroButton1.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.metroButton1.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton1.Location = new System.Drawing.Point(626, 256); - this.metroButton1.Name = "metroButton1"; - this.metroButton1.Size = new System.Drawing.Size(121, 40); - this.metroButton1.TabIndex = 11; - this.metroButton1.Text = "수정"; - this.metroButton1.UseSelectable = true; + this.metroButton_UpdateUserData.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.metroButton_UpdateUserData.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton_UpdateUserData.Location = new System.Drawing.Point(626, 166); + this.metroButton_UpdateUserData.Name = "metroButton_UpdateUserData"; + this.metroButton_UpdateUserData.Size = new System.Drawing.Size(121, 40); + this.metroButton_UpdateUserData.TabIndex = 13; + this.metroButton_UpdateUserData.Text = "정보 수정"; + this.metroButton_UpdateUserData.UseSelectable = true; + this.metroButton_UpdateUserData.Click += new System.EventHandler(this.metroButton_UpdateUserData_Click); // // metroButton_Certificate // this.metroButton_Certificate.Anchor = System.Windows.Forms.AnchorStyles.Right; this.metroButton_Certificate.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Certificate.Location = new System.Drawing.Point(626, 210); + this.metroButton_Certificate.Location = new System.Drawing.Point(626, 120); this.metroButton_Certificate.Name = "metroButton_Certificate"; this.metroButton_Certificate.Size = new System.Drawing.Size(121, 40); this.metroButton_Certificate.TabIndex = 10; @@ -161,7 +162,7 @@ // this.metroButton_Refund.Anchor = System.Windows.Forms.AnchorStyles.Right; this.metroButton_Refund.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Refund.Location = new System.Drawing.Point(626, 166); + this.metroButton_Refund.Location = new System.Drawing.Point(626, 289); this.metroButton_Refund.Name = "metroButton_Refund"; this.metroButton_Refund.Size = new System.Drawing.Size(121, 40); this.metroButton_Refund.TabIndex = 8; @@ -173,11 +174,11 @@ // this.metroButton_Extended.Anchor = System.Windows.Forms.AnchorStyles.Right; this.metroButton_Extended.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Extended.Location = new System.Drawing.Point(626, 120); + this.metroButton_Extended.Location = new System.Drawing.Point(626, 243); this.metroButton_Extended.Name = "metroButton_Extended"; this.metroButton_Extended.Size = new System.Drawing.Size(121, 40); this.metroButton_Extended.TabIndex = 8; - this.metroButton_Extended.Text = "연장 처리"; + this.metroButton_Extended.Text = "연장"; this.metroButton_Extended.UseSelectable = true; this.metroButton_Extended.Click += new System.EventHandler(this.metroButton_Extended_Click); // @@ -333,6 +334,6 @@ private MetroFramework.Controls.MetroButton metroButton_Extended; private MetroFramework.Controls.MetroButton metroButton_ExportExcel; private MetroFramework.Controls.MetroButton metroButton_Certificate; - private MetroFramework.Controls.MetroButton metroButton1; + private MetroFramework.Controls.MetroButton metroButton_UpdateUserData; } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs index bb0589c..ef2d847 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs @@ -1,4 +1,5 @@ -using HSUCO_Cargo_Garage_Operation_Program.Properties; +using HSUCO_Cargo_Garage_Operation_Program.CustomForm; +using HSUCO_Cargo_Garage_Operation_Program.Properties; using MetroFramework; using System; using System.Collections.Generic; @@ -47,16 +48,20 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl .Where(x => x.CargoVehicleNumber.Contains(metroTextBox_Search.Text.Trim())).ToList(); break; + case 1: nowUserList = nowUserList .Where(x => x.PassengerVehicleNumber.Contains(metroTextBox_Search.Text.Trim())).ToList(); break; + case 2: nowUserList = nowUserList.Where(x => x.Name.Contains(metroTextBox_Search.Text.Trim())).ToList(); break; + case 3: nowUserList = nowUserList.Where(x => x.Phone.Contains(metroTextBox_Search.Text.Trim())).ToList(); break; + case 4: nowUserList = nowUserList.Where(x => x.Address.Contains(metroTextBox_Search.Text.Trim())).ToList(); break; @@ -120,7 +125,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.Columns[2].FillWeight = 60; dataGridView_List.Columns[15].DefaultCellStyle.WrapMode = DataGridViewTriState.True; - } private void metroButton_Search_Click(object sender, EventArgs e) @@ -179,7 +183,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl { var allCount = dataGridView_List.SelectedRows.Count; if (allCount == 0) return; - // TODO: 환불시 금액은 남은 이용일 일활 계산 + // TODO: 환불시 금액은 남은 이용일 일활 계산 // 이 사람의 결제 금액 가져오기 -> 남은 일수 만큼 나누고 원단위 올림처리 연장 되었을경우 까지 처리 } @@ -196,7 +200,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl MessageBoxIcon.Question); if (result == DialogResult.No) return; - CertificateInformation certificateInformation = new CertificateInformation(); //DB 에서 다시 가져오는 선택? certificateInformation.Name = dataGridView_List.SelectedRows[0].Cells[4].Value.ToString(); @@ -211,12 +214,10 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl certificateInformation.EndDate = DateTime.Parse(dataGridView_List.SelectedRows[0].Cells[14].Value.ToString()); certificateInformation.IssueDate = nowDateTime; - int lastNo = Database.GetLastCertificate(nowDateTime.Year); lastNo++; certificateInformation.IssueNumber = nowDateTime.Year.ToString() + "-" + lastNo.ToString(); - SetCertificateInformation setCertificateInformation = new SetCertificateInformation(); setCertificateInformation.No = dataGridView_List.SelectedRows[0].Cells[0].Value.ToString(); setCertificateInformation.UserNo = dataGridView_List.SelectedRows[0].Cells[0].Value.ToString(); @@ -225,7 +226,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl setCertificateInformation.EndDate = certificateInformation.EndDate; setCertificateInformation.Amount = certificateInformation.Amount; - // 증명서 발급 요금 계산 SetProceedsInfo setProceedsInfo = new SetProceedsInfo(); setProceedsInfo.No = setCertificateInformation.UserNo; @@ -238,6 +238,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl case EVehicleType.Large: setProceedsInfo.Amount = Global.GlobalSettings.CargoLargeCertificateFee; break; + case EVehicleType.Oversized: setProceedsInfo.Amount = Global.GlobalSettings.CargoOversizedFee; break; @@ -256,12 +257,22 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl printPreviewDialog.WindowState = FormWindowState.Maximized; printPreviewDialog.Document = print.printDocument; printPreviewDialog.ShowDialog(); - } + } + private void metroButton_UpdateUserData_Click(object sender, EventArgs e) + { + var selectCount = dataGridView_List.SelectedRows.Count; + if (selectCount == 0) return; + string no = dataGridView_List.SelectedRows[0].Cells[0].Value.ToString(); - - + UpdateUserInformation updateUserInformation = Database.GetUserData(EUserInformationType.UserList, no); + UpdateUserData updateUserData = new UpdateUserData(updateUserInformation); + DialogResult dialogResult = updateUserData.ShowDialog(); + if (dialogResult == DialogResult.OK) + { + DataChange(); + } } } } \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.Designer.cs index cb04924..7a54af0 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.Designer.cs @@ -30,6 +30,7 @@ { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.metroPanel1 = new MetroFramework.Controls.MetroPanel(); + this.metroButton_UpdateUserData = new MetroFramework.Controls.MetroButton(); this.metroButton_ExportExcel = new MetroFramework.Controls.MetroButton(); this.metroButton_Delete = new MetroFramework.Controls.MetroButton(); this.groupBox2 = new System.Windows.Forms.GroupBox(); @@ -48,6 +49,7 @@ // // metroPanel1 // + this.metroPanel1.Controls.Add(this.metroButton_UpdateUserData); this.metroPanel1.Controls.Add(this.metroButton_ExportExcel); this.metroPanel1.Controls.Add(this.metroButton_Delete); this.metroPanel1.Controls.Add(this.groupBox2); @@ -66,6 +68,18 @@ this.metroPanel1.VerticalScrollbarHighlightOnWheel = false; this.metroPanel1.VerticalScrollbarSize = 10; // + // metroButton_UpdateUserData + // + this.metroButton_UpdateUserData.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.metroButton_UpdateUserData.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton_UpdateUserData.Location = new System.Drawing.Point(626, 230); + this.metroButton_UpdateUserData.Name = "metroButton_UpdateUserData"; + this.metroButton_UpdateUserData.Size = new System.Drawing.Size(121, 40); + this.metroButton_UpdateUserData.TabIndex = 12; + this.metroButton_UpdateUserData.Text = "정보 수정"; + this.metroButton_UpdateUserData.UseSelectable = true; + this.metroButton_UpdateUserData.Click += new System.EventHandler(this.metroButton_UpdateUserData_Click); + // // metroButton_ExportExcel // this.metroButton_ExportExcel.Anchor = System.Windows.Forms.AnchorStyles.Right; @@ -83,7 +97,7 @@ // this.metroButton_Delete.Anchor = System.Windows.Forms.AnchorStyles.Right; this.metroButton_Delete.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Delete.Location = new System.Drawing.Point(626, 184); + this.metroButton_Delete.Location = new System.Drawing.Point(626, 276); this.metroButton_Delete.Name = "metroButton_Delete"; this.metroButton_Delete.Size = new System.Drawing.Size(121, 40); this.metroButton_Delete.TabIndex = 10; @@ -185,7 +199,7 @@ // this.metroButton_UpdateUser.Anchor = System.Windows.Forms.AnchorStyles.Right; this.metroButton_UpdateUser.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_UpdateUser.Location = new System.Drawing.Point(626, 138); + this.metroButton_UpdateUser.Location = new System.Drawing.Point(626, 120); this.metroButton_UpdateUser.Name = "metroButton_UpdateUser"; this.metroButton_UpdateUser.Size = new System.Drawing.Size(121, 40); this.metroButton_UpdateUser.TabIndex = 7; @@ -247,5 +261,6 @@ private MetroFramework.Controls.MetroLabel metroLabel1; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; private MetroFramework.Controls.MetroButton metroButton_ExportExcel; + private MetroFramework.Controls.MetroButton metroButton_UpdateUserData; } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs index 9fe5642..f4afa44 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs @@ -107,14 +107,26 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl void metroButton_Delete_Click(object sender, EventArgs e) { - var allCount = dataGridView_List.SelectedRows.Count; - if (allCount == 0) return; + var selectCount = dataGridView_List.SelectedRows.Count; + if (selectCount == 0) return; + string no = dataGridView_List.SelectedRows[0].Cells[0].Value.ToString(); - var CargoVehicleNumber = new List(); - for (int i = 0; i < dataGridView_List.SelectedRows.Count; i++) + var message = "선태하신 화물챠랑번호 " + dataGridView_List.SelectedRows[0].Cells[5].Value.ToString() + "을 삭제 하시겠습니까?"; + + if (MetroMessageBox.Show(this, message, "삭제", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) { - CargoVehicleNumber.Add(dataGridView_List.SelectedRows[i].Cells[0].Value.ToString()); + bool result = Database.DeleteApplicantList(no); + if(result) + { + MetroMessageBox.Show(this, "삭제에 성공하였습니다.", "성공", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); + DataChange(); + } + else + { + MetroMessageBox.Show(this, "삭제에 실패하였습니다.", "성공", MessageBoxButtons.OKCancel, MessageBoxIcon.Error ); + } + } } @@ -160,5 +172,20 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl var result = excelWrapper.WriteDataTableToExcel((DataTable)dataGridView_List.DataSource, "UserList", saveFileDialog.FileName, "이용자 리스트", Environment.MachineName, DateTime.Now); } } + + private void metroButton_UpdateUserData_Click(object sender, EventArgs e) + { + var selectCount = dataGridView_List.SelectedRows.Count; + if (selectCount == 0) return; + string no = dataGridView_List.SelectedRows[0].Cells[0].Value.ToString(); + + UpdateUserInformation updateUserInformation = Database.GetUserData(EUserInformationType.ApplicantList, no); + UpdateUserData updateUserData = new UpdateUserData(updateUserInformation); + DialogResult dialogResult = updateUserData.ShowDialog(); + if (dialogResult == DialogResult.OK) + { + DataChange(); + } + } } } \ 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 b98413a..66ad74f 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs @@ -111,9 +111,24 @@ namespace HSUCO_Cargo_Garage_Operation_Program public string Address { get; set; } public string CargoVehicleNumber { get; set; } public string PassengerVehicleNumber { get; set; } - public int WaitingOrder { get; set; } } - + /// + /// 사용자 정보 변경용 인포메이션 + /// + public struct UpdateUserInformation + { + public EUserInformationType UserInformationType { get; set; } // 유저 타입 + public string No { get; set; } // 고유번호 + public string CargoVehicleNumber { get; set; } // 화물차량번호 + public string CargoVehicleName { get; set; } // 화물차종 + public string PassengerVehicleNumber { get; set; } // 승용차량번호 + public string PassengerVehicleName { get; set; } // 승용차종 + public EVehicleType VehicleType { get; set; } // 차종 구분 4.5톤 이상 미만 + public string Name { get; set; } // 성명 + public string PersonalNumber { get; set; } //생년월일 혹은 법인번호 + public string Phone { get; set; } // 연락처 + public string Address { get; set; } // 주소 + } public struct Settings { public string GarageName { get; set; } @@ -152,4 +167,10 @@ namespace HSUCO_Cargo_Garage_Operation_Program Extension, Refund } + public enum EUserInformationType + { + ApplicantList, + UserList, + + } } \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/Database.cs b/HSUCO_Cargo_Garage_Operation_Program/Database.cs index 2c8840d..9c6c727 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Data.SQLite; using System.Globalization; using System.IO; +using System.Runtime.CompilerServices; +using System.Security.RightsManagement; namespace HSUCO_Cargo_Garage_Operation_Program { @@ -40,7 +42,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program ""Phone"" TEXT NOT NULL, ""Address"" TEXT NOT NULL, ""DateOfApplicant"" TEXT NOT NULL, - ""Satus"" INTEGER NOT NULL, + ""Status"" INTEGER NOT NULL, PRIMARY KEY(""No"") ); @@ -272,7 +274,61 @@ namespace HSUCO_Cargo_Garage_Operation_Program return applicants; } + public static bool DeleteApplicantList(string no) + { + var query = $"UPDATE ApplicantList SET Status=2 Where No='{no}'"; + using (var updateCommand = _sqLiteConnection.CreateCommand()) + { + updateCommand.CommandText = query; + var updateResult = updateCommand.ExecuteNonQuery(); + return (updateResult > 0); + } + + } + public static UpdateUserInformation GetUserData(EUserInformationType eUserInformationType, string no) + { + UpdateUserInformation updateUserInformation = new UpdateUserInformation(); + var query = $"SELECT * From {eUserInformationType.ToString()} Where No='{no}'"; + + using (var command = _sqLiteConnection.CreateCommand()) + { + command.CommandText = query; + + using (var reader = command.ExecuteReader()) + { + while (reader.Read()) + { + updateUserInformation.UserInformationType = eUserInformationType; + updateUserInformation.No = no; + updateUserInformation.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); + updateUserInformation.CargoVehicleName = reader["CargoVehicleName"].ToString(); + updateUserInformation.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); + updateUserInformation.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); + updateUserInformation.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + updateUserInformation.Name = reader["Name"].ToString(); + updateUserInformation.PersonalNumber = reader["PersonalNumber"].ToString(); + updateUserInformation.Phone = reader["Phone"].ToString(); + updateUserInformation.Address = reader["Address"].ToString(); + } + } + } + + return updateUserInformation; + } + public static bool UpdateUserData(UpdateUserInformation updateUserInformation) + { + + var query = $"UPDATE {updateUserInformation.UserInformationType.ToString()} Set CargoVehicleNumber='{updateUserInformation.CargoVehicleNumber}', CargoVehicleName='{updateUserInformation.CargoVehicleName}', PassengerVehicleNumber='{updateUserInformation.PassengerVehicleNumber}', PassengerVehicleName='{updateUserInformation.PassengerVehicleName}', VehicleType={(int)updateUserInformation.VehicleType}, Name='{updateUserInformation.Name}', PersonalNumber='{updateUserInformation.PersonalNumber}', Phone='{updateUserInformation.Phone}', Address='{updateUserInformation.Address}' Where No='{updateUserInformation.No}'"; + using (var updateCommand = _sqLiteConnection.CreateCommand()) + { + updateCommand.CommandText = query; + var updateResult = updateCommand.ExecuteNonQuery(); + return (updateResult > 0); + } + + } + public static List GetUserList() { var users = new List(); @@ -420,23 +476,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program } } - public static void DeleteInspection(List CargoVehicleNumber, string DeleterName, string Reason) - { - var applicants = GetApplicantList(CargoVehicleNumber); - - for (var i = 0; i < applicants.Count; i++) - { - var query = - $"UPDATE ApplicantList SET Status=2 Where CargoVehicleNumber=\"{applicants[i].CargoVehicleNumber}\""; - - using (var insertCommand = _sqLiteConnection.CreateCommand()) - { - insertCommand.CommandText = query; - insertCommand.ExecuteNonQuery(); - } - - } - } public static List GetLedgerProceeds(DateTime startDateTime, DateTime endDateTime) { diff --git a/HSUCO_Cargo_Garage_Operation_Program/TextFile1.txt b/HSUCO_Cargo_Garage_Operation_Program/DevelopReadMe.txt similarity index 100% rename from HSUCO_Cargo_Garage_Operation_Program/TextFile1.txt rename to HSUCO_Cargo_Garage_Operation_Program/DevelopReadMe.txt diff --git a/HSUCO_Cargo_Garage_Operation_Program/HSUCO_Cargo_Garage_Operation_Program.csproj b/HSUCO_Cargo_Garage_Operation_Program/HSUCO_Cargo_Garage_Operation_Program.csproj index f3465cf..6cca1b9 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/HSUCO_Cargo_Garage_Operation_Program.csproj +++ b/HSUCO_Cargo_Garage_Operation_Program/HSUCO_Cargo_Garage_Operation_Program.csproj @@ -92,6 +92,12 @@ Promotion.cs + + Form + + + UpdateUserData.cs + Form @@ -158,6 +164,9 @@ Promotion.cs + + UpdateUserData.cs + WaitingCount.cs diff --git a/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs b/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs index e8bfbcb..850ade4 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs @@ -34,14 +34,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program int totalHeight = (int)e.PageBounds.Height; e.Graphics.DrawString($"발급번호 : {_certificateInformation[_count].IssueNumber}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 10, e.MarginBounds.Top + 10); CenterTextWriter($"화물자동차 공영차고지 이용 증명서", new Font("맑은 고딕", 30, FontStyle.Bold), e.Graphics, totalWidth, e.MarginBounds.Top + 100); - - e.Graphics.DrawString($"■ 성  명 : {_certificateInformation[_count].Name}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 250); e.Graphics.DrawString($"■ 생년월일 : {_certificateInformation[_count].PersonalNumber}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 300); e.Graphics.DrawString($"■ 주  소 : {_certificateInformation[_count].Address}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 350); e.Graphics.DrawString($"■ 차량번호 : {_certificateInformation[_count].CargoVehicleNumber}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 400); - e.Graphics.DrawString($"■ 이용요금 : {string.Format("{0:N0} 원", _certificateInformation[_count].Amount)}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 450); - e.Graphics.DrawString($"■ 이용면적 : {_certificateInformation[_count].Area}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 500); + e.Graphics.DrawString($"■ 주차구역 : {_certificateInformation[_count].Area}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 450); + e.Graphics.DrawString($"■ 이용요금 : {string.Format("{0:N0} 원", _certificateInformation[_count].Amount)}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 500); e.Graphics.DrawString($"■ 이용기한 : {_certificateInformation[_count].StartDate.ToString("yyyy-MM-dd")} ~ {_certificateInformation[_count].EndDate.ToString("yyyy-MM-dd")}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 550); e.Graphics.DrawString($"■ 차 고 지 : {_garageName}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 600); diff --git a/HSUCO_Cargo_Garage_Operation_Program/PrintFilingReceipt.cs b/HSUCO_Cargo_Garage_Operation_Program/PrintFilingReceipt.cs index d5e25fe..e0ed0d4 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/PrintFilingReceipt.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/PrintFilingReceipt.cs @@ -35,9 +35,8 @@ namespace HSUCO_Cargo_Garage_Operation_Program e.Graphics.DrawLine(new Pen(Brushes.Black, 1), new Point(e.MarginBounds.Left, e.MarginBounds.Top + 390), new Point(e.MarginBounds.Right, e.MarginBounds.Top + 390)); e.Graphics.DrawLine(new Pen(Brushes.Black, 1), new Point(e.MarginBounds.Left, e.MarginBounds.Top + 440), new Point(e.MarginBounds.Right, e.MarginBounds.Top + 440)); e.Graphics.DrawLine(new Pen(Brushes.Black, 1), new Point(e.MarginBounds.Left, e.MarginBounds.Top + 490), new Point(e.MarginBounds.Right, e.MarginBounds.Top + 490)); - e.Graphics.DrawLine(new Pen(Brushes.Black, 1), new Point(e.MarginBounds.Left, e.MarginBounds.Top + 540), new Point(e.MarginBounds.Right, e.MarginBounds.Top + 540)); - e.Graphics.DrawLine(new Pen(Brushes.Black, 1), new Point(e.MarginBounds.Left + 280, e.MarginBounds.Top + 290), new Point(e.MarginBounds.Left + 280, e.MarginBounds.Top + 540)); + e.Graphics.DrawLine(new Pen(Brushes.Black, 1), new Point(e.MarginBounds.Left + 280, e.MarginBounds.Top + 290), new Point(e.MarginBounds.Left + 280, e.MarginBounds.Top + 490)); e.Graphics.DrawLine(new Pen(Brushes.Black, 1), new Point(e.MarginBounds.Left + 520, e.MarginBounds.Top + 440), new Point(e.MarginBounds.Left + 520, e.MarginBounds.Top + 490)); @@ -61,8 +60,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program e.Graphics.DrawString($"{_printFilingReceiptInformation[_count].CargoVehicleNumber}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 310, e.MarginBounds.Top + 460); e.Graphics.DrawString($"일반차량", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 528, e.MarginBounds.Top + 440); e.Graphics.DrawString($"{_printFilingReceiptInformation[_count].PassengerVehicleNumber}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 550, e.MarginBounds.Top + 460); - e.Graphics.DrawString($"⑤ 대기순번", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 50, e.MarginBounds.Top + 500); - e.Graphics.DrawString($"{_printFilingReceiptInformation[_count].WaitingOrder}", new Font("맑은 고딕", 12), Brushes.Black, e.MarginBounds.Left + 300, e.MarginBounds.Top + 500); + CenterTextWriter("화성도시공사 사장", new Font("맑은 고딕", 20, FontStyle.Bold), e.Graphics, totalWidth, e.MarginBounds.Top + 800); _count++; e.HasMorePages = _printFilingReceiptInformation.Count > _count;