diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.Designer.cs index 68044c3..94776f6 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.Designer.cs @@ -34,9 +34,6 @@ this.metroButton_Cancel = new MetroFramework.Controls.MetroButton(); this.metroDateTime_Start = new MetroFramework.Controls.MetroDateTime(); this.metroDateTime_End = new MetroFramework.Controls.MetroDateTime(); - this.metroLabel3 = new MetroFramework.Controls.MetroLabel(); - this.metroTextBox_Cost = new MetroFramework.Controls.MetroTextBox(); - this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); this.SuspendLayout(); // // metroLabel1 @@ -95,58 +92,6 @@ this.metroDateTime_End.Name = "metroDateTime_End"; this.metroDateTime_End.Size = new System.Drawing.Size(200, 29); this.metroDateTime_End.TabIndex = 6; - this.metroDateTime_End.ValueChanged += new System.EventHandler(this.metroDateTime_Start_ValueChanged); - // - // metroLabel3 - // - this.metroLabel3.AutoSize = true; - this.metroLabel3.Location = new System.Drawing.Point(30, 174); - this.metroLabel3.Name = "metroLabel3"; - this.metroLabel3.Size = new System.Drawing.Size(87, 19); - this.metroLabel3.TabIndex = 7; - this.metroLabel3.Text = "총 이용 금액"; - // - // metroTextBox_Cost - // - // - // - // - this.metroTextBox_Cost.CustomButton.Image = null; - this.metroTextBox_Cost.CustomButton.Location = new System.Drawing.Point(158, 1); - this.metroTextBox_Cost.CustomButton.Name = ""; - this.metroTextBox_Cost.CustomButton.Size = new System.Drawing.Size(21, 21); - this.metroTextBox_Cost.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.metroTextBox_Cost.CustomButton.TabIndex = 1; - this.metroTextBox_Cost.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.metroTextBox_Cost.CustomButton.UseSelectable = true; - this.metroTextBox_Cost.CustomButton.Visible = false; - this.metroTextBox_Cost.Lines = new string[] { - "0"}; - this.metroTextBox_Cost.Location = new System.Drawing.Point(131, 170); - this.metroTextBox_Cost.MaxLength = 32767; - this.metroTextBox_Cost.Name = "metroTextBox_Cost"; - this.metroTextBox_Cost.PasswordChar = '\0'; - this.metroTextBox_Cost.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.metroTextBox_Cost.SelectedText = ""; - this.metroTextBox_Cost.SelectionLength = 0; - this.metroTextBox_Cost.SelectionStart = 0; - this.metroTextBox_Cost.ShortcutsEnabled = true; - this.metroTextBox_Cost.Size = new System.Drawing.Size(180, 23); - this.metroTextBox_Cost.TabIndex = 8; - this.metroTextBox_Cost.Text = "0"; - this.metroTextBox_Cost.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.metroTextBox_Cost.UseSelectable = true; - this.metroTextBox_Cost.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.metroTextBox_Cost.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); - // - // metroLabel4 - // - this.metroLabel4.AutoSize = true; - this.metroLabel4.Location = new System.Drawing.Point(311, 174); - this.metroLabel4.Name = "metroLabel4"; - this.metroLabel4.Size = new System.Drawing.Size(23, 19); - this.metroLabel4.TabIndex = 9; - this.metroLabel4.Text = "원"; // // Promotion // @@ -154,9 +99,6 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle; this.ClientSize = new System.Drawing.Size(376, 294); - this.Controls.Add(this.metroLabel4); - this.Controls.Add(this.metroTextBox_Cost); - this.Controls.Add(this.metroLabel3); this.Controls.Add(this.metroDateTime_End); this.Controls.Add(this.metroDateTime_Start); this.Controls.Add(this.metroButton_Cancel); @@ -179,8 +121,5 @@ private MetroFramework.Controls.MetroButton metroButton_Cancel; private MetroFramework.Controls.MetroDateTime metroDateTime_Start; private MetroFramework.Controls.MetroDateTime metroDateTime_End; - private MetroFramework.Controls.MetroLabel metroLabel3; - private MetroFramework.Controls.MetroTextBox metroTextBox_Cost; - private MetroFramework.Controls.MetroLabel metroLabel4; } } \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.cs index cf2b69e..474bf47 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Promotion.cs @@ -8,15 +8,17 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm { public DateTime StartDate { get; set; } public DateTime EndDate { get; set; } - public int TotalCost { get; set; } - public Promotion() => InitializeComponent(); + public Promotion(string title) + { + InitializeComponent(); + this.Text = title; + } void metroButton_Promotion_Click(object sender, EventArgs e) { StartDate = metroDateTime_Start.Value; EndDate = metroDateTime_End.Value; - int.TryParse(metroTextBox_Cost.Text, out var tempCost); - TotalCost = tempCost; + DialogResult = DialogResult.OK; } @@ -30,30 +32,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm var year = DateTime.Now.Year + 1; metroDateTime_Start.Value = DateTime.Parse(year + "-01-01"); metroDateTime_End.Value = DateTime.Parse(year + "-12-31"); + metroDateTime_End.Enabled = false; } private void metroDateTime_Start_ValueChanged(object sender, EventArgs e) { - //TODO: 요금 업데이트 필요 - /* - long cost = Global.GlobalSettings.UsageFee; - - var days = (metroDateTime_End.Value - metroDateTime_Start.Value).TotalDays; - if (days == 365) + if (metroDateTime_Start.Value.Year != metroDateTime_End.Value.Year) { - metroTextBox_Cost.Text = cost.ToString(); - return; + metroDateTime_End.Value = DateTime.Parse(metroDateTime_Start.Value.Year + "-12-31"); } - Debug.WriteLine((days)); - - - var doubleCost = cost / 365 * days; - doubleCost -= (doubleCost % 10); // 10의 자리 버림 - int totalCost = (int)doubleCost; - metroTextBox_Cost.Text = totalCost.ToString(); - */ - } } } \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Refund.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Refund.Designer.cs index 339f35b..beb9b63 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Refund.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/Refund.Designer.cs @@ -117,7 +117,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(466, 304); this.Controls.Add(this.metroLabel5); this.Controls.Add(this.metroLabel4); this.Controls.Add(this.metroLabel_DateEnd); diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/WaitingCount.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/WaitingCount.cs index 79e9b95..11adb5b 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/WaitingCount.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/WaitingCount.cs @@ -59,6 +59,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm private void metroDateTime_Start_ValueChanged(object sender, EventArgs e) { + //TODO: 요금계산 부분 다시 작성 요망 /* //long cost = Global.GlobalSettings.UsageFee; diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs index c4ccdda..f01be79 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs @@ -78,6 +78,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.DataSource = dataTable; dataGridView_List.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + /* dataGridView_List.Columns[0].MinimumWidth = 100; dataGridView_List.Columns[0].FillWeight = 100; @@ -85,7 +86,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.Columns[1].FillWeight = 100; dataGridView_List.Columns[2].MinimumWidth = 60; dataGridView_List.Columns[2].FillWeight = 60; - + */ } @@ -143,13 +144,13 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl if (MetroMessageBox.Show(this, message, "이용자로 변경", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) { - var promotion = new Promotion(); + //var promotion = new -Promotion(); - if (promotion.ShowDialog() == DialogResult.OK) - { - Database.AddUserList(CargoVehicleNumber, promotion.StartDate, promotion.EndDate, promotion.TotalCost); - DataChange(); - } + //if (promotion.ShowDialog() == DialogResult.OK) + //{ + //Database.AddUserList(CargoVehicleNumber, promotion.StartDate, promotion.EndDate, promotion.TotalCost); + // DataChange(); + //} } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs index 4238b08..0e2fc0d 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs @@ -72,6 +72,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.DataSource = dataTable; dataGridView_List.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView_List.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + /* dataGridView_List.Columns[0].MinimumWidth = 100; dataGridView_List.Columns[0].FillWeight = 100; @@ -80,6 +81,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.Columns[1].FillWeight = 100; dataGridView_List.Columns[2].MinimumWidth = 60; dataGridView_List.Columns[2].FillWeight = 60; + */ } private void metroButton_RePrint_Click(object sender, EventArgs e) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs index 523c8f7..17da927 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListProceeds.cs @@ -87,6 +87,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView_List.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; dataGridView_List.Columns[4].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight; + /* dataGridView_List.Columns[0].MinimumWidth = 100; dataGridView_List.Columns[0].FillWeight = 100; @@ -95,6 +96,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl dataGridView_List.Columns[1].FillWeight = 100; dataGridView_List.Columns[2].MinimumWidth = 60; dataGridView_List.Columns[2].FillWeight = 60; + */ } private void ListProceeds_Load(object sender, EventArgs e) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.Designer.cs index a235481..1efe4ac 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.Designer.cs @@ -28,95 +28,128 @@ /// private void InitializeComponent() { - this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel2 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel3 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); - this.metroTextBox_CargoLargeMaxCount = new MetroFramework.Controls.MetroTextBox(); - this.metroTextBox_CargoOversizedMaxCount = new MetroFramework.Controls.MetroTextBox(); - this.metroTextBox_CargoLargeFee = new MetroFramework.Controls.MetroTextBox(); - this.metroTextBox_CargoOversizedFee = new MetroFramework.Controls.MetroTextBox(); this.metroButton_Save = new MetroFramework.Controls.MetroButton(); - this.metroLabel5 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel6 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel7 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel8 = new MetroFramework.Controls.MetroLabel(); this.metroLabel9 = new MetroFramework.Controls.MetroLabel(); this.metroTextBox_GarageName = new MetroFramework.Controls.MetroTextBox(); - this.metroLabel10 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel11 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel13 = new MetroFramework.Controls.MetroLabel(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel15 = new MetroFramework.Controls.MetroLabel(); + this.metroTextBox_CargoOversizedMaxCount = new MetroFramework.Controls.MetroTextBox(); + this.metroTextBox_CargoLargeMaxCount = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel16 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel17 = new MetroFramework.Controls.MetroLabel(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel2 = new MetroFramework.Controls.MetroLabel(); + this.metroTextBox_CargoOversizedFee = new MetroFramework.Controls.MetroTextBox(); + this.metroTextBox_CargoLargeFee = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel5 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel6 = new MetroFramework.Controls.MetroLabel(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.metroLabel18 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel19 = new MetroFramework.Controls.MetroLabel(); this.metroTextBox_CargoOversizedCertificateFee = new MetroFramework.Controls.MetroTextBox(); this.metroTextBox_CargoLargeCertificateFee = new MetroFramework.Controls.MetroTextBox(); - this.metroLabel12 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel13 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel20 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel21 = new MetroFramework.Controls.MetroLabel(); + this.metroButton_init = new MetroFramework.Controls.MetroButton(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); this.SuspendLayout(); // - // metroLabel1 + // metroButton_Save // - this.metroLabel1.AutoSize = true; - this.metroLabel1.Location = new System.Drawing.Point(20, 66); - this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Size = new System.Drawing.Size(96, 19); - this.metroLabel1.TabIndex = 0; - this.metroLabel1.Text = "이용 금액(1년)"; + this.metroButton_Save.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton_Save.Location = new System.Drawing.Point(20, 420); + this.metroButton_Save.Name = "metroButton_Save"; + this.metroButton_Save.Size = new System.Drawing.Size(140, 40); + this.metroButton_Save.TabIndex = 8; + this.metroButton_Save.Text = "설정 저장"; + this.metroButton_Save.UseSelectable = true; + this.metroButton_Save.Click += new System.EventHandler(this.metroButton_Save_Click); // - // metroLabel2 + // metroLabel9 // - this.metroLabel2.AutoSize = true; - this.metroLabel2.Location = new System.Drawing.Point(20, 96); - this.metroLabel2.Name = "metroLabel2"; - this.metroLabel2.Size = new System.Drawing.Size(96, 19); - this.metroLabel2.TabIndex = 1; - this.metroLabel2.Text = "연장 금액(1년)"; + this.metroLabel9.AutoSize = true; + this.metroLabel9.Location = new System.Drawing.Point(20, 21); + this.metroLabel9.Name = "metroLabel9"; + this.metroLabel9.Size = new System.Drawing.Size(69, 19); + this.metroLabel9.TabIndex = 10; + this.metroLabel9.Text = "차고지명 "; // - // metroLabel3 + // metroTextBox_GarageName // - this.metroLabel3.AutoSize = true; - this.metroLabel3.Location = new System.Drawing.Point(20, 126); - this.metroLabel3.Name = "metroLabel3"; - this.metroLabel3.Size = new System.Drawing.Size(115, 19); - this.metroLabel3.TabIndex = 2; - this.metroLabel3.Text = "증명서 발급 금액"; + // + // + // + this.metroTextBox_GarageName.CustomButton.Image = null; + this.metroTextBox_GarageName.CustomButton.Location = new System.Drawing.Point(218, 1); + this.metroTextBox_GarageName.CustomButton.Name = ""; + this.metroTextBox_GarageName.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_GarageName.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_GarageName.CustomButton.TabIndex = 1; + this.metroTextBox_GarageName.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_GarageName.CustomButton.UseSelectable = true; + this.metroTextBox_GarageName.CustomButton.Visible = false; + this.metroTextBox_GarageName.Lines = new string[0]; + this.metroTextBox_GarageName.Location = new System.Drawing.Point(84, 21); + this.metroTextBox_GarageName.MaxLength = 32767; + this.metroTextBox_GarageName.Name = "metroTextBox_GarageName"; + this.metroTextBox_GarageName.PasswordChar = '\0'; + this.metroTextBox_GarageName.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_GarageName.SelectedText = ""; + this.metroTextBox_GarageName.SelectionLength = 0; + this.metroTextBox_GarageName.SelectionStart = 0; + this.metroTextBox_GarageName.ShortcutsEnabled = true; + this.metroTextBox_GarageName.Size = new System.Drawing.Size(240, 23); + this.metroTextBox_GarageName.TabIndex = 11; + this.metroTextBox_GarageName.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.metroTextBox_GarageName.UseSelectable = true; + this.metroTextBox_GarageName.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_GarageName.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel13 + // + this.metroLabel13.AutoSize = true; + this.metroLabel13.Location = new System.Drawing.Point(29, 270); + this.metroLabel13.Name = "metroLabel13"; + this.metroLabel13.Size = new System.Drawing.Size(0, 0); + this.metroLabel13.TabIndex = 12; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.metroLabel4); + this.groupBox1.Controls.Add(this.metroLabel15); + this.groupBox1.Controls.Add(this.metroTextBox_CargoOversizedMaxCount); + this.groupBox1.Controls.Add(this.metroTextBox_CargoLargeMaxCount); + this.groupBox1.Controls.Add(this.metroLabel16); + this.groupBox1.Controls.Add(this.metroLabel17); + this.groupBox1.Location = new System.Drawing.Point(20, 60); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(304, 100); + this.groupBox1.TabIndex = 19; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "이용 가능 대수"; // // metroLabel4 // this.metroLabel4.AutoSize = true; - this.metroLabel4.Location = new System.Drawing.Point(20, 156); + this.metroLabel4.Location = new System.Drawing.Point(226, 64); this.metroLabel4.Name = "metroLabel4"; - this.metroLabel4.Size = new System.Drawing.Size(129, 19); - this.metroLabel4.TabIndex = 3; - this.metroLabel4.Text = "증명서 재발급 금액"; + this.metroLabel4.Size = new System.Drawing.Size(23, 19); + this.metroLabel4.TabIndex = 14; + this.metroLabel4.Text = "대"; // - // metroTextBox_CargoLargeMaxCount + // metroLabel15 // - // - // - // - this.metroTextBox_CargoLargeMaxCount.CustomButton.Image = null; - this.metroTextBox_CargoLargeMaxCount.CustomButton.Location = new System.Drawing.Point(78, 1); - this.metroTextBox_CargoLargeMaxCount.CustomButton.Name = ""; - this.metroTextBox_CargoLargeMaxCount.CustomButton.Size = new System.Drawing.Size(21, 21); - this.metroTextBox_CargoLargeMaxCount.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.metroTextBox_CargoLargeMaxCount.CustomButton.TabIndex = 1; - this.metroTextBox_CargoLargeMaxCount.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.metroTextBox_CargoLargeMaxCount.CustomButton.UseSelectable = true; - this.metroTextBox_CargoLargeMaxCount.CustomButton.Visible = false; - this.metroTextBox_CargoLargeMaxCount.Lines = new string[0]; - this.metroTextBox_CargoLargeMaxCount.Location = new System.Drawing.Point(150, 62); - this.metroTextBox_CargoLargeMaxCount.MaxLength = 32767; - this.metroTextBox_CargoLargeMaxCount.Name = "metroTextBox_CargoLargeMaxCount"; - this.metroTextBox_CargoLargeMaxCount.PasswordChar = '\0'; - this.metroTextBox_CargoLargeMaxCount.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.metroTextBox_CargoLargeMaxCount.SelectedText = ""; - this.metroTextBox_CargoLargeMaxCount.SelectionLength = 0; - this.metroTextBox_CargoLargeMaxCount.SelectionStart = 0; - this.metroTextBox_CargoLargeMaxCount.ShortcutsEnabled = true; - this.metroTextBox_CargoLargeMaxCount.Size = new System.Drawing.Size(100, 23); - this.metroTextBox_CargoLargeMaxCount.TabIndex = 4; - this.metroTextBox_CargoLargeMaxCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.metroTextBox_CargoLargeMaxCount.UseSelectable = true; - this.metroTextBox_CargoLargeMaxCount.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.metroTextBox_CargoLargeMaxCount.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + this.metroLabel15.AutoSize = true; + this.metroLabel15.Location = new System.Drawing.Point(226, 34); + this.metroLabel15.Name = "metroLabel15"; + this.metroLabel15.Size = new System.Drawing.Size(23, 19); + this.metroLabel15.TabIndex = 15; + this.metroLabel15.Text = "대"; // // metroTextBox_CargoOversizedMaxCount // @@ -133,7 +166,7 @@ this.metroTextBox_CargoOversizedMaxCount.CustomButton.UseSelectable = true; this.metroTextBox_CargoOversizedMaxCount.CustomButton.Visible = false; this.metroTextBox_CargoOversizedMaxCount.Lines = new string[0]; - this.metroTextBox_CargoOversizedMaxCount.Location = new System.Drawing.Point(150, 91); + this.metroTextBox_CargoOversizedMaxCount.Location = new System.Drawing.Point(120, 60); this.metroTextBox_CargoOversizedMaxCount.MaxLength = 32767; this.metroTextBox_CargoOversizedMaxCount.Name = "metroTextBox_CargoOversizedMaxCount"; this.metroTextBox_CargoOversizedMaxCount.PasswordChar = '\0'; @@ -143,42 +176,93 @@ this.metroTextBox_CargoOversizedMaxCount.SelectionStart = 0; this.metroTextBox_CargoOversizedMaxCount.ShortcutsEnabled = true; this.metroTextBox_CargoOversizedMaxCount.Size = new System.Drawing.Size(100, 23); - this.metroTextBox_CargoOversizedMaxCount.TabIndex = 5; + this.metroTextBox_CargoOversizedMaxCount.TabIndex = 13; this.metroTextBox_CargoOversizedMaxCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.metroTextBox_CargoOversizedMaxCount.UseSelectable = true; this.metroTextBox_CargoOversizedMaxCount.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.metroTextBox_CargoOversizedMaxCount.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // - // metroTextBox_CargoLargeFee + // metroTextBox_CargoLargeMaxCount // // // // - this.metroTextBox_CargoLargeFee.CustomButton.Image = null; - this.metroTextBox_CargoLargeFee.CustomButton.Location = new System.Drawing.Point(78, 1); - this.metroTextBox_CargoLargeFee.CustomButton.Name = ""; - this.metroTextBox_CargoLargeFee.CustomButton.Size = new System.Drawing.Size(21, 21); - this.metroTextBox_CargoLargeFee.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.metroTextBox_CargoLargeFee.CustomButton.TabIndex = 1; - this.metroTextBox_CargoLargeFee.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.metroTextBox_CargoLargeFee.CustomButton.UseSelectable = true; - this.metroTextBox_CargoLargeFee.CustomButton.Visible = false; - this.metroTextBox_CargoLargeFee.Lines = new string[0]; - this.metroTextBox_CargoLargeFee.Location = new System.Drawing.Point(150, 122); - this.metroTextBox_CargoLargeFee.MaxLength = 32767; - this.metroTextBox_CargoLargeFee.Name = "metroTextBox_CargoLargeFee"; - this.metroTextBox_CargoLargeFee.PasswordChar = '\0'; - this.metroTextBox_CargoLargeFee.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.metroTextBox_CargoLargeFee.SelectedText = ""; - this.metroTextBox_CargoLargeFee.SelectionLength = 0; - this.metroTextBox_CargoLargeFee.SelectionStart = 0; - this.metroTextBox_CargoLargeFee.ShortcutsEnabled = true; - this.metroTextBox_CargoLargeFee.Size = new System.Drawing.Size(100, 23); - this.metroTextBox_CargoLargeFee.TabIndex = 6; - this.metroTextBox_CargoLargeFee.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.metroTextBox_CargoLargeFee.UseSelectable = true; - this.metroTextBox_CargoLargeFee.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.metroTextBox_CargoLargeFee.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + this.metroTextBox_CargoLargeMaxCount.CustomButton.Image = null; + this.metroTextBox_CargoLargeMaxCount.CustomButton.Location = new System.Drawing.Point(78, 1); + this.metroTextBox_CargoLargeMaxCount.CustomButton.Name = ""; + this.metroTextBox_CargoLargeMaxCount.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_CargoLargeMaxCount.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_CargoLargeMaxCount.CustomButton.TabIndex = 1; + this.metroTextBox_CargoLargeMaxCount.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_CargoLargeMaxCount.CustomButton.UseSelectable = true; + this.metroTextBox_CargoLargeMaxCount.CustomButton.Visible = false; + this.metroTextBox_CargoLargeMaxCount.Lines = new string[0]; + this.metroTextBox_CargoLargeMaxCount.Location = new System.Drawing.Point(120, 30); + this.metroTextBox_CargoLargeMaxCount.MaxLength = 32767; + this.metroTextBox_CargoLargeMaxCount.Name = "metroTextBox_CargoLargeMaxCount"; + this.metroTextBox_CargoLargeMaxCount.PasswordChar = '\0'; + this.metroTextBox_CargoLargeMaxCount.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_CargoLargeMaxCount.SelectedText = ""; + this.metroTextBox_CargoLargeMaxCount.SelectionLength = 0; + this.metroTextBox_CargoLargeMaxCount.SelectionStart = 0; + this.metroTextBox_CargoLargeMaxCount.ShortcutsEnabled = true; + this.metroTextBox_CargoLargeMaxCount.Size = new System.Drawing.Size(100, 23); + this.metroTextBox_CargoLargeMaxCount.TabIndex = 12; + this.metroTextBox_CargoLargeMaxCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.metroTextBox_CargoLargeMaxCount.UseSelectable = true; + this.metroTextBox_CargoLargeMaxCount.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_CargoLargeMaxCount.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel16 + // + this.metroLabel16.AutoSize = true; + this.metroLabel16.Location = new System.Drawing.Point(30, 60); + this.metroLabel16.Name = "metroLabel16"; + this.metroLabel16.Size = new System.Drawing.Size(51, 19); + this.metroLabel16.TabIndex = 11; + this.metroLabel16.Text = "특대형"; + // + // metroLabel17 + // + this.metroLabel17.AutoSize = true; + this.metroLabel17.Location = new System.Drawing.Point(30, 30); + this.metroLabel17.Name = "metroLabel17"; + this.metroLabel17.Size = new System.Drawing.Size(51, 19); + this.metroLabel17.TabIndex = 10; + this.metroLabel17.Text = "대　형"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.metroLabel1); + this.groupBox2.Controls.Add(this.metroLabel2); + this.groupBox2.Controls.Add(this.metroTextBox_CargoOversizedFee); + this.groupBox2.Controls.Add(this.metroTextBox_CargoLargeFee); + this.groupBox2.Controls.Add(this.metroLabel5); + this.groupBox2.Controls.Add(this.metroLabel6); + this.groupBox2.Location = new System.Drawing.Point(20, 180); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(302, 100); + this.groupBox2.TabIndex = 20; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "이용 금액(1년)"; + // + // metroLabel1 + // + this.metroLabel1.AutoSize = true; + this.metroLabel1.Location = new System.Drawing.Point(226, 64); + this.metroLabel1.Name = "metroLabel1"; + this.metroLabel1.Size = new System.Drawing.Size(23, 19); + this.metroLabel1.TabIndex = 14; + this.metroLabel1.Text = "원"; + // + // metroLabel2 + // + this.metroLabel2.AutoSize = true; + this.metroLabel2.Location = new System.Drawing.Point(226, 34); + this.metroLabel2.Name = "metroLabel2"; + this.metroLabel2.Size = new System.Drawing.Size(23, 19); + this.metroLabel2.TabIndex = 15; + this.metroLabel2.Text = "원"; // // metroTextBox_CargoOversizedFee // @@ -195,7 +279,7 @@ this.metroTextBox_CargoOversizedFee.CustomButton.UseSelectable = true; this.metroTextBox_CargoOversizedFee.CustomButton.Visible = false; this.metroTextBox_CargoOversizedFee.Lines = new string[0]; - this.metroTextBox_CargoOversizedFee.Location = new System.Drawing.Point(150, 152); + this.metroTextBox_CargoOversizedFee.Location = new System.Drawing.Point(120, 60); this.metroTextBox_CargoOversizedFee.MaxLength = 32767; this.metroTextBox_CargoOversizedFee.Name = "metroTextBox_CargoOversizedFee"; this.metroTextBox_CargoOversizedFee.PasswordChar = '\0'; @@ -205,116 +289,93 @@ this.metroTextBox_CargoOversizedFee.SelectionStart = 0; this.metroTextBox_CargoOversizedFee.ShortcutsEnabled = true; this.metroTextBox_CargoOversizedFee.Size = new System.Drawing.Size(100, 23); - this.metroTextBox_CargoOversizedFee.TabIndex = 7; + this.metroTextBox_CargoOversizedFee.TabIndex = 13; this.metroTextBox_CargoOversizedFee.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.metroTextBox_CargoOversizedFee.UseSelectable = true; this.metroTextBox_CargoOversizedFee.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.metroTextBox_CargoOversizedFee.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // - // metroButton_Save + // metroTextBox_CargoLargeFee // - this.metroButton_Save.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_Save.Location = new System.Drawing.Point(173, 274); - this.metroButton_Save.Name = "metroButton_Save"; - this.metroButton_Save.Size = new System.Drawing.Size(100, 40); - this.metroButton_Save.TabIndex = 8; - this.metroButton_Save.Text = "설정 저장"; - this.metroButton_Save.UseSelectable = true; - this.metroButton_Save.Click += new System.EventHandler(this.metroButton_Save_Click); + // + // + // + this.metroTextBox_CargoLargeFee.CustomButton.Image = null; + this.metroTextBox_CargoLargeFee.CustomButton.Location = new System.Drawing.Point(78, 1); + this.metroTextBox_CargoLargeFee.CustomButton.Name = ""; + this.metroTextBox_CargoLargeFee.CustomButton.Size = new System.Drawing.Size(21, 21); + this.metroTextBox_CargoLargeFee.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.metroTextBox_CargoLargeFee.CustomButton.TabIndex = 1; + this.metroTextBox_CargoLargeFee.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.metroTextBox_CargoLargeFee.CustomButton.UseSelectable = true; + this.metroTextBox_CargoLargeFee.CustomButton.Visible = false; + this.metroTextBox_CargoLargeFee.Lines = new string[0]; + this.metroTextBox_CargoLargeFee.Location = new System.Drawing.Point(120, 30); + this.metroTextBox_CargoLargeFee.MaxLength = 32767; + this.metroTextBox_CargoLargeFee.Name = "metroTextBox_CargoLargeFee"; + this.metroTextBox_CargoLargeFee.PasswordChar = '\0'; + this.metroTextBox_CargoLargeFee.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.metroTextBox_CargoLargeFee.SelectedText = ""; + this.metroTextBox_CargoLargeFee.SelectionLength = 0; + this.metroTextBox_CargoLargeFee.SelectionStart = 0; + this.metroTextBox_CargoLargeFee.ShortcutsEnabled = true; + this.metroTextBox_CargoLargeFee.Size = new System.Drawing.Size(100, 23); + this.metroTextBox_CargoLargeFee.TabIndex = 12; + this.metroTextBox_CargoLargeFee.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.metroTextBox_CargoLargeFee.UseSelectable = true; + this.metroTextBox_CargoLargeFee.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.metroTextBox_CargoLargeFee.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // // metroLabel5 // this.metroLabel5.AutoSize = true; - this.metroLabel5.Location = new System.Drawing.Point(250, 66); + this.metroLabel5.Location = new System.Drawing.Point(30, 60); this.metroLabel5.Name = "metroLabel5"; - this.metroLabel5.Size = new System.Drawing.Size(23, 19); - this.metroLabel5.TabIndex = 9; - this.metroLabel5.Text = "원"; + this.metroLabel5.Size = new System.Drawing.Size(51, 19); + this.metroLabel5.TabIndex = 11; + this.metroLabel5.Text = "특대형"; // // metroLabel6 // this.metroLabel6.AutoSize = true; - this.metroLabel6.Location = new System.Drawing.Point(250, 96); + this.metroLabel6.Location = new System.Drawing.Point(30, 30); this.metroLabel6.Name = "metroLabel6"; - this.metroLabel6.Size = new System.Drawing.Size(23, 19); - this.metroLabel6.TabIndex = 9; - this.metroLabel6.Text = "원"; + this.metroLabel6.Size = new System.Drawing.Size(51, 19); + this.metroLabel6.TabIndex = 10; + this.metroLabel6.Text = "대　형"; // - // metroLabel7 + // groupBox3 // - this.metroLabel7.AutoSize = true; - this.metroLabel7.Location = new System.Drawing.Point(250, 126); - this.metroLabel7.Name = "metroLabel7"; - this.metroLabel7.Size = new System.Drawing.Size(23, 19); - this.metroLabel7.TabIndex = 9; - this.metroLabel7.Text = "원"; + this.groupBox3.Controls.Add(this.metroLabel18); + this.groupBox3.Controls.Add(this.metroLabel19); + this.groupBox3.Controls.Add(this.metroTextBox_CargoOversizedCertificateFee); + this.groupBox3.Controls.Add(this.metroTextBox_CargoLargeCertificateFee); + this.groupBox3.Controls.Add(this.metroLabel20); + this.groupBox3.Controls.Add(this.metroLabel21); + this.groupBox3.Location = new System.Drawing.Point(20, 310); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(304, 100); + this.groupBox3.TabIndex = 21; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "증명서 발급 금액"; // - // metroLabel8 + // metroLabel18 // - this.metroLabel8.AutoSize = true; - this.metroLabel8.Location = new System.Drawing.Point(250, 156); - this.metroLabel8.Name = "metroLabel8"; - this.metroLabel8.Size = new System.Drawing.Size(23, 19); - this.metroLabel8.TabIndex = 9; - this.metroLabel8.Text = "원"; + this.metroLabel18.AutoSize = true; + this.metroLabel18.Location = new System.Drawing.Point(226, 64); + this.metroLabel18.Name = "metroLabel18"; + this.metroLabel18.Size = new System.Drawing.Size(23, 19); + this.metroLabel18.TabIndex = 14; + this.metroLabel18.Text = "원"; // - // metroLabel9 + // metroLabel19 // - this.metroLabel9.AutoSize = true; - this.metroLabel9.Location = new System.Drawing.Point(20, 21); - this.metroLabel9.Name = "metroLabel9"; - this.metroLabel9.Size = new System.Drawing.Size(96, 19); - this.metroLabel9.TabIndex = 10; - this.metroLabel9.Text = "이용 금액(1년)"; - // - // metroTextBox_GarageName - // - // - // - // - this.metroTextBox_GarageName.CustomButton.Image = null; - this.metroTextBox_GarageName.CustomButton.Location = new System.Drawing.Point(78, 1); - this.metroTextBox_GarageName.CustomButton.Name = ""; - this.metroTextBox_GarageName.CustomButton.Size = new System.Drawing.Size(21, 21); - this.metroTextBox_GarageName.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.metroTextBox_GarageName.CustomButton.TabIndex = 1; - this.metroTextBox_GarageName.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.metroTextBox_GarageName.CustomButton.UseSelectable = true; - this.metroTextBox_GarageName.CustomButton.Visible = false; - this.metroTextBox_GarageName.Lines = new string[0]; - this.metroTextBox_GarageName.Location = new System.Drawing.Point(141, 17); - this.metroTextBox_GarageName.MaxLength = 32767; - this.metroTextBox_GarageName.Name = "metroTextBox_GarageName"; - this.metroTextBox_GarageName.PasswordChar = '\0'; - this.metroTextBox_GarageName.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.metroTextBox_GarageName.SelectedText = ""; - this.metroTextBox_GarageName.SelectionLength = 0; - this.metroTextBox_GarageName.SelectionStart = 0; - this.metroTextBox_GarageName.ShortcutsEnabled = true; - this.metroTextBox_GarageName.Size = new System.Drawing.Size(100, 23); - this.metroTextBox_GarageName.TabIndex = 11; - this.metroTextBox_GarageName.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.metroTextBox_GarageName.UseSelectable = true; - this.metroTextBox_GarageName.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.metroTextBox_GarageName.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); - // - // metroLabel10 - // - this.metroLabel10.AutoSize = true; - this.metroLabel10.Location = new System.Drawing.Point(250, 222); - this.metroLabel10.Name = "metroLabel10"; - this.metroLabel10.Size = new System.Drawing.Size(23, 19); - this.metroLabel10.TabIndex = 16; - this.metroLabel10.Text = "원"; - // - // metroLabel11 - // - this.metroLabel11.AutoSize = true; - this.metroLabel11.Location = new System.Drawing.Point(250, 192); - this.metroLabel11.Name = "metroLabel11"; - this.metroLabel11.Size = new System.Drawing.Size(23, 19); - this.metroLabel11.TabIndex = 17; - this.metroLabel11.Text = "원"; + this.metroLabel19.AutoSize = true; + this.metroLabel19.Location = new System.Drawing.Point(226, 34); + this.metroLabel19.Name = "metroLabel19"; + this.metroLabel19.Size = new System.Drawing.Size(23, 19); + this.metroLabel19.TabIndex = 15; + this.metroLabel19.Text = "원"; // // metroTextBox_CargoOversizedCertificateFee // @@ -331,7 +392,7 @@ this.metroTextBox_CargoOversizedCertificateFee.CustomButton.UseSelectable = true; this.metroTextBox_CargoOversizedCertificateFee.CustomButton.Visible = false; this.metroTextBox_CargoOversizedCertificateFee.Lines = new string[0]; - this.metroTextBox_CargoOversizedCertificateFee.Location = new System.Drawing.Point(150, 218); + this.metroTextBox_CargoOversizedCertificateFee.Location = new System.Drawing.Point(120, 60); this.metroTextBox_CargoOversizedCertificateFee.MaxLength = 32767; this.metroTextBox_CargoOversizedCertificateFee.Name = "metroTextBox_CargoOversizedCertificateFee"; this.metroTextBox_CargoOversizedCertificateFee.PasswordChar = '\0'; @@ -341,7 +402,7 @@ this.metroTextBox_CargoOversizedCertificateFee.SelectionStart = 0; this.metroTextBox_CargoOversizedCertificateFee.ShortcutsEnabled = true; this.metroTextBox_CargoOversizedCertificateFee.Size = new System.Drawing.Size(100, 23); - this.metroTextBox_CargoOversizedCertificateFee.TabIndex = 15; + this.metroTextBox_CargoOversizedCertificateFee.TabIndex = 13; this.metroTextBox_CargoOversizedCertificateFee.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.metroTextBox_CargoOversizedCertificateFee.UseSelectable = true; this.metroTextBox_CargoOversizedCertificateFee.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -362,7 +423,7 @@ this.metroTextBox_CargoLargeCertificateFee.CustomButton.UseSelectable = true; this.metroTextBox_CargoLargeCertificateFee.CustomButton.Visible = false; this.metroTextBox_CargoLargeCertificateFee.Lines = new string[0]; - this.metroTextBox_CargoLargeCertificateFee.Location = new System.Drawing.Point(150, 188); + this.metroTextBox_CargoLargeCertificateFee.Location = new System.Drawing.Point(120, 30); this.metroTextBox_CargoLargeCertificateFee.MaxLength = 32767; this.metroTextBox_CargoLargeCertificateFee.Name = "metroTextBox_CargoLargeCertificateFee"; this.metroTextBox_CargoLargeCertificateFee.PasswordChar = '\0'; @@ -372,86 +433,94 @@ this.metroTextBox_CargoLargeCertificateFee.SelectionStart = 0; this.metroTextBox_CargoLargeCertificateFee.ShortcutsEnabled = true; this.metroTextBox_CargoLargeCertificateFee.Size = new System.Drawing.Size(100, 23); - this.metroTextBox_CargoLargeCertificateFee.TabIndex = 14; + this.metroTextBox_CargoLargeCertificateFee.TabIndex = 12; this.metroTextBox_CargoLargeCertificateFee.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.metroTextBox_CargoLargeCertificateFee.UseSelectable = true; this.metroTextBox_CargoLargeCertificateFee.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.metroTextBox_CargoLargeCertificateFee.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // - // metroLabel12 + // metroLabel20 // - this.metroLabel12.AutoSize = true; - this.metroLabel12.Location = new System.Drawing.Point(20, 222); - this.metroLabel12.Name = "metroLabel12"; - this.metroLabel12.Size = new System.Drawing.Size(129, 19); - this.metroLabel12.TabIndex = 13; - this.metroLabel12.Text = "증명서 재발급 금액"; + this.metroLabel20.AutoSize = true; + this.metroLabel20.Location = new System.Drawing.Point(30, 60); + this.metroLabel20.Name = "metroLabel20"; + this.metroLabel20.Size = new System.Drawing.Size(51, 19); + this.metroLabel20.TabIndex = 11; + this.metroLabel20.Text = "특대형"; // - // metroLabel13 + // metroLabel21 // - this.metroLabel13.AutoSize = true; - this.metroLabel13.Location = new System.Drawing.Point(20, 192); - this.metroLabel13.Name = "metroLabel13"; - this.metroLabel13.Size = new System.Drawing.Size(115, 19); - this.metroLabel13.TabIndex = 12; - this.metroLabel13.Text = "증명서 발급 금액"; + this.metroLabel21.AutoSize = true; + this.metroLabel21.Location = new System.Drawing.Point(30, 30); + this.metroLabel21.Name = "metroLabel21"; + this.metroLabel21.Size = new System.Drawing.Size(51, 19); + this.metroLabel21.TabIndex = 10; + this.metroLabel21.Text = "대　형"; + // + // metroButton_init + // + this.metroButton_init.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton_init.Location = new System.Drawing.Point(184, 420); + this.metroButton_init.Name = "metroButton_init"; + this.metroButton_init.Size = new System.Drawing.Size(140, 40); + this.metroButton_init.TabIndex = 22; + this.metroButton_init.Text = "초기화"; + this.metroButton_init.UseSelectable = true; + this.metroButton_init.Click += new System.EventHandler(this.metroButton_init_Click); // // SettingControl // 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.metroLabel10); - this.Controls.Add(this.metroLabel11); - this.Controls.Add(this.metroTextBox_CargoOversizedCertificateFee); - this.Controls.Add(this.metroTextBox_CargoLargeCertificateFee); - this.Controls.Add(this.metroLabel12); + this.Controls.Add(this.metroButton_init); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); this.Controls.Add(this.metroLabel13); this.Controls.Add(this.metroTextBox_GarageName); this.Controls.Add(this.metroLabel9); - this.Controls.Add(this.metroLabel8); - this.Controls.Add(this.metroLabel7); - this.Controls.Add(this.metroLabel6); - this.Controls.Add(this.metroLabel5); this.Controls.Add(this.metroButton_Save); - this.Controls.Add(this.metroTextBox_CargoOversizedFee); - this.Controls.Add(this.metroTextBox_CargoLargeFee); - this.Controls.Add(this.metroTextBox_CargoOversizedMaxCount); - this.Controls.Add(this.metroTextBox_CargoLargeMaxCount); - this.Controls.Add(this.metroLabel4); - this.Controls.Add(this.metroLabel3); - this.Controls.Add(this.metroLabel2); - this.Controls.Add(this.metroLabel1); this.Name = "SettingControl"; - this.Size = new System.Drawing.Size(346, 377); + this.Size = new System.Drawing.Size(346, 492); this.Paint += new System.Windows.Forms.PaintEventHandler(this.Settings_Paint); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); } #endregion - - private MetroFramework.Controls.MetroLabel metroLabel1; - private MetroFramework.Controls.MetroLabel metroLabel2; - private MetroFramework.Controls.MetroLabel metroLabel3; - private MetroFramework.Controls.MetroLabel metroLabel4; - private MetroFramework.Controls.MetroTextBox metroTextBox_CargoLargeMaxCount; - private MetroFramework.Controls.MetroTextBox metroTextBox_CargoOversizedMaxCount; - private MetroFramework.Controls.MetroTextBox metroTextBox_CargoLargeFee; - private MetroFramework.Controls.MetroTextBox metroTextBox_CargoOversizedFee; private MetroFramework.Controls.MetroButton metroButton_Save; - private MetroFramework.Controls.MetroLabel metroLabel5; - private MetroFramework.Controls.MetroLabel metroLabel6; - private MetroFramework.Controls.MetroLabel metroLabel7; - private MetroFramework.Controls.MetroLabel metroLabel8; private MetroFramework.Controls.MetroLabel metroLabel9; private MetroFramework.Controls.MetroTextBox metroTextBox_GarageName; - private MetroFramework.Controls.MetroLabel metroLabel10; - private MetroFramework.Controls.MetroLabel metroLabel11; + private MetroFramework.Controls.MetroLabel metroLabel13; + private System.Windows.Forms.GroupBox groupBox1; + private MetroFramework.Controls.MetroLabel metroLabel4; + private MetroFramework.Controls.MetroLabel metroLabel15; + private MetroFramework.Controls.MetroTextBox metroTextBox_CargoOversizedMaxCount; + private MetroFramework.Controls.MetroTextBox metroTextBox_CargoLargeMaxCount; + private MetroFramework.Controls.MetroLabel metroLabel16; + private MetroFramework.Controls.MetroLabel metroLabel17; + private System.Windows.Forms.GroupBox groupBox2; + private MetroFramework.Controls.MetroLabel metroLabel1; + private MetroFramework.Controls.MetroLabel metroLabel2; + private MetroFramework.Controls.MetroTextBox metroTextBox_CargoOversizedFee; + private MetroFramework.Controls.MetroTextBox metroTextBox_CargoLargeFee; + private MetroFramework.Controls.MetroLabel metroLabel5; + private MetroFramework.Controls.MetroLabel metroLabel6; + private System.Windows.Forms.GroupBox groupBox3; + private MetroFramework.Controls.MetroLabel metroLabel18; + private MetroFramework.Controls.MetroLabel metroLabel19; private MetroFramework.Controls.MetroTextBox metroTextBox_CargoOversizedCertificateFee; private MetroFramework.Controls.MetroTextBox metroTextBox_CargoLargeCertificateFee; - private MetroFramework.Controls.MetroLabel metroLabel12; - private MetroFramework.Controls.MetroLabel metroLabel13; + private MetroFramework.Controls.MetroLabel metroLabel20; + private MetroFramework.Controls.MetroLabel metroLabel21; + private MetroFramework.Controls.MetroButton metroButton_init; } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs index addbc0f..86379bc 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs @@ -55,5 +55,10 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl } + + private void metroButton_init_Click(object sender, EventArgs e) + { + SettingReset(); + } } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs index a26fb0c..e22e5c5 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; using System.Windows.Forms; namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl @@ -132,31 +133,27 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl void metroButton_UpdateUser_Click(object sender, EventArgs e) { - var allCount = dataGridView_List.Rows.Count - 1; - if (allCount == 0) return; + var count = dataGridView_List.Rows.Count - 1; + if (count == 0) return; - var CargoVehicleNumber = new List(); - - for (int i = 0; i < allCount; i++) + Promotion promotion = new Promotion("대기자 이용기간"); + DialogResult dialogResult = promotion.ShowDialog(); + if(dialogResult != DialogResult.OK) { - if (dataGridView_List.Rows[i].Cells[7].Value.ToString() == "Y") - { - CargoVehicleNumber.Add(dataGridView_List.Rows[i].Cells[1].Value.ToString()); - } - } - - if (CargoVehicleNumber.Count == 0) - { - MetroMessageBox.Show(this, "당첨 처리 할수 있는 건이 없습니다.", "당첨 처리", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - - var waitingCount = new WaitingCount(allCount, CargoVehicleNumber.Count); - - if (waitingCount.ShowDialog() != DialogResult.OK) return; - var list = CargoVehicleNumber.GetRange(0, waitingCount.ResultCount); + DateTime startDate = promotion.StartDate; + LeftAreaInformation leftAreaInformation = Database.GetLeftArea(startDate, Global.GlobalSettings.CargoLargeMaxCount, Global.GlobalSettings.CargoOversizedMaxCount); + if(leftAreaInformation.Large.Count + leftAreaInformation.OverSized.Count == 0) + { + // 자리 없음 + MetroMessageBox.Show(this, "남은 자리가 없습니다", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + // 순서를 어떻게 하지? + // 1. 추첨에서 떨어진 사람 들, //TODO: 업데이트 필요함 - Database.AddUserList(list, waitingCount.StartDate, waitingCount.EndDate, waitingCount.TotalCost); + DataChange(); } diff --git a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs index f017d63..edd884b 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs @@ -135,7 +135,13 @@ namespace HSUCO_Cargo_Garage_Operation_Program 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 Settings { public string GarageName { get; set; } @@ -180,4 +186,16 @@ namespace HSUCO_Cargo_Garage_Operation_Program UserList, } + public enum EApplicantType + { + Lots, + LotsOut, + Wait + } + public enum EStatus + { + StandBy, // 대기 + Use, // 사용중 + 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 7cde611..7227a05 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs @@ -3,9 +3,6 @@ using System.Collections.Generic; using System.Data.SQLite; using System.Globalization; using System.IO; -using System.Runtime.CompilerServices; -using System.Security.RightsManagement; -using static System.Net.Mime.MediaTypeNames; namespace HSUCO_Cargo_Garage_Operation_Program { @@ -33,18 +30,11 @@ namespace HSUCO_Cargo_Garage_Operation_Program CREATE TABLE ""ApplicantList"" ( ""No"" TEXT NOT NULL, ""ApplicantType"" INTEGER NOT NULL, - ""CargoVehicleNumber"" TEXT NOT NULL, - ""CargoVehicleName"" TEXT NOT NULL, - ""PassengerVehicleNumber"" TEXT NOT NULL, - ""PassengerVehicleName"" TEXT NOT NULL, - ""VehicleType"" INTEGER NOT NULL, - ""Name"" TEXT NOT NULL, - ""PersonalNumber"" TEXT NOT NULL, - ""Phone"" TEXT NOT NULL, - ""Address"" TEXT NOT NULL, + ""UID"" INTEGER NOT NULL, ""DateOfApplicant"" TEXT NOT NULL, ""Status"" INTEGER NOT NULL, - PRIMARY KEY(""No"") + PRIMARY KEY(""No""), + FOREIGN KEY(""UID"") REFERENCES ""UserInformation""(""UID"") ); CREATE TABLE ""LedgerCertificate"" ( @@ -72,11 +62,8 @@ namespace HSUCO_Cargo_Garage_Operation_Program ""SettingDate"" TEXT NOT NULL ); - CREATE TABLE ""UserList"" ( - ""No"" TEXT NOT NULL UNIQUE, - ""Area"" TEXT NOT NULL, - ""ApplicantNo"" TEXT NOT NULL, - ""ApplicantDate"" TEXT NOT NULL, + CREATE TABLE ""UserInformation"" ( + ""UID"" INTEGER NOT NULL, ""CargoVehicleNumber"" TEXT NOT NULL, ""CargoVehicleName"" TEXT NOT NULL, ""PassengerVehicleNumber"" TEXT NOT NULL, @@ -86,13 +73,23 @@ namespace HSUCO_Cargo_Garage_Operation_Program ""PersonalNumber"" TEXT NOT NULL, ""Phone"" TEXT NOT NULL, ""Address"" TEXT NOT NULL, + PRIMARY KEY(""UID"" AUTOINCREMENT) + ); + + CREATE TABLE ""UserList"" ( + ""No"" TEXT NOT NULL UNIQUE, + ""Area"" TEXT NOT NULL, + ""ApplicantNo"" TEXT NOT NULL, + ""ApplicantDate"" TEXT NOT NULL, + ""UID"" INTEGER NOT NULL, ""DateOfApplicant"" TEXT NOT NULL, ""DateStart"" TEXT NOT NULL, ""DateEnd"" TEXT NOT NULL, ""ExtensionStatus"" INTEGER NOT NULL, ""ExtensionStart"" TEXT, - ""RefundStatus"" INTEGER NOT NULL, - PRIMARY KEY(""No"") + ""PaymentStatus"" INTEGER NOT NULL, + PRIMARY KEY(""No""), + FOREIGN KEY(""UID"") REFERENCES ""UserInformation""(""UID"") ); CREATE TABLE ""UserListHistory"" ( @@ -101,7 +98,47 @@ namespace HSUCO_Cargo_Garage_Operation_Program ""HistoryDate"" TEXT NOT NULL, ""HistoryAmount"" INTEGER NOT NULL, FOREIGN KEY(""UserNo"") REFERENCES ""UserList""(""No"") - );"; + ); + + CREATE VIEW ViewApplicantList AS SELECT AL.No, + AL.ApplicantType, + AL.UID, + UI.CargoVehicleNumber, + UI.CargoVehicleName, + UI.PassengerVehicleNumber, + UI.PassengerVehicleName, + UI.VehicleType, + UI.Name, + UI.PersonalNumber, + UI.Phone, + UI.Address, + AL.DateOfApplicant, + AL.Status + FROM main.ApplicantList AL INNER JOIN main.UserInformation UI ON AL.UID = UI.UID; + + CREATE VIEW ViewUserList AS SELECT + UL.No, + UL.Area, + UL.ApplicantNo, + UL.ApplicantDate, + UL.UID, + UI.CargoVehicleNumber, + UI.CargoVehicleName, + UI.PassengerVehicleNumber, + UI.PassengerVehicleName, + UI.VehicleType, + UI.Name, + UI.PersonalNumber, + UI.Phone, + UI.Address, + UL.DateOfApplicant, + UL.DateStart, + UL.DateEnd, + UL.ExtensionStatus, + UL.ExtensionStart, + UL.PaymentStatus + FROM main.UserList UL INNER JOIN main.UserInformation UI ON UL.UID = UI.UID; +"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -131,7 +168,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program public static bool ApplicantCheckAlready(string CargoVehicleNumber) { var count = 0; - var query = string.Format("SELECT COUNT(*) From ApplicantList Where CargoVehicleNumber = '{0}' And Status=0;", + var query = string.Format("SELECT COUNT(*) From ViewApplicantList Where CargoVehicleNumber = '{0}' And Status=0;", CargoVehicleNumber.Trim()); using (var command = _sqLiteConnection.CreateCommand()) @@ -151,7 +188,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program public static bool UserListCheckAlready(string CargoVehicleNumber) { var count = 0; - var query = "SELECT COUNT(*) From UserList WHERE DateEnd >= \"" + DateTime.Now + + var query = "SELECT COUNT(*) From ViewUserList WHERE DateEnd >= \"" + DateTime.Now + "\" And CargoVehicleNumber = \"" + CargoVehicleNumber + "\""; using (var command = _sqLiteConnection.CreateCommand()) @@ -189,6 +226,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program string no = $"{year}-{suffix}{lastNo}"; var query = + //TODO : Insert 수정 해야됨 $"INSERT INTO ApplicantList VALUES('{no}', '{applicant.ApplicantType.BoolToInt()}','{applicant.CargoVehicleNumber}','{applicant.CargoVehicleName}','{applicant.PassengerVehicleNumber}','{applicant.PassengerVehicleName}','{(int)applicant.VehicleType}','{applicant.Name}','{applicant.PersonalNumber}','{applicant.Phone}','{applicant.Address}','{applicant.DateOfApplication.DateTimeDatabase()}', 0)"; int insertResult; @@ -210,7 +248,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program public static List GetApplicant() { var applicants = new List(); - var query = "SELECT * From ApplicantList Where ApplicantType=1 And Status=0"; + var query = "SELECT * From ViewApplicantList Where ApplicantType=1 And Status=0"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -244,7 +282,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program public static List GetApplicantWait() { var applicants = new List(); - var query = "SELECT * From ApplicantList Where ApplicantType=0 And Status=0 Order By DateOfApplicant ASC"; + var query = "SELECT * From ViewApplicantList Where ApplicantType=0 And Status=0 Order By DateOfApplicant ASC"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -275,8 +313,10 @@ namespace HSUCO_Cargo_Garage_Operation_Program return applicants; } + public static bool DeleteApplicantList(string no) { + //TODO: 수정사항 var query = $"UPDATE ApplicantList SET Status=2 Where No='{no}'"; using (var updateCommand = _sqLiteConnection.CreateCommand()) { @@ -284,13 +324,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program 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}'"; + var query = $"SELECT * From View{eUserInformationType.ToString()} Where No='{no}'"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -317,9 +356,10 @@ namespace HSUCO_Cargo_Garage_Operation_Program return updateUserInformation; } + public static bool UpdateUserData(UpdateUserInformation updateUserInformation) { - + //TODO: 업데이트 필요 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()) { @@ -327,13 +367,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program var updateResult = updateCommand.ExecuteNonQuery(); return (updateResult > 0); } - } public static List GetUserList() { var users = new List(); - string query = "SELECT * From UserList"; + string query = "SELECT * From ViewUserList"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -362,7 +401,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program user.DateEnd = DateTime.Parse(reader["DateEnd"].ToString(), new CultureInfo("ko-KR")); user.ExtensionStatus = reader["ExtensionStatus"].ToString() == "1"; user.ExtensionStart = reader["ExtensionStatus"].ToString() == "1" ? DateTime.Parse(reader["ExtensionStart"].ToString(), new CultureInfo("ko-KR")) : DateTime.MinValue; - user.RefundStatus = reader["RefundStatus"].ToString() == "1"; + user.HistoryInformations = new List(); users.Add(user); @@ -397,7 +436,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program { EVehicleType eVehicleType = new EVehicleType(); string query = $"SELECT VehicleType From UserList Where No='{no}'"; - + using (var command = _sqLiteConnection.CreateCommand()) { command.CommandText = query; @@ -409,27 +448,26 @@ namespace HSUCO_Cargo_Garage_Operation_Program eVehicleType = (EVehicleType)result; } } - } - return eVehicleType; } + /// - /// UserList 에서 연장을 했는지 여부 + /// UserList 에서 연장을 했는지 여부 /// /// /// Y=연장,N=연장안함 public static bool CheckExtensionStatus(string no) { bool result = false; - string query = $"SELECT ExtensionStatus From UserList Where No='{no}'"; + string query = $"SELECT ExtensionStatus From ViewUserList Where No='{no}'"; using (var command = _sqLiteConnection.CreateCommand()) { command.CommandText = query; using (var reader = command.ExecuteReader()) { - while(reader.Read()) + while (reader.Read()) { result = reader["ExtensionStatus"].ToString() == "1"; } @@ -437,10 +475,9 @@ namespace HSUCO_Cargo_Garage_Operation_Program } return result; } - + public static void UpdateExtended(string no, int amount) { - var query = $"SELECT DateEnd From UserList Where No='{no}'"; DateTime endDateTime = DateTime.Now; using (var command = _sqLiteConnection.CreateCommand()) @@ -457,14 +494,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program DateTime extensionStart = endDateTime.AddDays(1); endDateTime = endDateTime.AddYears(1); - - query = $"INSERT INTO UserListHistory(UserNo, HistoryCode, HistoryDate, HistoryAmount) VALUES('{no}',{(int)EHistoryCode.Extension},'{DateTime.Now.DateTimeDatabase()}',{amount})"; using (var command = _sqLiteConnection.CreateCommand()) { command.CommandText = query; int result = command.ExecuteNonQuery(); - if(result < 1) + if (result < 1) { return; } @@ -492,6 +527,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program } return; } + public static GetRefundInformation GetRefundData(string no) { GetRefundInformation getRefundInformation = new GetRefundInformation(); @@ -533,12 +569,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program { getRefundInformation.ExtensionFee = amount; } - } } } return getRefundInformation; } + public static bool SetRefund(string no, DateTime refundDate, int amount) { var query = $"UPDATE UserList Set DateEnd='{refundDate.AddDays(-1).EndDateTime()}', RefundStatus={true.BoolToInt()} Where No='{no}'"; @@ -575,13 +611,14 @@ namespace HSUCO_Cargo_Garage_Operation_Program return true; } + public static List GetApplicantList(List CargoVehicleNumber) { var applicants = new List(); for (var i = 0; i < CargoVehicleNumber.Count; i++) { - var query = $"SELECT * From ApplicantList Where CargoVehicleNumber='{CargoVehicleNumber[i]}' And Status=0"; + var query = $"SELECT * From ViewApplicantList Where CargoVehicleNumber='{CargoVehicleNumber[i]}' And Status=0"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -615,9 +652,9 @@ namespace HSUCO_Cargo_Garage_Operation_Program var applicants = GetApplicantList(CargoVehicleNumber); for (var i = 0; i < applicants.Count; i++) - { + {//TODO: 수정사ㅏㅎㅇ var query = - $"INSERT INTO UserList VALUES('{applicants[i].CargoVehicleNumber}','{applicants[i].PassengerVehicleNumber}','{applicants[i].Name}','{applicants[i].Phone}','{applicants[i].Address}','{applicants[i].DateOfApplication.DateTimeDatabase()}','{start.StartDateTime()}','{end.EndDateTime()}','0','0') "; + $"INSERT INTO UserList VALUES('{applicants[i].CargoVehicleNumber}','{applicants[i].PassengerVehicleNumber}','{applicants[i].Name}','{applicants[i].Phone}','{applicants[i].Address}','{applicants[i].DateOfApplication.DateTimeDatabase()}','{start.StartDateTime()}','{end.EndDateTime()}','0','0') "; using (var insertCommand = _sqLiteConnection.CreateCommand()) { insertCommand.CommandText = query; @@ -644,13 +681,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program } } - public static List GetLedgerProceeds(DateTime startDateTime, DateTime endDateTime) { var proceedsDatas = new List(); var query = - $"SELECT U.CargoVehicleNumber, U.PassengerVehicleNumber, U.Name, P.Type, P.Amount, P.Date From LedgerProceeds P INNER JOIN UserList U ON P.UserNo = U.No Where P.Date >='{startDateTime.StartDateTime()}' And P.Date <='{endDateTime.EndDateTime()}'"; + $"SELECT U.CargoVehicleNumber, U.PassengerVehicleNumber, U.Name, P.Type, P.Amount, P.Date From LedgerProceeds P INNER JOIN ViewUserList U ON P.UserNo = U.No Where P.Date >='{startDateTime.StartDateTime()}' And P.Date <='{endDateTime.EndDateTime()}'"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -703,7 +739,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program { List certificateInformations = new List(); var query = - $"SELECT U.Name, U.PersonalNumber, U.Address, U.CargoVehicleNumber, C.No, C.IssueDate, C.StartDate, C.EndDate, C.Amount From LedgerCertificate C INNER JOIN UserList U ON C.UserNo = U.No Where C.IssueDate >='{startDateTime.StartDateTime()}' And C.IssueDate <='{endDateTime.EndDateTime()}'"; + $"SELECT U.Name, U.PersonalNumber, U.Address, U.CargoVehicleNumber, C.No, C.IssueDate, C.StartDate, C.EndDate, C.Amount From LedgerCertificate C INNER JOIN ViewUserList U ON C.UserNo = U.No Where C.IssueDate >='{startDateTime.StartDateTime()}' And C.IssueDate <='{endDateTime.EndDateTime()}'"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -740,7 +776,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program public static CertificateInformation GetCertificate(string issueNumber) { CertificateInformation certificateInformation = new CertificateInformation(); - var query = $"SELECT U.Name, U.PersonalNumber, U.Address, U.CargoVehicleNumber, C.Amount, U.Area, C.IssueDate, C.StartDate, C.EndDate From LedgerCertificate C INNER JOIN UserList U ON (C.UserNo = U.No) Where C.No='{issueNumber}'"; + var query = $"SELECT U.Name, U.PersonalNumber, U.Address, U.CargoVehicleNumber, C.Amount, U.Area, C.IssueDate, C.StartDate, C.EndDate From LedgerCertificate C INNER JOIN ViewUserList U ON (C.UserNo = U.No) Where C.No='{issueNumber}'"; using (var command = _sqLiteConnection.CreateCommand()) { command.CommandText = query; @@ -874,6 +910,51 @@ namespace HSUCO_Cargo_Garage_Operation_Program return (EVehicleType)type; } + public static LeftAreaInformation GetLeftArea(DateTime startDateTime, int large, int overSized) + { + LeftAreaInformation leftAreaInformation = new LeftAreaInformation(); + leftAreaInformation.Large = new List(); + leftAreaInformation.OverSized = new List(); + for (int i = 1; i < large + 1; i++) + { + leftAreaInformation.Large.Add(i); + } + for (int i = 1; i < overSized + 1; i++) + { + leftAreaInformation.OverSized.Add(i); + } + var query = $"SELECT Area FROM UserList Where DateEnd > '{startDateTime.Date.DateTimeDatabase()}'"; + + using (var command = _sqLiteConnection.CreateCommand()) + { + command.CommandText = query; + + using (var reader = command.ExecuteReader()) + { + while (reader.Read()) + { + string tempString = reader["Area"].ToString(); + // 대형, 특대형 - 를 기준으로 자름 + int index = tempString.IndexOf('-'); + string tempType = tempString.Substring(0, index); + string tempArea = tempString.Substring(index + 1, tempString.Length - index - 1); + switch (tempType) + { + case "대형": + leftAreaInformation.Large.Remove(int.Parse(tempArea)); + + break; + + case "특대형": + leftAreaInformation.OverSized.Remove(int.Parse(tempArea)); + break; + } + } + } + } + return leftAreaInformation; + } + public static Settings LoadSettings() { var settings = new Settings(); @@ -1016,7 +1097,5 @@ namespace HSUCO_Cargo_Garage_Operation_Program } } } - - } } \ No newline at end of file diff --git a/HSUCO_Cargo_Garage_Operation_Program/DevelopReadMe.txt b/HSUCO_Cargo_Garage_Operation_Program/DevelopReadMe.txt index d0ffc19..6423290 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DevelopReadMe.txt +++ b/HSUCO_Cargo_Garage_Operation_Program/DevelopReadMe.txt @@ -4,7 +4,20 @@ ApplicantType 1 Ture = 추첨 0 False = 대기 -ApplicantType +Status 0 = 대기 1 = 등록 -2 = 삭제됨 \ No newline at end of file +2 = 삭제됨 + +UserInfo가 필요한가? +PersonalData + +결재 대기 ? +결재 전환 +이걸 UserList에서 ? +userList Status 가 필요함 + +UserList Status = +0 결재 대기 +1 결재 완료 +2 환불 diff --git a/HSUCO_Cargo_Garage_Operation_Program/Extends.cs b/HSUCO_Cargo_Garage_Operation_Program/Extends.cs index 6b2e2d4..96cc7cd 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Extends.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Extends.cs @@ -49,10 +49,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program return value ? 1 : 0; } - public static int LeftArea(int count, DateTime dateTime) - { - } - + } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/Master.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/Master.Designer.cs index dc75db9..3e98018 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Master.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Master.Designer.cs @@ -74,7 +74,7 @@ this.metroTabControl_Main.Size = new System.Drawing.Size(984, 688); this.metroTabControl_Main.TabIndex = 0; this.metroTabControl_Main.UseSelectable = true; - this.metroTabControl_Main.SelectedIndexChanged += new System.EventHandler(this.metroTabControl_Main_SelectedIndexChanged); + // // tabPage1 // diff --git a/HSUCO_Cargo_Garage_Operation_Program/Master.cs b/HSUCO_Cargo_Garage_Operation_Program/Master.cs index 127b855..a07ccea 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Master.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Master.cs @@ -9,16 +9,13 @@ namespace HSUCO_Cargo_Garage_Operation_Program public Master() => InitializeComponent(); - private void metroTabControl_Main_SelectedIndexChanged(object sender, EventArgs e) - { - } private void Master_Load(object sender, EventArgs e) { Global.GlobalSettings = Database.LoadSettings(); settings1.SettingReset(); - + }