diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs index 182016f..b2166b4 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantControl.cs @@ -18,49 +18,49 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl { if (metroTextBox_CargoVehicleNumber.Text.Trim() == string.Empty) { - MessageBox.Show(this, "차량번호(화물)가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "차량번호(화물)가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); metroTextBox_CargoVehicleNumber.Text = string.Empty; metroTextBox_CargoVehicleNumber.Focus(); return; } if (metroTextBox_CargoVehicleName.Text.Trim() == string.Empty) { - MessageBox.Show(this, "차  종(화물)이 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "차  종(화물)이 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); metroTextBox_CargoVehicleName.Text = string.Empty; metroTextBox_CargoVehicleName.Focus(); return; } if (metroTextBox_PassengerVehicleNumber.Text.Trim() == string.Empty) { - MessageBox.Show(this, "차량번호(승용)가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "차량번호(승용)가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); metroTextBox_PassengerVehicleNumber.Text = string.Empty; metroTextBox_PassengerVehicleNumber.Focus(); return; } if (metroTextBox_PassengerVehicleName.Text.Trim() == string.Empty) { - MessageBox.Show(this, "차  종(승용)이 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "차  종(승용)이 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); metroTextBox_PassengerVehicleName.Text = string.Empty; metroTextBox_PassengerVehicleName.Focus(); return; } if (metroTextBox_Name.Text.Trim() == string.Empty) { - MessageBox.Show(this, "이름이 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "이름이 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); metroTextBox_Name.Text = string.Empty; metroTextBox_Name.Focus(); return; } if (metroTextBox_PersonalNumber.Text.Trim() == string.Empty) { - MessageBox.Show(this, "생년월일(법인등록번호)이 입력되지 않았습니다..", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "생년월일(법인등록번호)이 입력되지 않았습니다..", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); metroTextBox_PersonalNumber.Text = string.Empty; metroTextBox_PersonalNumber.Focus(); return; } if (maskedTextBox_Phone.Text.Trim() == string.Empty) { - MessageBox.Show(this, "연락처가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "연락처가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); maskedTextBox_Phone.Text = string.Empty; maskedTextBox_Phone.Focus(); return; @@ -68,7 +68,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl if (metroTextBox_Address.Text.Trim() == string.Empty) { - MessageBox.Show(this, "주소가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, "주소가 입력되지 않았습니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); metroTextBox_Address.Text = string.Empty; metroTextBox_Address.Focus(); return; @@ -78,7 +78,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl if (already) { - MessageBox.Show(this, metroTextBox_CargoVehicleNumber.Text.Trim() + "차량은 이미 신청된 차량입니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, metroTextBox_CargoVehicleNumber.Text.Trim() + "차량은 이미 신청된 차량입니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); ResetInput(); metroTextBox_CargoVehicleNumber.Focus(); return; @@ -87,7 +87,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl already = Database.UserListCheckAlready(metroTextBox_CargoVehicleNumber.Text.Trim()); if (already) { - MessageBox.Show(this, metroTextBox_CargoVehicleNumber.Text.Trim() + "현재 사용중인 차량입니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MetroMessageBox.Show(this, metroTextBox_CargoVehicleNumber.Text.Trim() + "현재 사용중인 차량입니다.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); ResetInput(); metroTextBox_CargoVehicleNumber.Focus(); return; diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs index 39a31ca..0492680 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.Designer.cs @@ -28,11 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.metroRadioButton_InspectionFalse = new MetroFramework.Controls.MetroRadioButton(); - this.metroRadioButton_InspectionTrue = new MetroFramework.Controls.MetroRadioButton(); - this.metroRadioButton_InspectionAll = new MetroFramework.Controls.MetroRadioButton(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.metroPanel1 = new MetroFramework.Controls.MetroPanel(); this.metroButton_ExportExcel = new MetroFramework.Controls.MetroButton(); this.metroButton_Delete = new MetroFramework.Controls.MetroButton(); @@ -45,65 +41,20 @@ this.metroButton_UpdateUser = new MetroFramework.Controls.MetroButton(); this.dataGridView_List = new System.Windows.Forms.DataGridView(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.groupBox1.SuspendLayout(); + this.metroButton1 = new MetroFramework.Controls.MetroButton(); this.metroPanel1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView_List)).BeginInit(); this.SuspendLayout(); // - // groupBox1 - // - this.groupBox1.BackColor = System.Drawing.Color.Transparent; - this.groupBox1.Controls.Add(this.metroRadioButton_InspectionFalse); - this.groupBox1.Controls.Add(this.metroRadioButton_InspectionTrue); - this.groupBox1.Controls.Add(this.metroRadioButton_InspectionAll); - this.groupBox1.Location = new System.Drawing.Point(20, 20); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(150, 90); - this.groupBox1.TabIndex = 4; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "그룹 필터"; - // - // metroRadioButton_InspectionFalse - // - this.metroRadioButton_InspectionFalse.AutoSize = true; - this.metroRadioButton_InspectionFalse.Location = new System.Drawing.Point(30, 60); - this.metroRadioButton_InspectionFalse.Name = "metroRadioButton_InspectionFalse"; - this.metroRadioButton_InspectionFalse.Size = new System.Drawing.Size(74, 15); - this.metroRadioButton_InspectionFalse.TabIndex = 2; - this.metroRadioButton_InspectionFalse.Text = "서류 미비"; - this.metroRadioButton_InspectionFalse.UseSelectable = true; - // - // metroRadioButton_InspectionTrue - // - this.metroRadioButton_InspectionTrue.AutoSize = true; - this.metroRadioButton_InspectionTrue.Location = new System.Drawing.Point(30, 40); - this.metroRadioButton_InspectionTrue.Name = "metroRadioButton_InspectionTrue"; - this.metroRadioButton_InspectionTrue.Size = new System.Drawing.Size(74, 15); - this.metroRadioButton_InspectionTrue.TabIndex = 1; - this.metroRadioButton_InspectionTrue.Text = "서류 완료"; - this.metroRadioButton_InspectionTrue.UseSelectable = true; - // - // metroRadioButton_InspectionAll - // - this.metroRadioButton_InspectionAll.AutoSize = true; - this.metroRadioButton_InspectionAll.Checked = true; - this.metroRadioButton_InspectionAll.Location = new System.Drawing.Point(30, 20); - this.metroRadioButton_InspectionAll.Name = "metroRadioButton_InspectionAll"; - this.metroRadioButton_InspectionAll.Size = new System.Drawing.Size(47, 15); - this.metroRadioButton_InspectionAll.TabIndex = 0; - this.metroRadioButton_InspectionAll.TabStop = true; - this.metroRadioButton_InspectionAll.Text = "전체"; - this.metroRadioButton_InspectionAll.UseSelectable = true; - // // metroPanel1 // + this.metroPanel1.Controls.Add(this.metroButton1); this.metroPanel1.Controls.Add(this.metroButton_ExportExcel); this.metroPanel1.Controls.Add(this.metroButton_Delete); this.metroPanel1.Controls.Add(this.groupBox2); this.metroPanel1.Controls.Add(this.metroButton_UpdateUser); this.metroPanel1.Controls.Add(this.dataGridView_List); - this.metroPanel1.Controls.Add(this.groupBox1); this.metroPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.metroPanel1.HorizontalScrollbarBarColor = true; this.metroPanel1.HorizontalScrollbarHighlightOnWheel = false; @@ -150,9 +101,9 @@ this.groupBox2.Controls.Add(this.metroButton_Search); this.groupBox2.Controls.Add(this.metroTextBox_Search); this.groupBox2.Controls.Add(this.metroComboBox_SearchType); - this.groupBox2.Location = new System.Drawing.Point(200, 20); + this.groupBox2.Location = new System.Drawing.Point(20, 20); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(530, 90); + this.groupBox2.Size = new System.Drawing.Size(710, 90); this.groupBox2.TabIndex = 8; this.groupBox2.TabStop = false; this.groupBox2.Text = "검색"; @@ -251,14 +202,14 @@ | System.Windows.Forms.AnchorStyles.Right))); this.dataGridView_List.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dataGridView_List.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_List.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_List.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView_List.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView_List.Location = new System.Drawing.Point(20, 120); this.dataGridView_List.Name = "dataGridView_List"; @@ -268,6 +219,17 @@ this.dataGridView_List.Size = new System.Drawing.Size(600, 330); this.dataGridView_List.TabIndex = 6; // + // metroButton1 + // + this.metroButton1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.metroButton1.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton1.Location = new System.Drawing.Point(626, 184); + this.metroButton1.Name = "metroButton1"; + this.metroButton1.Size = new System.Drawing.Size(121, 40); + this.metroButton1.TabIndex = 11; + this.metroButton1.Text = "수정"; + this.metroButton1.UseSelectable = true; + // // ApplicantList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -276,8 +238,6 @@ this.Name = "ApplicantList"; this.Size = new System.Drawing.Size(750, 470); this.Load += new System.EventHandler(this.ApplicantList_Load); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); this.metroPanel1.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); @@ -287,11 +247,6 @@ } #endregion - - private System.Windows.Forms.GroupBox groupBox1; - private MetroFramework.Controls.MetroRadioButton metroRadioButton_InspectionFalse; - private MetroFramework.Controls.MetroRadioButton metroRadioButton_InspectionTrue; - private MetroFramework.Controls.MetroRadioButton metroRadioButton_InspectionAll; private MetroFramework.Controls.MetroPanel metroPanel1; private System.Windows.Forms.GroupBox groupBox2; private MetroFramework.Controls.MetroButton metroButton_Search; @@ -304,5 +259,6 @@ private MetroFramework.Controls.MetroLabel metroLabel1; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; private MetroFramework.Controls.MetroButton metroButton_ExportExcel; + private MetroFramework.Controls.MetroButton metroButton1; } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs index fdc7003..5d73afa 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ApplicantList.cs @@ -45,25 +45,35 @@ 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("생년월일(법인등록번호)"); dataTable.Columns.Add("연락처"); dataTable.Columns.Add("주소"); + dataTable.Columns.Add("차량번호(화물)"); + dataTable.Columns.Add("차종(화물)"); + dataTable.Columns.Add("차량번호(승용)"); + dataTable.Columns.Add("차종(승용)"); + dataTable.Columns.Add("차량 타입"); dataTable.Columns.Add("신청일"); for (int i = 0; i < applicants.Count; i++) { dataTable.Rows .Add( - applicants[i].CargoVehicleNumber, - applicants[i].PassengerVehicleNumber, + applicants[i].No, applicants[i].Name, + applicants[i].PersonalNumber, applicants[i].Phone, applicants[i].Address, + applicants[i].CargoVehicleNumber, + applicants[i].CargoVehicleName, + applicants[i].PassengerVehicleNumber, + applicants[i].PassengerVehicleName, + applicants[i].VehicleType == 0 ? "대형(4.5톤 미만)" : "특대형(4.5톤 이상)", applicants[i].DateOfApplication - ); + ); } dataGridView_List.DataSource = dataTable; diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs index 51c28e0..db63ad2 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.metroRadioButton_EndUser = new MetroFramework.Controls.MetroRadioButton(); this.metroRadioButton_UseUser = new MetroFramework.Controls.MetroRadioButton(); @@ -46,6 +46,7 @@ this.metroComboBox_SearchType = new MetroFramework.Controls.MetroComboBox(); this.dataGridView_List = new System.Windows.Forms.DataGridView(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); + this.metroButton1 = new MetroFramework.Controls.MetroButton(); this.groupBox1.SuspendLayout(); this.metroPanel1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -99,6 +100,7 @@ // // metroPanel1 // + this.metroPanel1.Controls.Add(this.metroButton1); this.metroPanel1.Controls.Add(this.metroButton_Certificate); this.metroPanel1.Controls.Add(this.metroButton_ExportExcel); this.metroPanel1.Controls.Add(this.metroButton_Refund); @@ -137,7 +139,7 @@ this.metroButton_ExportExcel.BackgroundImage = global::HSUCO_Cargo_Garage_Operation_Program.Properties.Resources.file_type_excel_icon_130611; this.metroButton_ExportExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.metroButton_ExportExcel.FontSize = MetroFramework.MetroButtonSize.Tall; - this.metroButton_ExportExcel.Location = new System.Drawing.Point(626, 256); + this.metroButton_ExportExcel.Location = new System.Drawing.Point(626, 335); this.metroButton_ExportExcel.Name = "metroButton_ExportExcel"; this.metroButton_ExportExcel.Size = new System.Drawing.Size(121, 115); this.metroButton_ExportExcel.TabIndex = 9; @@ -265,14 +267,14 @@ | System.Windows.Forms.AnchorStyles.Right))); this.dataGridView_List.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dataGridView_List.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_List.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_List.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dataGridView_List.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView_List.Location = new System.Drawing.Point(20, 120); this.dataGridView_List.MultiSelect = false; @@ -283,6 +285,17 @@ this.dataGridView_List.Size = new System.Drawing.Size(600, 330); this.dataGridView_List.TabIndex = 6; // + // metroButton1 + // + this.metroButton1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.metroButton1.FontSize = MetroFramework.MetroButtonSize.Tall; + this.metroButton1.Location = new System.Drawing.Point(626, 256); + this.metroButton1.Name = "metroButton1"; + this.metroButton1.Size = new System.Drawing.Size(121, 40); + this.metroButton1.TabIndex = 11; + this.metroButton1.Text = "수정"; + this.metroButton1.UseSelectable = true; + // // UserList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -320,5 +333,6 @@ private MetroFramework.Controls.MetroButton metroButton_Extended; private MetroFramework.Controls.MetroButton metroButton_ExportExcel; private MetroFramework.Controls.MetroButton metroButton_Certificate; + private MetroFramework.Controls.MetroButton metroButton1; } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs index cd99e2a..eee6778 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs @@ -164,7 +164,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl private void metroButton_Certificate_Click(object sender, EventArgs e) { - // TODO: 증명서 인쇄 + // TODO: 증명서 인쇄 데이터 DateTime nowDateTime = DateTime.Now; var count = dataGridView_List.SelectedRows.Count; if (count == 0) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs index b909009..f2f83ab 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/WaitingList.cs @@ -21,8 +21,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl void DataChange() { - var applicants = Database.GetApplicantWiat(); - //TODO: 정렬 하여 순위 결정 + var applicants = Database.GetApplicantWait(); switch (metroComboBox_SearchType.SelectedIndex) { case 0: @@ -45,26 +44,50 @@ 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("접수번호"); + dataTable.Columns.Add("성명(법인명)"); + dataTable.Columns.Add("생년월일(법인등록번호)"); dataTable.Columns.Add("연락처"); dataTable.Columns.Add("주소"); + dataTable.Columns.Add("차량번호(화물)"); + dataTable.Columns.Add("차종(화물)"); + dataTable.Columns.Add("차량번호(승용)"); + dataTable.Columns.Add("차종(승용)"); + dataTable.Columns.Add("차량 타입"); dataTable.Columns.Add("신청일"); + string order; + int countLarge = 1; + int countOversize = 1; for (int i = 0; i < applicants.Count; i++) { + + if (applicants[i].VehicleType == 0) + { + order = $"대형-{countLarge}"; + countLarge++; + } + else + { + order = $"특대형-{countOversize}"; + countOversize++; + } dataTable.Rows .Add( - - applicants[i].CargoVehicleNumber, - applicants[i].PassengerVehicleNumber, + order, + applicants[i].No, applicants[i].Name, + applicants[i].PersonalNumber, applicants[i].Phone, applicants[i].Address, + applicants[i].CargoVehicleNumber, + applicants[i].CargoVehicleName, + applicants[i].PassengerVehicleNumber, + applicants[i].PassengerVehicleName, + applicants[i].VehicleType == 0 ? "대형(4.5톤 미만)" : "특대형(4.5톤 이상)", applicants[i].DateOfApplication - + ); } diff --git a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs index 249f207..76819b7 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs @@ -4,6 +4,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program { public struct ApplicantInformation { + public string No { get; set; } public bool ApplicantType { get; set; } public string CargoVehicleNumber { get; set; } public string CargoVehicleName { get; set; } diff --git a/HSUCO_Cargo_Garage_Operation_Program/Database.cs b/HSUCO_Cargo_Garage_Operation_Program/Database.cs index 201ba1d..e661f09 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs @@ -239,6 +239,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program while (reader.Read()) { var applicant = new ApplicantInformation(); + applicant.No = reader["No"].ToString(); applicant.ApplicantType = reader["ApplicantType"].ToString() == "1"; applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); @@ -259,10 +260,10 @@ namespace HSUCO_Cargo_Garage_Operation_Program return applicants; } - public static List GetApplicantWiat() + public static List GetApplicantWait() { var applicants = new List(); - var query = "SELECT * From ApplicantList Where ApplicantType=0 Order By Inspection DESC, DateOfApplicant"; + var query = "SELECT * From ApplicantList Where ApplicantType=0 Order By DateOfApplicant ASC"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -273,6 +274,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program while (reader.Read()) { var applicant = new ApplicantInformation(); + applicant.No = reader["No"].ToString(); applicant.ApplicantType = reader["ApplicantType"].ToString() == "1"; applicant.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); applicant.CargoVehicleName = reader["CargoVehicleName"].ToString(); diff --git a/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs b/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs index cdee087..3056735 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/PrintCertificate.cs @@ -8,7 +8,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program { internal class PrintCertificate { - private List _certificateDatas; + private readonly List _certificateDatas; private int _count; public PrintDocument printDocument; public PrintCertificate(List certificateDatas)