From c64da59da861d96411fc6f98081aa6df8a36b9ec Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 17 Jan 2022 12:00:14 +0900 Subject: [PATCH] =?UTF-8?q?=20=EC=B6=9C=EA=B7=BC=EB=B6=80=20=EC=97=91?= =?UTF-8?q?=EC=85=80=20=EC=A0=80=EC=9E=A5=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- .../FBS0000/Holiday/WorkTable.Designer.cs | 205 +++++++++-------- SubProject/FBS0000/Holiday/WorkTable.cs | 23 ++ SubProject/FBS0000/Holiday/WorkTable.resx | 18 +- .../FBS0000/Holiday/fHolyday.Designer.cs | 146 ++++++------ SubProject/FBS0000/Holiday/fHolyday.cs | 10 +- SubProject/FBS0000/Holiday/fHolyday.resx | 66 +++--- .../OtConfirm/fHolyRequestAdd.Designer.cs | 214 +++++++----------- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 42 +++- .../FPJ0000/OtConfirm/fHolyRequestAdd.resx | 3 - 10 files changed, 382 insertions(+), 349 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 207ce47..9ee470d 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("22.01.11.1300")] -[assembly: AssemblyFileVersion("22.01.11.1300")] +[assembly: AssemblyVersion("22.01.17.1150")] +[assembly: AssemblyFileVersion("22.01.17.1150")] diff --git a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs index 4c50457..791d464 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs @@ -31,9 +31,9 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WorkTable)); System.Globalization.CultureInfo cultureInfo = new System.Globalization.CultureInfo("ko-KR", false); - FarPoint.Win.ComplexBorder complexBorder2 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo2 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + FarPoint.Win.ComplexBorder complexBorder1 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -57,14 +57,15 @@ this.tbSD = new System.Windows.Forms.ToolStripTextBox(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.tbED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbGrp = new System.Windows.Forms.ToolStripTextBox(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.btXls = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -251,7 +252,8 @@ this.toolStripSeparator1, this.toolStripLabel3, this.tbGrp, - this.toolStripButton1}); + this.toolStripButton1, + this.btXls}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1137, 31); @@ -291,6 +293,31 @@ this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); // + // toolStripButton4 + // + 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(28, 28); + this.toolStripButton4.Text = "이전달"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // + // toolStripButton5 + // + 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(28, 28); + this.toolStripButton5.Text = "다음달"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); + // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; @@ -335,26 +362,26 @@ this.fpSpread1_Sheet1.ColumnCount = 50; this.fpSpread1_Sheet1.RowCount = 1; this.fpSpread1_Sheet1.AllowNoteEdit = false; - this.fpSpread1_Sheet1.Cells.Get(0, 0).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 1).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 2).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 3).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 4).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 0).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 1).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 2).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 3).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 4).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 5).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 5).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 6).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 6).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 7).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 7).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 8).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 8).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 9).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 9).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -363,7 +390,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 9).Value = 6; this.fpSpread1_Sheet1.Cells.Get(0, 9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 10).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 10).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -372,7 +399,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 10).Value = 7; this.fpSpread1_Sheet1.Cells.Get(0, 10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 11).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 11).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -381,7 +408,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 11).Value = 8; this.fpSpread1_Sheet1.Cells.Get(0, 11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 12).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 12).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -390,7 +417,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 12).Value = 9; this.fpSpread1_Sheet1.Cells.Get(0, 12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 13).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 13).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -399,7 +426,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 13).Value = 10; this.fpSpread1_Sheet1.Cells.Get(0, 13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 14).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 14).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -408,7 +435,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 14).Value = 11; this.fpSpread1_Sheet1.Cells.Get(0, 14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 15).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 15).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -417,7 +444,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 15).Value = 12; this.fpSpread1_Sheet1.Cells.Get(0, 15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 16).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 16).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -426,55 +453,55 @@ this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 16).Value = 13; this.fpSpread1_Sheet1.Cells.Get(0, 16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 17).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 17).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 18).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 18).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 19).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 19).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 20).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 20).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 21).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 21).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 22).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 22).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 23).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 23).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 24).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 24).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 25).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 25).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 26).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 26).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 27).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 27).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 28).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 28).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 29).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 29).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 30).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 30).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 31).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 31).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 32).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 32).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 33).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 33).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -483,7 +510,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 33).Value = 30; this.fpSpread1_Sheet1.Cells.Get(0, 33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 34).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 34).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(0, 34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -493,39 +520,39 @@ this.fpSpread1_Sheet1.Cells.Get(0, 34).Value = 31; this.fpSpread1_Sheet1.Cells.Get(0, 34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 35).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Cells.Get(0, 35).Border = complexBorder2; - numberCellType2.DecimalPlaces = 0; - numberCellType2.MaximumValue = 10000000D; - numberCellType2.MinimumValue = -10000000D; - numberCellType2.NegativeRed = true; - this.fpSpread1_Sheet1.Cells.Get(0, 35).CellType = numberCellType2; + this.fpSpread1_Sheet1.Cells.Get(0, 35).Border = complexBorder1; + numberCellType1.DecimalPlaces = 0; + numberCellType1.MaximumValue = 10000000D; + numberCellType1.MinimumValue = -10000000D; + numberCellType1.NegativeRed = true; + this.fpSpread1_Sheet1.Cells.Get(0, 35).CellType = numberCellType1; this.fpSpread1_Sheet1.Cells.Get(0, 35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 35).Value = "발생연차"; this.fpSpread1_Sheet1.Cells.Get(0, 35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 36).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Cells.Get(0, 36).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 36).CellType = numberCellType2; + this.fpSpread1_Sheet1.Cells.Get(0, 36).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 36).CellType = numberCellType1; this.fpSpread1_Sheet1.Cells.Get(0, 36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 36).Value = "사용휴가"; this.fpSpread1_Sheet1.Cells.Get(0, 36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 37).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Cells.Get(0, 37).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 37).CellType = numberCellType2; + this.fpSpread1_Sheet1.Cells.Get(0, 37).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 37).CellType = numberCellType1; this.fpSpread1_Sheet1.Cells.Get(0, 37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 37).Value = "잔여휴가"; this.fpSpread1_Sheet1.Cells.Get(0, 37).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 38).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 39).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 40).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 41).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 42).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 43).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 44).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 45).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 46).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 47).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 48).Border = complexBorder2; - this.fpSpread1_Sheet1.Cells.Get(0, 49).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 38).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 39).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 40).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 41).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 42).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 43).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 44).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 45).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 46).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 47).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 48).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 49).Border = complexBorder1; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "분류"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "사번"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "직급"; @@ -540,25 +567,25 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "잔여휴가"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(0).Border = complexBorder2; + this.fpSpread1_Sheet1.Columns.Get(0).Border = complexBorder1; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "분류"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).Border = complexBorder2; + this.fpSpread1_Sheet1.Columns.Get(1).Border = complexBorder1; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "사번"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(2).Border = complexBorder2; + this.fpSpread1_Sheet1.Columns.Get(2).Border = complexBorder1; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "직급"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(3).Border = complexBorder2; + this.fpSpread1_Sheet1.Columns.Get(3).Border = complexBorder1; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "성명"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -710,11 +737,11 @@ this.fpSpread1_Sheet1.PrintInfo.Margin.Left = 25; this.fpSpread1_Sheet1.PrintInfo.Margin.Right = 25; this.fpSpread1_Sheet1.PrintInfo.Margin.Top = 75; - noPrinterPrintInfo2.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo2.HardMarginX = 0F; - noPrinterPrintInfo2.HardMarginY = 0F; - noPrinterPrintInfo2.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo2; + noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo1.HardMarginX = 0F; + noPrinterPrintInfo1.HardMarginY = 0F; + noPrinterPrintInfo1.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; this.fpSpread1_Sheet1.PrintInfo.Orientation = FarPoint.Win.Spread.PrintOrientation.Landscape; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.PrintInfo.Printer = ""; @@ -726,30 +753,15 @@ this.fpSpread1_Sheet1.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripSeparator1 + // btXls // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); - // - // toolStripButton4 - // - 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(28, 28); - this.toolStripButton4.Text = "이전달"; - this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); - // - // toolStripButton5 - // - 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(28, 28); - this.toolStripButton5.Text = "다음달"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + this.btXls.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btXls.Image = ((System.Drawing.Image)(resources.GetObject("btXls.Image"))); + this.btXls.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btXls.Name = "btXls"; + this.btXls.Size = new System.Drawing.Size(83, 28); + this.btXls.Text = "엑셀저장"; + this.btXls.Click += new System.EventHandler(this.btXls_Click); // // WorkTable // @@ -806,5 +818,6 @@ private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripButton btXls; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs index e5c246f..9ef7f68 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -361,5 +361,28 @@ namespace FBS0000 tbSD.Text = sd.ToShortDateString(); tbED.Text = ed.ToShortDateString(); } + + private void btXls_Click(object sender, EventArgs e) + { + + + + SaveFileDialog sd = new SaveFileDialog(); + sd.Filter = "excel|*.xls"; + sd.FileName = "출근부(" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls"; + if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + fpSpread1.SaveExcel(sd.FileName, + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); + //FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + } + + if (FCOMMON.Util.MsgQ("파일을 확인 할까요?") != DialogResult.Yes) return; + + FCOMMON.Util.RunExplorer(sd.FileName); + } } } diff --git a/SubProject/FBS0000/Holiday/WorkTable.resx b/SubProject/FBS0000/Holiday/WorkTable.resx index f9d5cc2..00c789c 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.resx +++ b/SubProject/FBS0000/Holiday/WorkTable.resx @@ -218,9 +218,21 @@ Fas4M5JsXd4AAAAASUVORK5CYII= - - 189, 17 - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 189, 17 diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index 0984899..18cd857 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -88,12 +88,12 @@ this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.현재사원원장보기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -180,7 +180,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -355,7 +354,6 @@ // tbSD // this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbSD.Name = "tbSD"; this.tbSD.Size = new System.Drawing.Size(100, 31); this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -370,7 +368,6 @@ // tbED // this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbED.Name = "tbED"; this.tbED.Size = new System.Drawing.Size(100, 31); this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -450,7 +447,7 @@ this.복사ToolStripMenuItem, this.현재사원원장보기ToolStripMenuItem}); this.cmO.Name = "cm1"; - this.cmO.Size = new System.Drawing.Size(307, 140); + this.cmO.Size = new System.Drawing.Size(307, 118); // // toolStripMenuItem2 // @@ -500,6 +497,14 @@ this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(303, 6); // + // 복사ToolStripMenuItem + // + this.복사ToolStripMenuItem.Enabled = false; + this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem"; + this.복사ToolStripMenuItem.Size = new System.Drawing.Size(306, 36); + this.복사ToolStripMenuItem.Text = "복사"; + this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click); + // // 현재사원원장보기ToolStripMenuItem // this.현재사원원장보기ToolStripMenuItem.Name = "현재사원원장보기ToolStripMenuItem"; @@ -511,6 +516,7 @@ // this.bs.DataMember = "Holyday"; this.bs.DataSource = this.dsMSSQL; + this.bs.Sort = ""; // // ta // @@ -529,14 +535,6 @@ this.textBox1.TabIndex = 5; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // - // 복사ToolStripMenuItem - // - this.복사ToolStripMenuItem.Enabled = false; - this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem"; - this.복사ToolStripMenuItem.Size = new System.Drawing.Size(306, 36); - this.복사ToolStripMenuItem.Text = "복사"; - this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click); - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -548,7 +546,7 @@ this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "구분"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "일자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "시작일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "사번"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "성명"; @@ -563,27 +561,27 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(일)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType2.TimeDefault = new System.DateTime(2022, 1, 11, 22, 43, 24, 346); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType2; + dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType1.TimeDefault = new System.DateTime(2022, 1, 14, 10, 18, 20, 842); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate"; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "일자"; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "시작일"; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "요일"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "사번"; @@ -591,98 +589,98 @@ this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - textCellType10.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType10; + textCellType4.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명"; this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType9.MaximumValue = 999999999999999D; - numberCellType9.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType9; + numberCellType1.MaximumValue = 999999999999999D; + numberCellType1.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term"; 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).Tag = "dr"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType10.MaximumValue = 999999999999999D; - numberCellType10.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType10; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "#"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 40F; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType11.MaximumValue = 999999999999999D; - numberCellType11.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType11; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(일)"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "cr"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType12.MaximumValue = 999999999999999D; - numberCellType12.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType12; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType13.DecimalPlaces = 1; - numberCellType13.MaximumValue = 999999999999999D; - numberCellType13.MinimumValue = -999999999999999D; - numberCellType13.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType13; + numberCellType5.DecimalPlaces = 1; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + numberCellType5.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType14.DecimalPlaces = 2; - numberCellType14.MaximumValue = 999999999999999D; - numberCellType14.MinimumValue = -999999999999999D; - numberCellType14.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType14; + numberCellType6.DecimalPlaces = 2; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + numberCellType6.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType15.DecimalPlaces = 1; - numberCellType15.MaximumValue = 999999999999999D; - numberCellType15.MinimumValue = -999999999999999D; - numberCellType15.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType15; + numberCellType7.DecimalPlaces = 1; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + numberCellType7.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType16.DecimalPlaces = 2; - numberCellType16.MaximumValue = 999999999999999D; - numberCellType16.MinimumValue = -999999999999999D; - numberCellType16.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType16; + numberCellType8.DecimalPlaces = 2; + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + numberCellType8.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)"; diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 4da74c4..72bc6a9 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -34,7 +34,7 @@ namespace FBS0000 private void __Load(object sender, EventArgs e) { - + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); //엔터키누르면 아래로 이동하게함ㄷ FarPoint.Win.Spread.InputMap im = this.fpSpread1.GetInputMap(FarPoint.Win.Spread.InputMapMode.WhenFocused); FarPoint.Win.Spread.InputMap im2 = this.fpSpread1.GetInputMap(FarPoint.Win.Spread.InputMapMode.WhenAncestorOfFocused); @@ -78,7 +78,7 @@ namespace FBS0000 } //일반사용자의경우에는 상태를 변경하지 못한다. - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); + //int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); //curLevel = 5; if (curLevel >= 5) { @@ -89,9 +89,15 @@ namespace FBS0000 btDel.Enabled = true; btAdd.Enabled = true; 복사ToolStripMenuItem.Enabled = true; + toolStripButton2.Enabled = true; } else { + toolStripButton2.Enabled = false; + btSave.Enabled = false; + btDel.Enabled = false; + btAdd.Enabled = false; + this.cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. this.cmbGrp.Enabled = false; diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index 55f728a..59436f2 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -212,23 +212,6 @@ - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi - CwURXcam0lPUxCyjkT0E9RBIVM4htiVZmjJvm8bcZrvg5US7YEuPu6SuOdeE7Zx2tjm+/c9ZHhvuwT98 - OPwP/L7/z/mec3bwi6KoyonnCow3VWFMdhDk1vFtsp8fPmy325kppw2U0wrjjQqsr69vCyFEpVLt1Ov1 - N0ef1sOurofxegVSqVQBLMuCYRiRRCKBbDabDyg0sMBwVbolYCNkg2QyiUwmU2hgeFIPW1sdDFek4DhO - 4EFXCE26EO4RGrVBNHYG0UDgLcQA0cCRNxi+LEU6nRbgh3WWKLSEt+YoOsejuNMREAJ4qwKD4ZY6fHlV - i6FL5UI6z/+nKsngXQ2N2+200EEgEMgVNRi4UC4UxAdwXApWdwi9jjl0mkN4b1vGCLWItd8riMfjDAk4 - ummgqsXESwUGzpf9G+agNc1jiFrB/C8WgRiHyYUEjN9WMTrlRywWK9KBwwL92VIhgO/goyOM2aUkpoJ/ - 4PCzsBM8YQ7dE0G4XC6UlJScEA0GHypgbZWjv7pULLHDFAQd5eBYYGCjGZh8SVA/ObyzLiESiWw1mCEG - fVUHxBK7yTPPLrOwzuWHeWYWOahHfmz9Egfvy2F+IUPfmc0AiyuMSTqBr2TIGUxhmpw+6EqiTTeARcpQ - 3KD3tAS5XE54E6trLJzfo+ghXXywh6EZC+C1bgQeowbT6jo01uxrFgyUSqWkq/oQ+q8dQ88pCWiahs/n - g9frhdvtFgrzeDzC1frpDSbbb8E/2or+lsoUscgvWdmuk4+O7Hksl+5WkG2xX1ekoWZv82fVRW7s2Tn8 - BSp4yBiRDhTwAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi @@ -243,6 +226,23 @@ 3KD3tAS5XE54E6trLJzfo+ghXXywh6EZC+C1bgQeowbT6jo01uxrFgyUSqWkq/oQ+q8dQ88pCWiahs/n g9frhdvtFgrzeDzC1frpDSbbb8E/2or+lsoUscgvWdmuk4+O7Hksl+5WkG2xX1ekoWZv82fVRW7s2Tn8 BSOIyBW1dFoHAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR + hYKILmNT6SlqYpbRyB6CeggkKqfIckmW5ti87BJzm+2ClxPtgi09c1vq0rkUtnPa2dz49j9neWy4B//w + 4fA/8Pv+P+d7ztnBL4qiqsaeyzHaXA2z9CDIrePbZD8/fNjpdDITbgcotx3GG5XIZrPbQghRKpU7dTrd + TdPTBjhVDTBer0QqlSqAZVkwDCOSSCSwvr6eDyg0sMFwVbIlYCNkg2QyiUwmU2hgeNIAR3s9DFck4DhO + 4EFPBM2aCO4RmrrDaFKH0UjgLcQA0cCVNxi+LEE6nRbghzW2GLoJb60xqEdjuNMVEgJ4qwKD4dZ6fHlV + h6FLFUI6z/+nKsjg3U4atztooYNgMJgraqC/UCEUxAdwXAp2bwT9rhmorRG8dyxihJrH2u9lrK6uMiTg + 6KaBsg5jL+XQny//N8yh2zKLIWoZs79YhOIcxoMJGL+twDQxh3g8XqQDlw26s2VCAN/BR1cU0wtJTIT/ + wDXHwknwRTn0joXh8XhQUlJyQjQYfCiHvU0GbU2ZWGKXJQw6xsEVZOCgGVgCSVA/ObyzL2BpaWmrwRQx + GKg+IJbYS555epGFfSY/zDM1z0E18mPrlzh4XwbrCykGzmwG2DxRjNMJfCVD7nAKk+T0QU8S7Ro95ilD + cYP+06XI5XLCm1hZY+H+HkMf6eKDM4pOcwivNSPwGTsxqapHU+2+FsFAoVCU9tQcgvbaMfSdKgVN0wgE + AvD7/fB6vUJhPp9PuNo/vcF4xy3Mmdqgba1KEYv8kpbvOvnoyJ7HMsluOdkW+3VFGmv3tnxWXuTMz87h + LxyYyBKmlP1zAAAAAElFTkSuQmCC @@ -269,22 +269,6 @@ 659, 17 - - 737, 17 - - - - AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh - cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 - cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 - AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// - K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////AQgAAP////8AAQgAAAs= - - - - 294, 17 - R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ @@ -324,6 +308,22 @@ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== + + 737, 17 + + + + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh + cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 + cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 + AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// + K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA + AAD/////AQgAAP////8AAQgAAAs= + + + + 294, 17 + 358, 17 diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs index ccc3af0..a3ef0bc 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs @@ -39,6 +39,8 @@ namespace FPJ0000.OtConfirm this.tbED = new System.Windows.Forms.DateTimePicker(); this.tbRemark = new System.Windows.Forms.RichTextBox(); this.grpUser = new System.Windows.Forms.GroupBox(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radTime = new System.Windows.Forms.RadioButton(); this.tbTimes = new System.Windows.Forms.TextBox(); this.tbDays = new System.Windows.Forms.TextBox(); this.label11 = new System.Windows.Forms.Label(); @@ -48,11 +50,6 @@ namespace FPJ0000.OtConfirm this.tbLocation = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); this.tbReason = new System.Windows.Forms.ComboBox(); - this.tbTel = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.tbProcess = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.tbName = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.grpAdmin = new System.Windows.Forms.GroupBox(); @@ -64,8 +61,7 @@ namespace FPJ0000.OtConfirm this.tbResponse = new System.Windows.Forms.RichTextBox(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); - this.radTime = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.cmbUser = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit(); this.grpUser.SuspendLayout(); @@ -75,19 +71,19 @@ namespace FPJ0000.OtConfirm // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(35, 44); + this.label1.Location = new System.Drawing.Point(38, 84); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(93, 27); - this.label1.TabIndex = 0; + this.label1.TabIndex = 2; this.label1.Text = "시작일"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(35, 90); + this.label2.Location = new System.Drawing.Point(38, 130); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(93, 27); - this.label2.TabIndex = 2; + this.label2.TabIndex = 4; this.label2.Text = "종료일"; // // tbCate @@ -98,10 +94,10 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbCate.Location = new System.Drawing.Point(140, 133); + this.tbCate.Location = new System.Drawing.Point(143, 173); this.tbCate.Name = "tbCate"; - this.tbCate.Size = new System.Drawing.Size(153, 35); - this.tbCate.TabIndex = 5; + this.tbCate.Size = new System.Drawing.Size(429, 35); + this.tbCate.TabIndex = 7; // // bs // @@ -116,32 +112,36 @@ namespace FPJ0000.OtConfirm // tbSD // this.tbSD.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "sdate", true)); - this.tbSD.Location = new System.Drawing.Point(140, 39); + this.tbSD.Location = new System.Drawing.Point(143, 79); this.tbSD.Name = "tbSD"; - this.tbSD.Size = new System.Drawing.Size(358, 38); - this.tbSD.TabIndex = 1; + this.tbSD.Size = new System.Drawing.Size(627, 38); + this.tbSD.TabIndex = 3; // // tbED // this.tbED.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "edate", true)); - this.tbED.Location = new System.Drawing.Point(140, 86); + this.tbED.Location = new System.Drawing.Point(143, 126); this.tbED.Name = "tbED"; - this.tbED.Size = new System.Drawing.Size(358, 38); - this.tbED.TabIndex = 3; + this.tbED.Size = new System.Drawing.Size(627, 38); + this.tbED.TabIndex = 5; this.tbED.ValueChanged += new System.EventHandler(this.tbED_ValueChanged); // // tbRemark // this.tbRemark.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Remark", true)); this.tbRemark.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbRemark.Location = new System.Drawing.Point(140, 297); + this.tbRemark.Location = new System.Drawing.Point(143, 337); this.tbRemark.Name = "tbRemark"; - this.tbRemark.Size = new System.Drawing.Size(358, 169); - this.tbRemark.TabIndex = 13; + this.tbRemark.Size = new System.Drawing.Size(629, 84); + this.tbRemark.TabIndex = 16; this.tbRemark.Text = ""; // // grpUser // + this.grpUser.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.grpUser.Controls.Add(this.cmbUser); this.grpUser.Controls.Add(this.radioButton2); this.grpUser.Controls.Add(this.radTime); this.grpUser.Controls.Add(this.tbTimes); @@ -153,11 +153,6 @@ namespace FPJ0000.OtConfirm this.grpUser.Controls.Add(this.tbLocation); this.grpUser.Controls.Add(this.label8); this.grpUser.Controls.Add(this.tbReason); - this.grpUser.Controls.Add(this.tbTel); - this.grpUser.Controls.Add(this.label7); - this.grpUser.Controls.Add(this.tbProcess); - this.grpUser.Controls.Add(this.label6); - this.grpUser.Controls.Add(this.tbName); this.grpUser.Controls.Add(this.label5); this.grpUser.Controls.Add(this.tbRemark); this.grpUser.Controls.Add(this.label1); @@ -173,40 +168,65 @@ namespace FPJ0000.OtConfirm this.grpUser.TabStop = false; this.grpUser.Text = "신청자"; // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Checked = true; + this.radioButton2.Location = new System.Drawing.Point(53, 173); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(84, 31); + this.radioButton2.TabIndex = 6; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "일반"; + this.radioButton2.UseVisualStyleBackColor = true; + this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // radTime + // + this.radTime.AutoSize = true; + this.radTime.Location = new System.Drawing.Point(578, 174); + this.radTime.Name = "radTime"; + this.radTime.Size = new System.Drawing.Size(192, 31); + this.radTime.TabIndex = 8; + this.radTime.TabStop = true; + this.radTime.Text = "대체시간사용"; + this.radTime.UseVisualStyleBackColor = true; + this.radTime.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // // tbTimes // this.tbTimes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbTimes.Location = new System.Drawing.Point(653, 428); + this.tbTimes.Location = new System.Drawing.Point(272, 430); this.tbTimes.Name = "tbTimes"; this.tbTimes.Size = new System.Drawing.Size(116, 38); - this.tbTimes.TabIndex = 23; + this.tbTimes.TabIndex = 19; this.tbTimes.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbDays // this.tbDays.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbDays.Location = new System.Drawing.Point(518, 428); + this.tbDays.Location = new System.Drawing.Point(143, 430); this.tbDays.Name = "tbDays"; this.tbDays.Size = new System.Drawing.Size(116, 38); - this.tbDays.TabIndex = 21; + this.tbDays.TabIndex = 18; this.tbDays.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(513, 394); + this.label11.Location = new System.Drawing.Point(29, 433); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(167, 27); - this.label11.TabIndex = 20; - this.label11.Text = "사용 일/시간"; + this.label11.Size = new System.Drawing.Size(102, 27); + this.label11.TabIndex = 17; + this.label11.Text = "사용 일"; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(8, 260); + this.label10.Location = new System.Drawing.Point(11, 300); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(120, 27); - this.label10.TabIndex = 10; + this.label10.TabIndex = 13; this.label10.Text = "백업인원"; // // tbBackup @@ -217,18 +237,18 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbBackup.Location = new System.Drawing.Point(140, 256); + this.tbBackup.Location = new System.Drawing.Point(143, 296); this.tbBackup.Name = "tbBackup"; - this.tbBackup.Size = new System.Drawing.Size(358, 35); - this.tbBackup.TabIndex = 11; + this.tbBackup.Size = new System.Drawing.Size(627, 35); + this.tbBackup.TabIndex = 14; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(35, 218); + this.label9.Location = new System.Drawing.Point(38, 258); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(93, 27); - this.label9.TabIndex = 8; + this.label9.TabIndex = 11; this.label9.Text = "행선지"; // // tbLocation @@ -239,18 +259,18 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbLocation.Location = new System.Drawing.Point(140, 215); + this.tbLocation.Location = new System.Drawing.Point(143, 255); this.tbLocation.Name = "tbLocation"; - this.tbLocation.Size = new System.Drawing.Size(358, 35); - this.tbLocation.TabIndex = 9; + this.tbLocation.Size = new System.Drawing.Size(627, 35); + this.tbLocation.TabIndex = 12; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(62, 177); + this.label8.Location = new System.Drawing.Point(65, 217); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(66, 27); - this.label8.TabIndex = 6; + this.label8.TabIndex = 9; this.label8.Text = "사유"; // // tbReason @@ -261,73 +281,33 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbReason.Location = new System.Drawing.Point(140, 174); + this.tbReason.Location = new System.Drawing.Point(143, 214); this.tbReason.Name = "tbReason"; - this.tbReason.Size = new System.Drawing.Size(358, 35); - this.tbReason.TabIndex = 7; - // - // tbTel - // - this.tbTel.Location = new System.Drawing.Point(518, 247); - this.tbTel.Name = "tbTel"; - this.tbTel.ReadOnly = true; - this.tbTel.Size = new System.Drawing.Size(251, 38); - this.tbTel.TabIndex = 19; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(513, 214); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(66, 27); - this.label7.TabIndex = 18; - this.label7.Text = "전화"; - // - // tbProcess - // - this.tbProcess.Location = new System.Drawing.Point(518, 154); - this.tbProcess.Name = "tbProcess"; - this.tbProcess.ReadOnly = true; - this.tbProcess.Size = new System.Drawing.Size(251, 38); - this.tbProcess.TabIndex = 17; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(513, 121); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(66, 27); - this.label6.TabIndex = 16; - this.label6.Text = "공정"; - // - // tbName - // - this.tbName.Location = new System.Drawing.Point(518, 66); - this.tbName.Name = "tbName"; - this.tbName.ReadOnly = true; - this.tbName.Size = new System.Drawing.Size(251, 38); - this.tbName.TabIndex = 15; + this.tbReason.Size = new System.Drawing.Size(627, 35); + this.tbReason.TabIndex = 10; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(513, 32); + this.label5.Location = new System.Drawing.Point(38, 37); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(66, 27); - this.label5.TabIndex = 14; - this.label5.Text = "성명"; + this.label5.Size = new System.Drawing.Size(93, 27); + this.label5.TabIndex = 0; + this.label5.Text = "담당자"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(62, 300); + this.label4.Location = new System.Drawing.Point(65, 340); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(66, 27); - this.label4.TabIndex = 12; + this.label4.TabIndex = 15; this.label4.Text = "비고"; // // grpAdmin // + this.grpAdmin.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.grpAdmin.Controls.Add(this.chkSendMail); this.grpAdmin.Controls.Add(this.cmbPreset); this.grpAdmin.Controls.Add(this.rad2); @@ -423,30 +403,14 @@ namespace FPJ0000.OtConfirm // this.ta.ClearBeforeFill = true; // - // radTime + // cmbUser // - this.radTime.AutoSize = true; - this.radTime.Location = new System.Drawing.Point(306, 134); - this.radTime.Name = "radTime"; - this.radTime.Size = new System.Drawing.Size(192, 31); - this.radTime.TabIndex = 24; - this.radTime.TabStop = true; - this.radTime.Text = "대체시간사용"; - this.radTime.UseVisualStyleBackColor = true; - this.radTime.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Checked = true; - this.radioButton2.Location = new System.Drawing.Point(50, 133); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(84, 31); - this.radioButton2.TabIndex = 25; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "일반"; - this.radioButton2.UseVisualStyleBackColor = true; - this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUser.FormattingEnabled = true; + this.cmbUser.Location = new System.Drawing.Point(143, 34); + this.cmbUser.Name = "cmbUser"; + this.cmbUser.Size = new System.Drawing.Size(627, 35); + this.cmbUser.TabIndex = 1; // // fHolyRequestAdd // @@ -489,11 +453,6 @@ namespace FPJ0000.OtConfirm private System.Windows.Forms.BindingSource bs; private DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter ta; private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox tbProcess; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.TextBox tbName; - private System.Windows.Forms.TextBox tbTel; - private System.Windows.Forms.Label label7; private System.Windows.Forms.RadioButton rad0; private System.Windows.Forms.RadioButton rad2; private System.Windows.Forms.RadioButton rad1; @@ -510,5 +469,6 @@ namespace FPJ0000.OtConfirm private System.Windows.Forms.CheckBox chkSendMail; private System.Windows.Forms.RadioButton radTime; private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.ComboBox cmbUser; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 421d05a..52f7d50 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -36,20 +36,28 @@ namespace FPJ0000.OtConfirm foreach (var item in 백업목록) tbBackup.Items.Add(item.Value); + var userlist = FCOMMON.DBM.getUserTable(); + this.cmbUser.DataSource = userlist; + this.cmbUser.ValueMember = "id"; + this.cmbUser.DisplayMember = "dispname"; + + if (dr.RowState == DataRowState.Detached) { this.Text = "휴가신청 추가"; - tbName.Text = FCOMMON.info.Login.nameK; - tbProcess.Text = FCOMMON.info.Login.process; - tbTel.Text = FCOMMON.info.Login.tel; + cmbUser.Text = $"{FCOMMON.info.Login.nameK}({FCOMMON.info.Login.no})"; + + //tbProcess.Text = FCOMMON.info.Login.process; + //tbTel.Text = FCOMMON.info.Login.tel; } else { this.Text = "휴가신청 편집"; - tbName.Text = dr.name; - tbProcess.Text = dr.processs; - tbTel.Text = dr.tel; + cmbUser.Text = $"{dr.name}({dr.uid})"; //dr.name; + ////.Text = dr.processs; + // tbTel.Text = dr.tel; } + if (dr.conf == 1) rad1.Checked = true; else if (dr.conf == 2) rad2.Checked = true; else rad0.Checked = true; @@ -86,22 +94,31 @@ namespace FPJ0000.OtConfirm { curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); - + //관리자라면 관리자패널을 활성해준다. if (dr.RowState == DataRowState.Detached) { + cmbUser.Enabled = curLevel >= 5; grpAdmin.Enabled = false; + grpAdmin.Text = "관리자(추가작업시에는 사용할 수 없습니다)"; UpdateStatus(); } else { + cmbUser.Enabled = false; grpAdmin.Enabled = curLevel >= 5; + if(curLevel >= 5) + { + grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)"; + } var 관리자사전멘트 = FCOMMON.DBM.getCodeList("54"); cmbPreset.Items.Clear(); cmbPreset.Items.Add(" -- 저장된 문구를 선택하세요(공용:54) --"); cmbPreset.Items.AddRange(관리자사전멘트.Select(t => t.Value).ToArray()); cmbPreset.SelectedIndex = 0; } + + binit = true; } @@ -158,6 +175,12 @@ namespace FPJ0000.OtConfirm return; } + var uid = this.cmbUser.SelectedValue; + if (uid == null) + { + FCOMMON.Util.MsgE("사용자가 선택되지 않았습니다"); + return; + } if (dr.RowState == DataRowState.Detached) { @@ -175,8 +198,7 @@ namespace FPJ0000.OtConfirm } } - - + dr.uid = uid.ToString(); dr.HolyReason = tbReason.Text.Trim(); dr.HolyLocation = tbLocation.Text.Trim(); dr.HolyBackup = tbBackup.Text.Trim(); @@ -258,6 +280,7 @@ namespace FPJ0000.OtConfirm tbTimes.Enabled = true; tbDays.BackColor = Color.DimGray; tbTimes.BackColor = Color.Gold; + label11.Text = "사용시간"; } else { @@ -266,6 +289,7 @@ namespace FPJ0000.OtConfirm tbTimes.Enabled = false; tbTimes.BackColor = Color.DimGray; tbDays.BackColor = Color.Gold; + label11.Text = "사용일"; } if(binit) UpdateStatus(); diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx index 68721b3..2751a7d 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx @@ -120,9 +120,6 @@ 122, 17 - - 122, 17 - 17, 17