From ac5e1a3441f99f564de09b7a2d3d42990033d873 Mon Sep 17 00:00:00 2001 From: Crudelis Date: Fri, 6 Oct 2023 22:46:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EA=B0=80=20=ED=95=AD=EB=AA=A9?= =?UTF-8?q?=EA=B3=BC=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 | 122 +++++++++---- .../CustomForm/UpdateUserData.cs | 44 ++++- .../ApplicantControl.Designer.cs | 164 +++++++++++++----- .../CustomUserControl/ApplicantControl.cs | 24 ++- .../CustomUserControl/ApplicantList.cs | 19 ++ .../CustomUserControl/ListCertificate.cs | 6 +- .../CustomUserControl/ListProceeds.cs | 2 +- .../CustomUserControl/SettingControl.cs | 2 +- .../CustomUserControl/UserList.cs | 28 ++- .../CustomUserControl/WaitingList.cs | 18 ++ .../DataModel.cs | 59 +++++-- .../Database.cs | 94 +++++----- 12 files changed, 427 insertions(+), 155 deletions(-) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs index 0f60131..64732b8 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.Designer.cs @@ -48,6 +48,11 @@ this.metroLabel_CargoVehicleNumber = new MetroFramework.Controls.MetroLabel(); this.metroButton_Cancel = new MetroFramework.Controls.MetroButton(); this.metroButton_Update = new MetroFramework.Controls.MetroButton(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.metroRadioButton_Corporation = new MetroFramework.Controls.MetroRadioButton(); + this.metroRadioButton_IIC = new MetroFramework.Controls.MetroRadioButton(); + this.metroRadioButton_Individual = new MetroFramework.Controls.MetroRadioButton(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // metroComboBox_VehicleType @@ -57,16 +62,16 @@ this.metroComboBox_VehicleType.Items.AddRange(new object[] { "대형(4.5톤 미만)", "특대형(4.5톤 이상)"}); - this.metroComboBox_VehicleType.Location = new System.Drawing.Point(139, 200); + this.metroComboBox_VehicleType.Location = new System.Drawing.Point(140, 290); this.metroComboBox_VehicleType.Name = "metroComboBox_VehicleType"; this.metroComboBox_VehicleType.Size = new System.Drawing.Size(203, 29); - this.metroComboBox_VehicleType.TabIndex = 27; + this.metroComboBox_VehicleType.TabIndex = 58; this.metroComboBox_VehicleType.UseSelectable = true; // // metroLabel4 // this.metroLabel4.AutoSize = true; - this.metroLabel4.Location = new System.Drawing.Point(30, 200); + this.metroLabel4.Location = new System.Drawing.Point(23, 300); this.metroLabel4.Name = "metroLabel4"; this.metroLabel4.Size = new System.Drawing.Size(101, 19); this.metroLabel4.TabIndex = 35; @@ -87,7 +92,7 @@ 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.Location = new System.Drawing.Point(140, 190); this.metroTextBox_PersonalNumber.MaxLength = 32767; this.metroTextBox_PersonalNumber.Name = "metroTextBox_PersonalNumber"; this.metroTextBox_PersonalNumber.PasswordChar = '\0'; @@ -97,7 +102,7 @@ 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.TabIndex = 55; 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); @@ -105,7 +110,7 @@ // metroLabel3 // this.metroLabel3.AutoSize = true; - this.metroLabel3.Location = new System.Drawing.Point(30, 270); + this.metroLabel3.Location = new System.Drawing.Point(30, 180); this.metroLabel3.Name = "metroLabel3"; this.metroLabel3.Size = new System.Drawing.Size(105, 38); this.metroLabel3.TabIndex = 34; @@ -126,7 +131,7 @@ 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.Location = new System.Drawing.Point(140, 420); this.metroTextBox_PassengerVehicleName.MaxLength = 32767; this.metroTextBox_PassengerVehicleName.Name = "metroTextBox_PassengerVehicleName"; this.metroTextBox_PassengerVehicleName.PasswordChar = '\0'; @@ -136,7 +141,7 @@ 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.TabIndex = 62; 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); @@ -144,7 +149,7 @@ // metroLabel2 // this.metroLabel2.AutoSize = true; - this.metroLabel2.Location = new System.Drawing.Point(30, 170); + this.metroLabel2.Location = new System.Drawing.Point(23, 424); this.metroLabel2.Name = "metroLabel2"; this.metroLabel2.Size = new System.Drawing.Size(101, 19); this.metroLabel2.TabIndex = 33; @@ -165,7 +170,7 @@ 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.Location = new System.Drawing.Point(140, 360); this.metroTextBox_CargoVehicleName.MaxLength = 32767; this.metroTextBox_CargoVehicleName.Name = "metroTextBox_CargoVehicleName"; this.metroTextBox_CargoVehicleName.PasswordChar = '\0'; @@ -175,7 +180,7 @@ 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.TabIndex = 60; 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); @@ -183,7 +188,7 @@ // metroLabel1 // this.metroLabel1.AutoSize = true; - this.metroLabel1.Location = new System.Drawing.Point(30, 110); + this.metroLabel1.Location = new System.Drawing.Point(23, 364); this.metroLabel1.Name = "metroLabel1"; this.metroLabel1.Size = new System.Drawing.Size(101, 19); this.metroLabel1.TabIndex = 32; @@ -192,11 +197,11 @@ // maskedTextBox_Phone // this.maskedTextBox_Phone.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.maskedTextBox_Phone.Location = new System.Drawing.Point(140, 328); + this.maskedTextBox_Phone.Location = new System.Drawing.Point(140, 230); 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; + this.maskedTextBox_Phone.TabIndex = 56; // // metroTextBox_Address // @@ -213,7 +218,7 @@ 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.Location = new System.Drawing.Point(140, 260); this.metroTextBox_Address.MaxLength = 32767; this.metroTextBox_Address.Name = "metroTextBox_Address"; this.metroTextBox_Address.PasswordChar = '\0'; @@ -223,7 +228,7 @@ 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.TabIndex = 57; 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); @@ -243,7 +248,7 @@ 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.Location = new System.Drawing.Point(140, 150); this.metroTextBox_Name.MaxLength = 32767; this.metroTextBox_Name.Name = "metroTextBox_Name"; this.metroTextBox_Name.PasswordChar = '\0'; @@ -253,7 +258,7 @@ 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.TabIndex = 54; 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); @@ -273,7 +278,7 @@ 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.Location = new System.Drawing.Point(140, 390); this.metroTextBox_PassengerVehicleNumber.MaxLength = 32767; this.metroTextBox_PassengerVehicleNumber.Name = "metroTextBox_PassengerVehicleNumber"; this.metroTextBox_PassengerVehicleNumber.PasswordChar = '\0'; @@ -283,7 +288,7 @@ 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.TabIndex = 61; 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); @@ -303,7 +308,7 @@ 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.Location = new System.Drawing.Point(140, 330); this.metroTextBox_CargoVehicleNumber.MaxLength = 32767; this.metroTextBox_CargoVehicleNumber.Name = "metroTextBox_CargoVehicleNumber"; this.metroTextBox_CargoVehicleNumber.PasswordChar = '\0'; @@ -313,7 +318,7 @@ 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.TabIndex = 59; 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); @@ -321,7 +326,7 @@ // metroLabel_Address // this.metroLabel_Address.AutoSize = true; - this.metroLabel_Address.Location = new System.Drawing.Point(30, 360); + this.metroLabel_Address.Location = new System.Drawing.Point(23, 264); this.metroLabel_Address.Name = "metroLabel_Address"; this.metroLabel_Address.Size = new System.Drawing.Size(101, 19); this.metroLabel_Address.TabIndex = 25; @@ -330,7 +335,7 @@ // metroLabel_Phone // this.metroLabel_Phone.AutoSize = true; - this.metroLabel_Phone.Location = new System.Drawing.Point(30, 330); + this.metroLabel_Phone.Location = new System.Drawing.Point(23, 232); this.metroLabel_Phone.Name = "metroLabel_Phone"; this.metroLabel_Phone.Size = new System.Drawing.Size(103, 19); this.metroLabel_Phone.TabIndex = 23; @@ -339,7 +344,7 @@ // metroLabel_Name // this.metroLabel_Name.AutoSize = true; - this.metroLabel_Name.Location = new System.Drawing.Point(30, 240); + this.metroLabel_Name.Location = new System.Drawing.Point(30, 150); this.metroLabel_Name.Name = "metroLabel_Name"; this.metroLabel_Name.Size = new System.Drawing.Size(101, 19); this.metroLabel_Name.TabIndex = 21; @@ -348,7 +353,7 @@ // metroLabel_PassengerVehicleNumber // this.metroLabel_PassengerVehicleNumber.AutoSize = true; - this.metroLabel_PassengerVehicleNumber.Location = new System.Drawing.Point(30, 140); + this.metroLabel_PassengerVehicleNumber.Location = new System.Drawing.Point(23, 394); this.metroLabel_PassengerVehicleNumber.Name = "metroLabel_PassengerVehicleNumber"; this.metroLabel_PassengerVehicleNumber.Size = new System.Drawing.Size(101, 19); this.metroLabel_PassengerVehicleNumber.TabIndex = 20; @@ -357,7 +362,7 @@ // metroLabel_CargoVehicleNumber // this.metroLabel_CargoVehicleNumber.AutoSize = true; - this.metroLabel_CargoVehicleNumber.Location = new System.Drawing.Point(30, 80); + this.metroLabel_CargoVehicleNumber.Location = new System.Drawing.Point(23, 334); this.metroLabel_CargoVehicleNumber.Name = "metroLabel_CargoVehicleNumber"; this.metroLabel_CargoVehicleNumber.Size = new System.Drawing.Size(101, 19); this.metroLabel_CargoVehicleNumber.TabIndex = 18; @@ -366,10 +371,10 @@ // metroButton_Cancel // this.metroButton_Cancel.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Cancel.Location = new System.Drawing.Point(283, 406); + this.metroButton_Cancel.Location = new System.Drawing.Point(283, 460); this.metroButton_Cancel.Name = "metroButton_Cancel"; this.metroButton_Cancel.Size = new System.Drawing.Size(170, 50); - this.metroButton_Cancel.TabIndex = 37; + this.metroButton_Cancel.TabIndex = 64; this.metroButton_Cancel.Text = "취 소"; this.metroButton_Cancel.UseSelectable = true; this.metroButton_Cancel.Click += new System.EventHandler(this.metroButton_Cancel_Click); @@ -377,19 +382,66 @@ // metroButton_Update // this.metroButton_Update.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Update.Location = new System.Drawing.Point(100, 406); + this.metroButton_Update.Location = new System.Drawing.Point(100, 460); this.metroButton_Update.Name = "metroButton_Update"; this.metroButton_Update.Size = new System.Drawing.Size(170, 50); - this.metroButton_Update.TabIndex = 36; + this.metroButton_Update.TabIndex = 63; this.metroButton_Update.Text = "수 정 "; this.metroButton_Update.UseSelectable = true; this.metroButton_Update.Click += new System.EventHandler(this.metroButton_Update_Click); // + // groupBox2 + // + this.groupBox2.Controls.Add(this.metroRadioButton_Corporation); + this.groupBox2.Controls.Add(this.metroRadioButton_IIC); + this.groupBox2.Controls.Add(this.metroRadioButton_Individual); + this.groupBox2.Location = new System.Drawing.Point(30, 80); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(200, 50); + this.groupBox2.TabIndex = 38; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "신청구분"; + // + // metroRadioButton_Corporation + // + this.metroRadioButton_Corporation.AutoSize = true; + this.metroRadioButton_Corporation.Location = new System.Drawing.Point(140, 20); + this.metroRadioButton_Corporation.Name = "metroRadioButton_Corporation"; + this.metroRadioButton_Corporation.Size = new System.Drawing.Size(47, 15); + this.metroRadioButton_Corporation.TabIndex = 53; + this.metroRadioButton_Corporation.TabStop = true; + this.metroRadioButton_Corporation.Text = "법인"; + this.metroRadioButton_Corporation.UseSelectable = true; + // + // metroRadioButton_IIC + // + this.metroRadioButton_IIC.AutoSize = true; + this.metroRadioButton_IIC.Location = new System.Drawing.Point(80, 20); + this.metroRadioButton_IIC.Name = "metroRadioButton_IIC"; + this.metroRadioButton_IIC.Size = new System.Drawing.Size(47, 15); + this.metroRadioButton_IIC.TabIndex = 52; + this.metroRadioButton_IIC.TabStop = true; + this.metroRadioButton_IIC.Text = "지입"; + this.metroRadioButton_IIC.UseSelectable = true; + // + // metroRadioButton_Individual + // + this.metroRadioButton_Individual.AutoSize = true; + this.metroRadioButton_Individual.Checked = true; + this.metroRadioButton_Individual.Location = new System.Drawing.Point(20, 20); + this.metroRadioButton_Individual.Name = "metroRadioButton_Individual"; + this.metroRadioButton_Individual.Size = new System.Drawing.Size(47, 15); + this.metroRadioButton_Individual.TabIndex = 51; + this.metroRadioButton_Individual.TabStop = true; + this.metroRadioButton_Individual.Text = "개인"; + this.metroRadioButton_Individual.UseSelectable = true; + // // 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.ClientSize = new System.Drawing.Size(490, 540); + this.Controls.Add(this.groupBox2); this.Controls.Add(this.metroButton_Cancel); this.Controls.Add(this.metroButton_Update); this.Controls.Add(this.metroComboBox_VehicleType); @@ -412,6 +464,8 @@ this.Controls.Add(this.metroLabel_CargoVehicleNumber); this.Name = "UpdateUserData"; this.Text = "사용자 정보 수정"; + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -439,5 +493,9 @@ private MetroFramework.Controls.MetroLabel metroLabel_CargoVehicleNumber; private MetroFramework.Controls.MetroButton metroButton_Cancel; private MetroFramework.Controls.MetroButton metroButton_Update; + private System.Windows.Forms.GroupBox groupBox2; + private MetroFramework.Controls.MetroRadioButton metroRadioButton_Corporation; + private MetroFramework.Controls.MetroRadioButton metroRadioButton_IIC; + private MetroFramework.Controls.MetroRadioButton metroRadioButton_Individual; } } \ 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 index 8a4fcc2..3c23db0 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/UpdateUserData.cs @@ -27,7 +27,20 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm { metroComboBox_VehicleType.Enabled = false; } + switch (_updateUserInformation.Owner) + { + case EOwner.Individual: + metroRadioButton_Individual.Checked = true; + break; + case EOwner.IndividualIntoCorporation: + metroRadioButton_IIC.Checked = true; + break; + + case EOwner.Corporation: + metroRadioButton_Corporation.Checked = true; + break; + } metroTextBox_CargoVehicleNumber.Text = _updateUserInformation.CargoVehicleNumber; metroTextBox_CargoVehicleName.Text = _updateUserInformation.CargoVehicleName; metroTextBox_PassengerVehicleNumber.Text = _updateUserInformation.PassengerVehicleNumber; @@ -78,23 +91,38 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm { change = true; } - + EOwner changeOwner; + if (metroRadioButton_Individual.Checked) + { + changeOwner = EOwner.Individual; + } + else if (metroRadioButton_IIC.Checked) + { + changeOwner = EOwner.IndividualIntoCorporation; + } + else + { + changeOwner = EOwner.Corporation; + } + if (changeOwner != _updateUserInformation.Owner) + { + 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.Owner = changeOwner; _updateUserInformation.Name = metroTextBox_Name.Text.Trim(); _updateUserInformation.PersonalNumber = metroTextBox_PersonalNumber.Text.Trim(); _updateUserInformation.Phone = maskedTextBox_Phone.Text.Trim(); _updateUserInformation.Address = metroTextBox_Address.Text.Trim(); - + _updateUserInformation.VehicleType = (EVehicleType)metroComboBox_VehicleType.SelectedIndex; + _updateUserInformation.CargoVehicleNumber = metroTextBox_CargoVehicleNumber.Text.Trim(); + _updateUserInformation.CargoVehicleName = metroTextBox_CargoVehicleName.Text.Trim(); + _updateUserInformation.PassengerVehicleNumber = metroTextBox_PassengerVehicleNumber.Text.Trim(); + _updateUserInformation.PassengerVehicleName = metroTextBox_PassengerVehicleName.Text.Trim(); var result = Database.UpdateUserData(_updateUserInformation); if (result) { diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs index f9bd994..828c91f 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.Designer.cs @@ -51,7 +51,14 @@ this.metroLabel3 = new MetroFramework.Controls.MetroLabel(); this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); this.metroComboBox_VehicleType = new MetroFramework.Controls.MetroComboBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.metroRadioButton_Corporation = new MetroFramework.Controls.MetroRadioButton(); + this.metroRadioButton_IIC = new MetroFramework.Controls.MetroRadioButton(); + this.metroRadioButton_Individual = new MetroFramework.Controls.MetroRadioButton(); + this.metroLabel5 = new MetroFramework.Controls.MetroLabel(); + this.label1 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // groupBox1 @@ -73,7 +80,8 @@ this.metroRadioButton_Waiting.Location = new System.Drawing.Point(100, 20); this.metroRadioButton_Waiting.Name = "metroRadioButton_Waiting"; this.metroRadioButton_Waiting.Size = new System.Drawing.Size(74, 15); - this.metroRadioButton_Waiting.TabIndex = 1; + this.metroRadioButton_Waiting.TabIndex = 91; + this.metroRadioButton_Waiting.TabStop = true; this.metroRadioButton_Waiting.Text = "대기 접수"; this.metroRadioButton_Waiting.UseSelectable = true; // @@ -84,7 +92,7 @@ this.metroRadioButton_Draw.Location = new System.Drawing.Point(10, 20); this.metroRadioButton_Draw.Name = "metroRadioButton_Draw"; this.metroRadioButton_Draw.Size = new System.Drawing.Size(74, 15); - this.metroRadioButton_Draw.TabIndex = 0; + this.metroRadioButton_Draw.TabIndex = 90; this.metroRadioButton_Draw.TabStop = true; this.metroRadioButton_Draw.Text = "추첨 접수"; this.metroRadioButton_Draw.UseSelectable = true; @@ -92,46 +100,46 @@ // metroLabel_CargoVehicleNumber // this.metroLabel_CargoVehicleNumber.AutoSize = true; - this.metroLabel_CargoVehicleNumber.Location = new System.Drawing.Point(30, 80); + this.metroLabel_CargoVehicleNumber.Location = new System.Drawing.Point(40, 334); this.metroLabel_CargoVehicleNumber.Name = "metroLabel_CargoVehicleNumber"; this.metroLabel_CargoVehicleNumber.Size = new System.Drawing.Size(101, 19); - this.metroLabel_CargoVehicleNumber.TabIndex = 1; + this.metroLabel_CargoVehicleNumber.TabIndex = 91; this.metroLabel_CargoVehicleNumber.Text = "차량번호(화물)"; // // metroLabel_PassengerVehicleNumber // this.metroLabel_PassengerVehicleNumber.AutoSize = true; - this.metroLabel_PassengerVehicleNumber.Location = new System.Drawing.Point(30, 140); + this.metroLabel_PassengerVehicleNumber.Location = new System.Drawing.Point(40, 394); this.metroLabel_PassengerVehicleNumber.Name = "metroLabel_PassengerVehicleNumber"; this.metroLabel_PassengerVehicleNumber.Size = new System.Drawing.Size(101, 19); - this.metroLabel_PassengerVehicleNumber.TabIndex = 2; + this.metroLabel_PassengerVehicleNumber.TabIndex = 92; this.metroLabel_PassengerVehicleNumber.Text = "차량번호(승용)"; // // metroLabel_Name // this.metroLabel_Name.AutoSize = true; - this.metroLabel_Name.Location = new System.Drawing.Point(30, 240); + this.metroLabel_Name.Location = new System.Drawing.Point(40, 154); this.metroLabel_Name.Name = "metroLabel_Name"; this.metroLabel_Name.Size = new System.Drawing.Size(101, 19); - this.metroLabel_Name.TabIndex = 3; + this.metroLabel_Name.TabIndex = 93; this.metroLabel_Name.Text = "이　　　 　름"; // // metroLabel_Phone // this.metroLabel_Phone.AutoSize = true; - this.metroLabel_Phone.Location = new System.Drawing.Point(30, 330); + this.metroLabel_Phone.Location = new System.Drawing.Point(40, 232); this.metroLabel_Phone.Name = "metroLabel_Phone"; this.metroLabel_Phone.Size = new System.Drawing.Size(103, 19); - this.metroLabel_Phone.TabIndex = 4; + this.metroLabel_Phone.TabIndex = 94; this.metroLabel_Phone.Text = "연　 락 　처"; // // metroLabel_Address // this.metroLabel_Address.AutoSize = true; - this.metroLabel_Address.Location = new System.Drawing.Point(30, 360); + this.metroLabel_Address.Location = new System.Drawing.Point(40, 264); this.metroLabel_Address.Name = "metroLabel_Address"; this.metroLabel_Address.Size = new System.Drawing.Size(101, 19); - this.metroLabel_Address.TabIndex = 5; + this.metroLabel_Address.TabIndex = 95; this.metroLabel_Address.Text = "주　　　　 소"; // // metroTextBox_CargoVehicleNumber @@ -149,7 +157,7 @@ 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.Location = new System.Drawing.Point(150, 330); this.metroTextBox_CargoVehicleNumber.MaxLength = 32767; this.metroTextBox_CargoVehicleNumber.Name = "metroTextBox_CargoVehicleNumber"; this.metroTextBox_CargoVehicleNumber.PasswordChar = '\0'; @@ -159,7 +167,7 @@ this.metroTextBox_CargoVehicleNumber.SelectionStart = 0; this.metroTextBox_CargoVehicleNumber.ShortcutsEnabled = true; this.metroTextBox_CargoVehicleNumber.Size = new System.Drawing.Size(130, 23); - this.metroTextBox_CargoVehicleNumber.TabIndex = 2; + this.metroTextBox_CargoVehicleNumber.TabIndex = 100; 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); @@ -179,7 +187,7 @@ 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.Location = new System.Drawing.Point(150, 390); this.metroTextBox_PassengerVehicleNumber.MaxLength = 32767; this.metroTextBox_PassengerVehicleNumber.Name = "metroTextBox_PassengerVehicleNumber"; this.metroTextBox_PassengerVehicleNumber.PasswordChar = '\0'; @@ -189,7 +197,7 @@ this.metroTextBox_PassengerVehicleNumber.SelectionStart = 0; this.metroTextBox_PassengerVehicleNumber.ShortcutsEnabled = true; this.metroTextBox_PassengerVehicleNumber.Size = new System.Drawing.Size(130, 23); - this.metroTextBox_PassengerVehicleNumber.TabIndex = 4; + this.metroTextBox_PassengerVehicleNumber.TabIndex = 102; 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); @@ -209,7 +217,7 @@ 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.Location = new System.Drawing.Point(150, 150); this.metroTextBox_Name.MaxLength = 32767; this.metroTextBox_Name.Name = "metroTextBox_Name"; this.metroTextBox_Name.PasswordChar = '\0'; @@ -219,7 +227,7 @@ this.metroTextBox_Name.SelectionStart = 0; this.metroTextBox_Name.ShortcutsEnabled = true; this.metroTextBox_Name.Size = new System.Drawing.Size(130, 23); - this.metroTextBox_Name.TabIndex = 7; + this.metroTextBox_Name.TabIndex = 95; 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); @@ -227,11 +235,11 @@ // maskedTextBox_Phone // this.maskedTextBox_Phone.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.maskedTextBox_Phone.Location = new System.Drawing.Point(140, 328); + this.maskedTextBox_Phone.Location = new System.Drawing.Point(150, 230); 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 = 9; + this.maskedTextBox_Phone.TabIndex = 97; // // metroTextBox_Address // @@ -248,7 +256,7 @@ 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.Location = new System.Drawing.Point(150, 260); this.metroTextBox_Address.MaxLength = 32767; this.metroTextBox_Address.Name = "metroTextBox_Address"; this.metroTextBox_Address.PasswordChar = '\0'; @@ -258,7 +266,7 @@ this.metroTextBox_Address.SelectionStart = 0; this.metroTextBox_Address.ShortcutsEnabled = true; this.metroTextBox_Address.Size = new System.Drawing.Size(313, 23); - this.metroTextBox_Address.TabIndex = 10; + this.metroTextBox_Address.TabIndex = 98; 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); @@ -266,10 +274,10 @@ // metroButton_Register // this.metroButton_Register.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Register.Location = new System.Drawing.Point(96, 399); + this.metroButton_Register.Location = new System.Drawing.Point(96, 530); this.metroButton_Register.Name = "metroButton_Register"; this.metroButton_Register.Size = new System.Drawing.Size(170, 50); - this.metroButton_Register.TabIndex = 11; + this.metroButton_Register.TabIndex = 104; this.metroButton_Register.Text = "접 수 "; this.metroButton_Register.UseSelectable = true; this.metroButton_Register.Click += new System.EventHandler(this.metroButton_Register_Click); @@ -277,10 +285,10 @@ // metroButton_Cancel // this.metroButton_Cancel.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Cancel.Location = new System.Drawing.Point(279, 399); + this.metroButton_Cancel.Location = new System.Drawing.Point(279, 530); this.metroButton_Cancel.Name = "metroButton_Cancel"; this.metroButton_Cancel.Size = new System.Drawing.Size(170, 50); - this.metroButton_Cancel.TabIndex = 12; + this.metroButton_Cancel.TabIndex = 105; this.metroButton_Cancel.Text = "취 소"; this.metroButton_Cancel.UseSelectable = true; this.metroButton_Cancel.Click += new System.EventHandler(this.metroButton_Cancel_Click); @@ -300,7 +308,7 @@ 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.Location = new System.Drawing.Point(150, 360); this.metroTextBox_CargoVehicleName.MaxLength = 32767; this.metroTextBox_CargoVehicleName.Name = "metroTextBox_CargoVehicleName"; this.metroTextBox_CargoVehicleName.PasswordChar = '\0'; @@ -310,7 +318,7 @@ this.metroTextBox_CargoVehicleName.SelectionStart = 0; this.metroTextBox_CargoVehicleName.ShortcutsEnabled = true; this.metroTextBox_CargoVehicleName.Size = new System.Drawing.Size(202, 23); - this.metroTextBox_CargoVehicleName.TabIndex = 3; + this.metroTextBox_CargoVehicleName.TabIndex = 101; 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); @@ -318,7 +326,7 @@ // metroLabel1 // this.metroLabel1.AutoSize = true; - this.metroLabel1.Location = new System.Drawing.Point(30, 110); + this.metroLabel1.Location = new System.Drawing.Point(40, 364); this.metroLabel1.Name = "metroLabel1"; this.metroLabel1.Size = new System.Drawing.Size(101, 19); this.metroLabel1.TabIndex = 11; @@ -339,7 +347,7 @@ 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.Location = new System.Drawing.Point(150, 420); this.metroTextBox_PassengerVehicleName.MaxLength = 32767; this.metroTextBox_PassengerVehicleName.Name = "metroTextBox_PassengerVehicleName"; this.metroTextBox_PassengerVehicleName.PasswordChar = '\0'; @@ -349,7 +357,7 @@ this.metroTextBox_PassengerVehicleName.SelectionStart = 0; this.metroTextBox_PassengerVehicleName.ShortcutsEnabled = true; this.metroTextBox_PassengerVehicleName.Size = new System.Drawing.Size(202, 23); - this.metroTextBox_PassengerVehicleName.TabIndex = 5; + this.metroTextBox_PassengerVehicleName.TabIndex = 103; 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); @@ -357,7 +365,7 @@ // metroLabel2 // this.metroLabel2.AutoSize = true; - this.metroLabel2.Location = new System.Drawing.Point(30, 170); + this.metroLabel2.Location = new System.Drawing.Point(40, 424); this.metroLabel2.Name = "metroLabel2"; this.metroLabel2.Size = new System.Drawing.Size(101, 19); this.metroLabel2.TabIndex = 13; @@ -378,7 +386,7 @@ 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.Location = new System.Drawing.Point(150, 180); this.metroTextBox_PersonalNumber.MaxLength = 32767; this.metroTextBox_PersonalNumber.Name = "metroTextBox_PersonalNumber"; this.metroTextBox_PersonalNumber.PasswordChar = '\0'; @@ -388,7 +396,7 @@ this.metroTextBox_PersonalNumber.SelectionStart = 0; this.metroTextBox_PersonalNumber.ShortcutsEnabled = true; this.metroTextBox_PersonalNumber.Size = new System.Drawing.Size(130, 23); - this.metroTextBox_PersonalNumber.TabIndex = 8; + this.metroTextBox_PersonalNumber.TabIndex = 96; 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); @@ -396,7 +404,7 @@ // metroLabel3 // this.metroLabel3.AutoSize = true; - this.metroLabel3.Location = new System.Drawing.Point(30, 270); + this.metroLabel3.Location = new System.Drawing.Point(39, 180); this.metroLabel3.Name = "metroLabel3"; this.metroLabel3.Size = new System.Drawing.Size(105, 38); this.metroLabel3.TabIndex = 15; @@ -405,7 +413,7 @@ // metroLabel4 // this.metroLabel4.AutoSize = true; - this.metroLabel4.Location = new System.Drawing.Point(30, 200); + this.metroLabel4.Location = new System.Drawing.Point(39, 300); this.metroLabel4.Name = "metroLabel4"; this.metroLabel4.Size = new System.Drawing.Size(101, 19); this.metroLabel4.TabIndex = 17; @@ -418,17 +426,87 @@ this.metroComboBox_VehicleType.Items.AddRange(new object[] { "대형(4.5톤 미만)", "특대형(4.5톤 이상)"}); - this.metroComboBox_VehicleType.Location = new System.Drawing.Point(139, 200); + this.metroComboBox_VehicleType.Location = new System.Drawing.Point(150, 290); this.metroComboBox_VehicleType.Name = "metroComboBox_VehicleType"; this.metroComboBox_VehicleType.Size = new System.Drawing.Size(203, 29); - this.metroComboBox_VehicleType.TabIndex = 6; + this.metroComboBox_VehicleType.TabIndex = 99; this.metroComboBox_VehicleType.UseSelectable = true; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.metroRadioButton_Corporation); + this.groupBox2.Controls.Add(this.metroRadioButton_IIC); + this.groupBox2.Controls.Add(this.metroRadioButton_Individual); + this.groupBox2.Location = new System.Drawing.Point(40, 90); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(200, 50); + this.groupBox2.TabIndex = 18; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "신청구분"; + // + // metroRadioButton_Corporation + // + this.metroRadioButton_Corporation.AutoSize = true; + this.metroRadioButton_Corporation.Location = new System.Drawing.Point(140, 20); + this.metroRadioButton_Corporation.Name = "metroRadioButton_Corporation"; + this.metroRadioButton_Corporation.Size = new System.Drawing.Size(47, 15); + this.metroRadioButton_Corporation.TabIndex = 94; + this.metroRadioButton_Corporation.TabStop = true; + this.metroRadioButton_Corporation.Text = "법인"; + this.metroRadioButton_Corporation.UseSelectable = true; + // + // metroRadioButton_IIC + // + this.metroRadioButton_IIC.AutoSize = true; + this.metroRadioButton_IIC.Location = new System.Drawing.Point(80, 20); + this.metroRadioButton_IIC.Name = "metroRadioButton_IIC"; + this.metroRadioButton_IIC.Size = new System.Drawing.Size(47, 15); + this.metroRadioButton_IIC.TabIndex = 93; + this.metroRadioButton_IIC.TabStop = true; + this.metroRadioButton_IIC.Text = "지입"; + this.metroRadioButton_IIC.UseSelectable = true; + // + // metroRadioButton_Individual + // + this.metroRadioButton_Individual.AutoSize = true; + this.metroRadioButton_Individual.Checked = true; + this.metroRadioButton_Individual.Location = new System.Drawing.Point(20, 20); + this.metroRadioButton_Individual.Name = "metroRadioButton_Individual"; + this.metroRadioButton_Individual.Size = new System.Drawing.Size(47, 15); + this.metroRadioButton_Individual.TabIndex = 92; + this.metroRadioButton_Individual.TabStop = true; + this.metroRadioButton_Individual.Text = "개인"; + this.metroRadioButton_Individual.UseSelectable = true; + // + // metroLabel5 + // + this.metroLabel5.AutoSize = true; + this.metroLabel5.FontSize = MetroFramework.MetroLabelSize.Tall; + this.metroLabel5.ForeColor = System.Drawing.Color.Red; + this.metroLabel5.Location = new System.Drawing.Point(30, 457); + this.metroLabel5.Name = "metroLabel5"; + this.metroLabel5.Size = new System.Drawing.Size(0, 0); + this.metroLabel5.TabIndex = 19; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.ForeColor = System.Drawing.Color.Red; + this.label1.Location = new System.Drawing.Point(38, 457); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(112, 28); + this.label1.TabIndex = 106; + this.label1.Text = "경고메세지"; + // // ApplicantControl // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.label1); + this.Controls.Add(this.metroLabel5); + this.Controls.Add(this.groupBox2); this.Controls.Add(this.metroComboBox_VehicleType); this.Controls.Add(this.metroLabel4); this.Controls.Add(this.metroTextBox_PersonalNumber); @@ -452,10 +530,12 @@ this.Controls.Add(this.groupBox1); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "ApplicantControl"; - this.Size = new System.Drawing.Size(480, 480); + this.Size = new System.Drawing.Size(480, 600); this.Load += new System.EventHandler(this.ApplicantControl_Load); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -486,5 +566,11 @@ private MetroFramework.Controls.MetroLabel metroLabel3; private MetroFramework.Controls.MetroLabel metroLabel4; private MetroFramework.Controls.MetroComboBox metroComboBox_VehicleType; + private System.Windows.Forms.GroupBox groupBox2; + private MetroFramework.Controls.MetroRadioButton metroRadioButton_Corporation; + private MetroFramework.Controls.MetroRadioButton metroRadioButton_IIC; + private MetroFramework.Controls.MetroRadioButton metroRadioButton_Individual; + private MetroFramework.Controls.MetroLabel metroLabel5; + private System.Windows.Forms.Label label1; } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs index 179e801..db9429f 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs @@ -11,6 +11,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl public ApplicantControl() { InitializeComponent(); + label1.Text = $"현 프로그램의 차고지는 {Global.GlobalSettings.GarageName}입니다.\r\n입력시 필히 확인 바랍니다."; } @@ -94,16 +95,29 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl } var applicant = new ApplicantInformation(); applicant.ApplicantType = metroRadioButton_Draw.Checked ? EApplicantType.Lots : EApplicantType.Wait; // 추첨이 true, 대기가 false - applicant.CargoVehicleNumber = metroTextBox_CargoVehicleNumber.Text.Trim(); - applicant.CargoVehicleName = metroTextBox_CargoVehicleName.Text.Trim(); - applicant.PassengerVehicleNumber = metroTextBox_PassengerVehicleNumber.Text.Trim(); - applicant.PassengerVehicleName = metroTextBox_PassengerVehicleName.Text.Trim(); - applicant.VehicleType = (EVehicleType)metroComboBox_VehicleType.SelectedIndex; + if (metroRadioButton_Individual.Checked) + { + applicant.Owenr = EOwner.Individual; + } + else if (metroRadioButton_IIC.Checked) + { + applicant.Owenr = EOwner.IndividualIntoCorporation; + } + else + { + applicant.Owenr = EOwner.Corporation; + } + applicant.Name = metroTextBox_Name.Text.Trim(); applicant.PersonalNumber = metroTextBox_PersonalNumber.Text.Trim(); applicant.Phone = maskedTextBox_Phone.Text.Trim(); applicant.Address = metroTextBox_Address.Text.Trim(); + applicant.VehicleType = (EVehicleType)metroComboBox_VehicleType.SelectedIndex; + applicant.CargoVehicleNumber = metroTextBox_CargoVehicleNumber.Text.Trim(); + applicant.CargoVehicleName = metroTextBox_CargoVehicleName.Text.Trim(); + applicant.PassengerVehicleNumber = metroTextBox_PassengerVehicleNumber.Text.Trim(); + applicant.PassengerVehicleName = metroTextBox_PassengerVehicleName.Text.Trim(); applicant.Date = DateTime.Now; diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs index dd9a5da..7c1cd12 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs @@ -48,6 +48,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl var dataTable = new DataTable(); dataTable.Columns.Add("접수번호"); + dataTable.Columns.Add("신청구분"); dataTable.Columns.Add("성명\r\n(법인명)"); dataTable.Columns.Add("생년월일\r\n(법인등록번호)"); dataTable.Columns.Add("연락처"); @@ -61,9 +62,27 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl for (int i = 0; i < applicants.Count; i++) { + string owner = string.Empty; + switch (applicants[i].Owenr) + { + case EOwner.Individual: + owner = "개인"; + break; + + case EOwner.IndividualIntoCorporation: + owner = "지입"; + break; + case EOwner.Corporation: + owner = "법인"; + break; + + + } + dataTable.Rows .Add( applicants[i].No, + owner, applicants[i].Name, applicants[i].PersonalNumber, applicants[i].Phone, diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs index 17a0d2c..04520cc 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs @@ -42,9 +42,9 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl var dataTable = new DataTable(); dataTable.Columns.Add("발급번호"); dataTable.Columns.Add("발급일자"); - dataTable.Columns.Add("이름"); - dataTable.Columns.Add("생년월일"); - dataTable.Columns.Add("주소ㅋ"); + dataTable.Columns.Add("성명\r\n(법인명)"); + dataTable.Columns.Add("생년월일\r\n(법인등록번호)"); + dataTable.Columns.Add("주소"); dataTable.Columns.Add("차량번호\r\n(화물)"); dataTable.Columns.Add("이용시작일"); dataTable.Columns.Add("이용종료일"); diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs index 67aff7b..8ec0f3e 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs @@ -43,7 +43,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataTable.Columns.Add("차량번호\r\n(화물)"); dataTable.Columns.Add("차량번호\r\n(승용)"); - dataTable.Columns.Add("이름"); + dataTable.Columns.Add("성명\r\n(법인명)"); dataTable.Columns.Add("수익금 종류"); dataTable.Columns.Add("금액"); dataTable.Columns.Add("일자"); diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs index 2961dc5..ea290d2 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs @@ -67,7 +67,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl } else { - MetroMessageBox.Show(this, "설정어 완료되었습니다.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); + MetroMessageBox.Show(this, "설정이 완료되었습니다.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs index 7223452..002f18f 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs @@ -92,15 +92,17 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataTable.Columns.Add("허가일자"); dataTable.Columns.Add("접수번호"); dataTable.Columns.Add("접수일자"); - dataTable.Columns.Add("이름"); - dataTable.Columns.Add("생년월일"); + dataTable.Columns.Add("신청구분"); + dataTable.Columns.Add("성명\r\n(법인명)"); + dataTable.Columns.Add("생년월일\r\n(법인등록번호)"); dataTable.Columns.Add("연락처"); dataTable.Columns.Add("주소"); dataTable.Columns.Add("주차구역"); + dataTable.Columns.Add("차량 타입"); dataTable.Columns.Add("차량번호\r\n(화물)"); - dataTable.Columns.Add("차종(화물)"); + dataTable.Columns.Add("차종\r\n(화물)"); dataTable.Columns.Add("차량번호\r\n(승용)"); - dataTable.Columns.Add("차종(승용)"); + dataTable.Columns.Add("차종\r\n(승용)"); dataTable.Columns.Add("이용시작일"); dataTable.Columns.Add("이용종료일"); dataTable.Columns.Add("결재여부"); @@ -131,19 +133,35 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl break; } + string owner = string.Empty; + switch (nowUserList[i].Owner) + { + case EOwner.Individual: + owner = "개인"; + break; + case EOwner.IndividualIntoCorporation: + owner = "지입"; + break; + case EOwner.Corporation: + owner = "법인"; + break; + + + } dataTable.Rows .Add( nowUserList[i].No, - nowUserList[i].Date.DateTimeDatabase(), nowUserList[i].ApplicantNo, nowUserList[i].ApplicantDate.DateTimeDatabase(), + owner, nowUserList[i].Name, nowUserList[i].PersonalNumber, nowUserList[i].Phone, nowUserList[i].Address, nowUserList[i].Area, + nowUserList[i].VehicleType == 0 ? "대형(4.5톤 미만)" : "특대형(4.5톤 이상)", nowUserList[i].CargoVehicleNumber, nowUserList[i].CargoVehicleName, nowUserList[i].PassengerVehicleNumber, diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs index 7ac0830..eb54f8f 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs @@ -48,6 +48,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl var dataTable = new DataTable(); dataTable.Columns.Add("순위"); dataTable.Columns.Add("접수번호"); + dataTable.Columns.Add("신청구분"); dataTable.Columns.Add("성명(법인명)"); dataTable.Columns.Add("생년월일(법인등록번호)"); dataTable.Columns.Add("연락처"); @@ -73,11 +74,28 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl { order = $"특대형-{countOversized}"; countOversized++; + } + string owner = string.Empty; + switch (applicants[i].Owenr) + { + case EOwner.Individual: + owner = "개인"; + break; + + case EOwner.IndividualIntoCorporation: + owner = "지입"; + break; + case EOwner.Corporation: + owner = "법인"; + break; + + } dataTable.Rows .Add( order, applicants[i].No, + owner, applicants[i].Name, applicants[i].PersonalNumber, applicants[i].Phone, diff --git a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs index 3a1f70b..5c9afde 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs @@ -7,15 +7,18 @@ namespace HSUCO_Cargo_Garage_Operation_Program { public string No { get; set; } // 고유번호 public EApplicantType ApplicantType { 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; } + + public EOwner Owenr { get; set; } public string Name { get; set; } // 성명 혹은 법인명 public string PersonalNumber { get; set; } // 생년월일 및 법인등록변호 public string Phone { get; set; } public string Address { get; set; } + public EVehicleType VehicleType { get; set; } + + public string CargoVehicleNumber { get; set; } + public string CargoVehicleName { get; set; } + public string PassengerVehicleNumber { get; set; } + public string PassengerVehicleName { get; set; } public DateTime Date { get; set; } } @@ -25,7 +28,11 @@ namespace HSUCO_Cargo_Garage_Operation_Program public string Area { get; set; } // 주차구역 public string ApplicantNo { get; set; } // 접수시번호 public DateTime ApplicantDate { get; set; } // 접수일자 - public string CargoVehicleNumber { get; set; } // 화물차량번호 + public EOwner Owner { get; set; } + + public string CargoVehicleNumber + { get; set; } // 화물차량번호 + public string CargoVehicleName { get; set; } // 화물차종 public string PassengerVehicleNumber { get; set; } // 승용차량번호 public string PassengerVehicleName { get; set; } // 승용차종 @@ -106,6 +113,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program public string CargoVehicleNumber { get; set; } public string PassengerVehicleNumber { get; set; } } + /// /// 사용자 정보 변경용 인포메이션 /// @@ -113,19 +121,21 @@ namespace HSUCO_Cargo_Garage_Operation_Program { 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 EOwner Owner { get; set; } public string Name { get; set; } // 성명 public string PersonalNumber { get; set; } //생년월일 혹은 법인번호 public string Phone { get; set; } // 연락처 public string Address { get; set; } // 주소 + public EVehicleType VehicleType { get; set; } // 차종 구분 4.5톤 이상 미만 + public string CargoVehicleNumber { get; set; } // 화물차량번호 + public string CargoVehicleName { get; set; } // 화물차종 + public string PassengerVehicleNumber { get; set; } // 승용차량번호 + public string PassengerVehicleName { get; set; } // 승용차종 } + public struct GetRefundInformation { - public EPaymentStatus PaymentStatus { get; set; } public DateTime DateStart { get; set; } public DateTime DateEnd { get; set; } @@ -133,20 +143,21 @@ namespace HSUCO_Cargo_Garage_Operation_Program public DateTime ExtensionStart { get; set; } public int BaseFee { get; set; } public int ExtensionFee { get; set; } - } + public struct LeftAreaInformation { public DateTime StartDateTime { get; set; } 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 { public string No { get; set; } @@ -155,20 +166,21 @@ namespace HSUCO_Cargo_Garage_Operation_Program public int UID { get; set; } public DateTime Date { get; set; } public EVehicleType VehicleType { get; set; } - } + public struct ResultSetUserListInformation { public string Area { get; set; } public string No { get; set; } public string ApplicantNo { get; set; } } + public struct GetPaymentBaseInformation { - public int Month { get; set; } public EVehicleType VehicleType { get; set; } } + public struct Settings { public string GarageName { get; set; } @@ -202,35 +214,44 @@ namespace HSUCO_Cargo_Garage_Operation_Program LedgerCertificate, } + public enum EOwner + { + Individual, + IndividualIntoCorporation, + Corporation + } + public enum EHistoryCode { Extension, Refund } + public enum EUserInformationType { ApplicantList, UserList, - } + public enum EApplicantType { Lots, // 추첨 대기 LotsOut, // 추첨 아웃 -> 순번 대기 - Wait // 추첨 + Wait // 추첨 } + public enum ERegistrationStatus { Wait, Registration, Delete } + public enum EPaymentStatus { StandBy, // 대기 Use, // 사용중 Refund, // 환불됨 Delete - } } \ 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 cc15493..3512666 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs @@ -66,15 +66,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program CREATE TABLE ""UserInformation"" ( ""UID"" INTEGER NOT NULL, - ""CargoVehicleNumber"" TEXT NOT NULL, - ""CargoVehicleName"" TEXT NOT NULL, - ""PassengerVehicleNumber"" TEXT NOT NULL, - ""PassengerVehicleName"" TEXT NOT NULL, - ""VehicleType"" INTEGER NOT NULL, + ""Owner"" INTEGER NOT NULL, ""Name"" TEXT NOT NULL, ""PersonalNumber"" TEXT NOT NULL, ""Phone"" TEXT NOT NULL, ""Address"" TEXT NOT NULL, + ""VehicleType"" INTEGER NOT NULL, + ""CargoVehicleNumber"" TEXT NOT NULL, + ""CargoVehicleName"" TEXT NOT NULL, + ""PassengerVehicleNumber"" TEXT NOT NULL, + ""PassengerVehicleName"" TEXT NOT NULL, PRIMARY KEY(""UID"" AUTOINCREMENT) ); @@ -105,15 +106,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program CREATE VIEW ViewApplicantList AS SELECT AL.No, AL.ApplicantType, AL.UID, - UI.CargoVehicleNumber, - UI.CargoVehicleName, - UI.PassengerVehicleNumber, - UI.PassengerVehicleName, - UI.VehicleType, + UI.Owner, UI.Name, UI.PersonalNumber, UI.Phone, UI.Address, + UI.VehicleType, + UI.CargoVehicleNumber, + UI.CargoVehicleName, + UI.PassengerVehicleNumber, + UI.PassengerVehicleName, AL.Date, AL.RegistrationStatus, AL.DropDate @@ -125,15 +127,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program UL.ApplicantNo, UL.ApplicantDate, UL.UID, - UI.CargoVehicleNumber, - UI.CargoVehicleName, - UI.PassengerVehicleNumber, - UI.PassengerVehicleName, - UI.VehicleType, + UI.Owner, UI.Name, UI.PersonalNumber, UI.Phone, UI.Address, + UI.VehicleType, + UI.CargoVehicleNumber, + UI.CargoVehicleName, + UI.PassengerVehicleNumber, + UI.PassengerVehicleName, UL.Date, UL.DateStart, UL.DateEnd, @@ -243,8 +246,8 @@ namespace HSUCO_Cargo_Garage_Operation_Program lastNo++; string no = $"{year}-{suffix}{lastNo}"; - var query = $"INSERT INTO UserInformation(CargoVehicleNumber, CargoVehicleName, PassengerVehicleNumber, PassengerVehicleName, VehicleType, Name, PersonalNumber, Phone, Address) " + - $"VALUES('{applicant.CargoVehicleNumber}','{applicant.CargoVehicleName}','{applicant.PassengerVehicleNumber}','{applicant.PassengerVehicleName}','{(int)applicant.VehicleType}','{applicant.Name}','{applicant.PersonalNumber}','{applicant.Phone}','{applicant.Address}');" + + var query = $"INSERT INTO UserInformation(Owner, Name, PersonalNumber, Phone, Address, VehicleType, CargoVehicleNumber, CargoVehicleName, PassengerVehicleNumber, PassengerVehicleName) " + + $"VALUES({(int)applicant.Owenr},'{applicant.Name}','{applicant.PersonalNumber}','{applicant.Phone}','{applicant.Address}','{(int)applicant.VehicleType}','{applicant.CargoVehicleNumber}','{applicant.CargoVehicleName}','{applicant.PassengerVehicleNumber}','{applicant.PassengerVehicleName}');" + $"select last_insert_rowid();"; int lastId = 0; @@ -291,15 +294,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program var applicant = new ApplicantInformation(); applicant.No = reader["No"].ToString(); applicant.ApplicantType = (EApplicantType)int.Parse(reader["ApplicantType"].ToString()); - applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); - applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); - applicant.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); - applicant.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); - applicant.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + applicant.Owenr = (EOwner)int.Parse(reader["Owner"].ToString()); applicant.Name = reader["Name"].ToString(); applicant.PersonalNumber = reader["PersonalNumber"].ToString(); applicant.Phone = reader["Phone"].ToString(); applicant.Address = reader["Address"].ToString(); + applicant.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); + applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); + applicant.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); + applicant.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); applicant.Date = DateTime.Parse(reader["Date"].ToString()); applicants.Add(applicant); } @@ -325,15 +329,17 @@ namespace HSUCO_Cargo_Garage_Operation_Program var applicant = new ApplicantInformation(); applicant.No = reader["No"].ToString(); applicant.ApplicantType = (EApplicantType)int.Parse(reader["ApplicantType"].ToString()); - applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); - applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); - applicant.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); - applicant.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); - applicant.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + applicant.Owenr = (EOwner)int.Parse(reader["Owner"].ToString()); applicant.Name = reader["Name"].ToString(); applicant.PersonalNumber = reader["PersonalNumber"].ToString(); applicant.Phone = reader["Phone"].ToString(); applicant.Address = reader["Address"].ToString(); + applicant.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); + applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); + applicant.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); + applicant.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); + applicant.Date = DateTime.Parse(reader["Date"].ToString()); applicants.Add(applicant); @@ -352,15 +358,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program var applicant = new ApplicantInformation(); applicant.No = reader["No"].ToString(); applicant.ApplicantType = (EApplicantType)int.Parse(reader["ApplicantType"].ToString()); - applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); - applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); - applicant.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); - applicant.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); - applicant.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + applicant.Owenr = (EOwner)int.Parse(reader["Owner"].ToString()); applicant.Name = reader["Name"].ToString(); applicant.PersonalNumber = reader["PersonalNumber"].ToString(); applicant.Phone = reader["Phone"].ToString(); applicant.Address = reader["Address"].ToString(); + applicant.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); + applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); + applicant.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); + applicant.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); applicant.Date = DateTime.Parse(reader["Date"].ToString()); applicants.Add(applicant); @@ -400,15 +407,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program { 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.Owner = (EOwner)int.Parse(reader["Owner"].ToString()); updateUserInformation.Name = reader["Name"].ToString(); updateUserInformation.PersonalNumber = reader["PersonalNumber"].ToString(); updateUserInformation.Phone = reader["Phone"].ToString(); updateUserInformation.Address = reader["Address"].ToString(); + updateUserInformation.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + updateUserInformation.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); + updateUserInformation.CargoVehicleName = reader["CargoVehicleName"].ToString(); + updateUserInformation.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); + updateUserInformation.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); } } } @@ -425,7 +433,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program command.CommandText = query; id = int.Parse(command.ExecuteScalar().ToString()); } - query = $"UPDATE UserInformation 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 UID={id}"; + query = $"UPDATE UserInformation Set Owner={(int)updateUserInformation.Owner}, Name='{updateUserInformation.Name}', PersonalNumber='{updateUserInformation.PersonalNumber}', Phone='{updateUserInformation.Phone}', Address='{updateUserInformation.Address}', VehicleType={(int)updateUserInformation.VehicleType}, CargoVehicleNumber='{updateUserInformation.CargoVehicleNumber}', CargoVehicleName='{updateUserInformation.CargoVehicleName}', PassengerVehicleNumber='{updateUserInformation.PassengerVehicleNumber}', PassengerVehicleName='{updateUserInformation.PassengerVehicleName}' Where UID={id}"; using (var updateCommand = _sqLiteConnection.CreateCommand()) { updateCommand.CommandText = query; @@ -453,14 +461,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program user.Area = reader["Area"].ToString(); user.ApplicantNo = reader["ApplicantNo"].ToString(); user.ApplicantDate = DateTime.Parse(reader["ApplicantDate"].ToString(), new CultureInfo("ko-KR")); - user.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); - user.CargoVehicleName = reader["CargoVehicleName"].ToString(); - user.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); - user.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); + user.Owner = (EOwner)int.Parse(reader["Owner"].ToString()); user.Name = reader["Name"].ToString(); user.PersonalNumber = reader["PersonalNumber"].ToString(); user.Phone = reader["Phone"].ToString(); user.Address = reader["Address"].ToString(); + user.VehicleType = (EVehicleType)int.Parse(reader["VehicleType"].ToString()); + user.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); + user.CargoVehicleName = reader["CargoVehicleName"].ToString(); + user.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); + user.PassengerVehicleName = reader["PassengerVehicleName"].ToString(); user.Date = DateTime.Parse(reader["Date"].ToString(), new CultureInfo("ko-KR")); user.DateStart = DateTime.Parse(reader["DateStart"].ToString(), new CultureInfo("ko-KR")); user.DateEnd = DateTime.Parse(reader["DateEnd"].ToString(), new CultureInfo("ko-KR"));