From e5a4d5ea3c389a3b1b18ee4c986e33fe3b6bbe48 Mon Sep 17 00:00:00 2001 From: chi Date: Fri, 12 Mar 2021 15:07:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=9E=90=EC=8B=A4=20=EC=97=85?= =?UTF-8?q?=EB=AC=B4=ED=98=84=ED=99=A9=20=EC=9E=85=EB=A0=A5=20=EC=B0=BD?= =?UTF-8?q?=EC=97=90=20=EB=8B=AC=EB=A0=A5=20=EC=84=A0=ED=83=9D=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FPJ0000/EBoard/fEboardList.Designer.cs | 166 ++++++++++-------- SubProject/FPJ0000/EBoard/fEboardList.cs | 20 +++ SubProject/FPJ0000/EBoard/fEboardList.resx | 52 ++++-- 3 files changed, 154 insertions(+), 84 deletions(-) diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs index 7b42317..0593874 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs @@ -30,27 +30,27 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEboardList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType66 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType67 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType68 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType69 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType70 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -93,7 +93,9 @@ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); + this.cmbYearE = new System.Windows.Forms.ToolStripComboBox(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); @@ -126,8 +128,8 @@ this.btSearch = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter(); - this.cmbYearE = new System.Windows.Forms.ToolStripComboBox(); - this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -522,11 +524,11 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType29.DecimalPlaces = 0; - numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType29.MaximumValue = 2147483647D; - numberCellType29.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType29; + numberCellType15.DecimalPlaces = 0; + numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType15.MaximumValue = 2147483647D; + numberCellType15.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType15; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -534,97 +536,97 @@ this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType57; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer"; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType58; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE"; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType59; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType60; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType32; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType61; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료일"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType62; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType34; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType63; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType35; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line"; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType64; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType36; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType65; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType37; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType66; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType38; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model"; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType67; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType39; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName"; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType68; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType40; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격"; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType69; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType41; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F; - numberCellType30.DecimalPlaces = 0; - numberCellType30.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType30.MaximumValue = 2147483647D; - numberCellType30.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType30; + numberCellType16.DecimalPlaces = 0; + numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType16.MaximumValue = 2147483647D; + numberCellType16.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType16; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F; - numberCellType31.MaximumValue = 999999999999999D; - numberCellType31.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType31; + numberCellType17.MaximumValue = 999999999999999D; + numberCellType17.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType17; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType32.MaximumValue = 999999999999999D; - numberCellType32.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType32; + numberCellType18.MaximumValue = 999999999999999D; + numberCellType18.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType18; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F; - numberCellType33.MaximumValue = 999999999999999D; - numberCellType33.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType33; + numberCellType19.MaximumValue = 999999999999999D; + numberCellType19.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType19; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType34.MaximumValue = 999999999999999D; - numberCellType34.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType34; + numberCellType20.MaximumValue = 999999999999999D; + numberCellType20.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType20; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction"; this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]"; @@ -634,11 +636,11 @@ this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType70; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType42; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체"; - numberCellType35.MaximumValue = 999999999999999D; - numberCellType35.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType35; + numberCellType21.MaximumValue = 999999999999999D; + numberCellType21.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType21; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)"; @@ -655,8 +657,10 @@ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel2, this.cmbYearS, + this.toolStripButton4, this.toolStripLabel4, this.cmbYearE, + this.toolStripButton5, this.toolStripSeparator4, this.toolStripLabel3, this.tbRequest, @@ -680,12 +684,24 @@ this.toolStripLabel2.Size = new System.Drawing.Size(43, 24); this.toolStripLabel2.Text = "입고일"; // + // cmbYearS + // + this.cmbYearS.DropDownWidth = 70; + this.cmbYearS.Name = "cmbYearS"; + this.cmbYearS.Size = new System.Drawing.Size(100, 27); + // // toolStripLabel4 // this.toolStripLabel4.Name = "toolStripLabel4"; this.toolStripLabel4.Size = new System.Drawing.Size(15, 24); this.toolStripLabel4.Text = "~"; // + // cmbYearE + // + this.cmbYearE.DropDownWidth = 70; + this.cmbYearE.Name = "cmbYearE"; + this.cmbYearE.Size = new System.Drawing.Size(100, 27); + // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; @@ -1021,17 +1037,25 @@ // this.ta.ClearBeforeFill = true; // - // cmbYearE + // toolStripButton4 // - this.cmbYearE.DropDownWidth = 70; - this.cmbYearE.Name = "cmbYearE"; - this.cmbYearE.Size = new System.Drawing.Size(100, 27); + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(24, 24); + this.toolStripButton4.Text = "toolStripButton4"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click_1); // - // cmbYearS + // toolStripButton5 // - this.cmbYearS.DropDownWidth = 70; - this.cmbYearS.Name = "cmbYearS"; - this.cmbYearS.Size = new System.Drawing.Size(100, 27); + this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(24, 24); + this.toolStripButton5.Text = "toolStripButton4"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); // // fEboardList // @@ -1145,5 +1169,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripComboBox cmbYearS; private System.Windows.Forms.ToolStripComboBox cmbYearE; + private System.Windows.Forms.ToolStripButton toolStripButton4; + private System.Windows.Forms.ToolStripButton toolStripButton5; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs index 564ad61..0931328 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.cs @@ -598,5 +598,25 @@ namespace FPJ0000 this.chkDelay.BackColor = chkDelay.Checked ? Color.Lime : SystemColors.Control; this.refreshData(); } + + private void toolStripButton4_Click_1(object sender, EventArgs e) + { + var dt = DateTime.Parse(this.cmbYearS.Text); + var f = new FCOMMON.fSelectDay(dt); + if(f.ShowDialog() == DialogResult.OK) + { + this.cmbYearS.Text = f.dtPick.SelectionStart.ToShortDateString(); + } + } + + private void toolStripButton5_Click(object sender, EventArgs e) + { + var dt = DateTime.Parse(this.cmbYearE.Text); + var f = new FCOMMON.fSelectDay(dt); + if (f.ShowDialog() == DialogResult.OK) + { + this.cmbYearE.Text = f.dtPick.SelectionStart.ToShortDateString(); + } + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.resx b/SubProject/FPJ0000/EBoard/fEboardList.resx index 8a93571..1e3f3ba 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.resx +++ b/SubProject/FPJ0000/EBoard/fEboardList.resx @@ -223,20 +223,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVDhPhZLZTxNRFIf7JH+CQR98JDEKAdyiDwoCFjDB - DYEgspVCQECWGkxEtGBEFgMSIFFDIBof1LAoFLSAlFJoQzEii4CsZYkUytJlBjpTft6ZNhQTEk/y5Tzc - e77c85sRcOX/QBFzuVgtDylRrwVI1RTpNE8p1zV0SHEfHfRMNXxOoiw/Gvr+AD+0twKf9Cj1Rnp1Qb/G - GsxbMJicrBo5aPxaMiL3kw6RJWMWYarMxTFqr+BClf7P6gbbN2uFZo6BRsdAPctANbMNxe8ttI2ascUA - zWMUchvnEP9imPpHEpDXTm1atjEwz+L7PEM6g35eso3uyS18HbUQgQ0DSyw0i1YUyHTwvd/5jh8OL/WZ - vikN3RFXXUd85Q1UfqlDfn0pfPPc4UMQFpyFv/QUyprL+FVMNIPldQv8s7sZXhBW7Puxc6gFLROvUanO - 5iXRFUHIfhuFtLoIiKqvIK46Ds2Dy2gZNuHzz01skJwCpD00LxCWC10CH6ez6vEuvBmSokiRyktiqoLJ - 8FUkvUyEctLMr9IxQUFOclg3WxGQ32sXcBVY2E1n1MRCO6lCteYenrZnIbz0ImIqQqGdtUBLguUCVk7Z - MzEQgb90j+D8wzzr6ZwjiCoXYmCqDwVdyZDKMhDx3A91iib8WGCgJcH2zVjRS9AbrfB95BB4SVzF3pLD - SKuNxK2qQESWXeIlGbIoSOoTyUv8wJ0P6Fj0c5+YYCRBnsxU2QXekoML3pJD5JIrvLNdca3IDymvYqEc - laNAnoPkD7EQVYVBSwQa8m+oiYC22uCZrnCucCGzh17aoDG4wPJ0jy/ibk0SEsiguDoCWbV3ds84LNss - PNJbnAIvYps3OAX/w0xW8EhscgrOZHyzjMyt7Ox3eT/WNk2249HNJsc4eUFS+/TcpsU4ojPYplcoTOsp - TDpYMVl5uORNNAv9mtFGUdSG2+3WEce4QHAi6UuKh6it3VMsN3iIG+ldEuy4JzTYETXQbqLW9WNxrR3u - sbJ4gUAg+AsGD6FJM3GofAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZLdS1NhHMd3lX9CWBddClFaKRV1US61WYG9 + WVmZTucUTW3owiBTp5FphiYqVIhSdFFRVnNqU2vO5UYzelmm5st8jU2Xez1Hd8769pyz1QyEfvDhuXjO + 98P5fc8RcBN7VZN6pFqvTril/xlXpqfISfPUcKeBTqgeoA/d1Jn2yrV1mxMfr+NDqyf+er/W6qQXZyw2 + 1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ + QDlMobhtCul3TNQ/krgSNeXwrGBwhsWHGYacDN7zkhX0jS3j9ZCHCHwYnGdhmPOiQjUN4ZXeR3z4TE30 + xKmyxF/SxhNIbziJhq5WlD+rgbAkHNEEUcUexCp2olZZy6/iohlYljyILehjeMHpauHT3i/taB+9jwZ9 + IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T + 8DFk3c2EdszNr9IzSkFNelhyexFX/s4v4Ca+so+WNYthHNOhyXAZN7oLcKbmAFLrE2E0e2AkxXIFa8f9 + ndiIIFaxSrDvWol3V9EmJNeJMDg+gIq32VCoZEi6HYNWzQt8nGVgJMUOTHrxjmB1eiEsDQh2yEOlkfKN + yGs5h/ON8ThXe5CXyFTJkD/LJG8SA+5+cJrFe+4TE5ykyCiZzi+IlK+fjZRvIA+FIrIwFMerYpBzTwzt + kBoV6iJkPxFD0ngaRiIwkH9DTwS014dt+ZrgCvtl/fS8ncanWZanb2QOl5qzkEGC0qYkFLRc/HvH4Vlh + EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC + WIAFl5eHa95Fs7DYHD6KouxhFzq+BuICQVRWV06EpLN7u1Rti5A+p/+S4Sf8D5LndJikY2lLWkdPuFiV + LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII= @@ -305,6 +305,30 @@ 320, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFESURBVDhPpZO9SgNBFIV9A5/D0gdQkJBC7MQ0YmEbUtip + wVJEBJNSUil2RhALERS000orYyEqNorBqCSG+IPNle/AjDMrG0EPHA67O/Pdu7N3e+yfEuCq3rbtszt5 + 4+TG1o4ubOWgZss7pza/eWxz64c2XdmVp0pbNl5ctdly9RvARiD15ruym1mDxvJLSg9odMyyi/veAzPp + RhGAth9e3myv9iTQb4kiAO9MayzQouuSt7sXGo1OFpUCcGCN5qceUiEEpHUQAThtB9CiAMD1wmXem2s0 + nCsoBeBT3T93fIVksnHovFfpOogAfOfbx9aPSs7J+ygzMqH0ADpgQVjJdZBMFAGYMAcIK6UZDWZzSgEY + z/brhx52q+wSRQBmmzEFQifOnEto1jBwqK8/oxSAH4PJcuYbY04a876YqpjN0Rz8XWZfJmBk74oVPr4A + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFESURBVDhPpZO9SgNBFIV9A5/D0gdQkJBC7MQ0YmEbUtip + wVJEBJNSUil2RhALERS000orYyEqNorBqCSG+IPNle/AjDMrG0EPHA67O/Pdu7N3e+yfEuCq3rbtszt5 + 4+TG1o4ubOWgZss7pza/eWxz64c2XdmVp0pbNl5ctdly9RvARiD15ruym1mDxvJLSg9odMyyi/veAzPp + RhGAth9e3myv9iTQb4kiAO9MayzQouuSt7sXGo1OFpUCcGCN5qceUiEEpHUQAThtB9CiAMD1wmXem2s0 + nCsoBeBT3T93fIVksnHovFfpOogAfOfbx9aPSs7J+ygzMqH0ADpgQVjJdZBMFAGYMAcIK6UZDWZzSgEY + z/brhx52q+wSRQBmmzEFQifOnEto1jBwqK8/oxSAH4PJcuYbY04a876YqpjN0Rz8XWZfJmBk74oVPr4A + AAAASUVORK5CYII= + + 426, 17