diff --git a/Project/Setting.cs b/Project/Setting.cs
index 462cb58..7ea92ae 100644
--- a/Project/Setting.cs
+++ b/Project/Setting.cs
@@ -14,6 +14,7 @@ namespace Project
업무일지,
재고관리,
재고현황,
+ 근태입력,
}
public enum eToolPosition
{
diff --git a/Project/fMain.cs b/Project/fMain.cs
index 427e8b0..4d06b9e 100644
--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -180,12 +180,18 @@ namespace Project
{
Menu_InventoryList();
}
-
-
-
+ else if(Pub.setting.startForm == eFormList.근태입력)
+ {
+ Menu_WorkTable();
+ }
}
-
+ void Menu_WorkTable()
+ {
+ string formkey = "HOLY";
+ if (!ShowForm(formkey))
+ AddForm(formkey, new FBS0000.fHolyday());
+ }
void _SetLang()
{
@@ -987,9 +993,7 @@ namespace Project
private void 근태입력ToolStripMenuItem_Click(object sender, EventArgs e)
{
- string formkey = "HOLY";
- if (!ShowForm(formkey))
- AddForm(formkey, new FBS0000.fHolyday());
+ Menu_WorkTable();
}
private void 근로명부ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj
index 0791593..35f79f9 100644
--- a/SubProject/FBS0000/FBS0000.csproj
+++ b/SubProject/FBS0000/FBS0000.csproj
@@ -97,6 +97,12 @@
True
dsMSSQL.xsd
+
+ Form
+
+
+ fLovWorkUser.cs
+
Form
@@ -141,6 +147,9 @@
+
+ fLovWorkUser.cs
+
fWorkTableUser.cs
diff --git a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs
index ae82fd9..b0b715d 100644
--- a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs
+++ b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs
@@ -31,8 +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.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();
@@ -49,8 +50,8 @@
this.sbGen = new System.Windows.Forms.ToolStripLabel();
this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel();
this.sbJan = new System.Windows.Forms.ToolStripLabel();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tbSD = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.tbED = new System.Windows.Forms.ToolStripTextBox();
@@ -58,6 +59,8 @@
this.tbGrp = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+ this.lbStt = new System.Windows.Forms.ToolStripLabel();
+ this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
@@ -88,15 +91,17 @@
this.toolStripLabel5,
this.sbGen,
this.toolStripLabel8,
- this.sbJan});
- this.bn.Location = new System.Drawing.Point(0, 759);
+ this.sbJan,
+ this.toolStripButton2,
+ this.toolStripButton3});
+ this.bn.Location = new System.Drawing.Point(0, 545);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
- this.bn.Size = new System.Drawing.Size(948, 27);
+ this.bn.Size = new System.Drawing.Size(926, 27);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -207,11 +212,21 @@
this.sbJan.Size = new System.Drawing.Size(19, 24);
this.sbJan.Text = "0";
//
+ // toolStripButton2
+ //
+ this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(79, 24);
+ this.toolStripButton2.Text = "내보내기";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripLabel1,
+ this.lbStt,
this.tbSD,
this.toolStripLabel2,
this.tbED,
@@ -220,16 +235,10 @@
this.toolStripButton1});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(948, 31);
+ this.toolStrip1.Size = new System.Drawing.Size(926, 31);
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
- // toolStripLabel1
- //
- this.toolStripLabel1.Name = "toolStripLabel1";
- this.toolStripLabel1.Size = new System.Drawing.Size(31, 28);
- this.toolStripLabel1.Text = "기간";
- //
// tbSD
//
this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -280,29 +289,60 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(948, 728);
+ this.fpSpread1.Size = new System.Drawing.Size(926, 514);
+ this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
this.fpSpread1.SetViewportLeftColumn(0, 0, 4);
this.fpSpread1.SetActiveViewport(0, 0, -1);
//
+ // lbStt
+ //
+ this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.lbStt.ForeColor = System.Drawing.Color.Blue;
+ this.lbStt.Name = "lbStt";
+ this.lbStt.Size = new System.Drawing.Size(31, 28);
+ this.lbStt.Text = "기간";
+ this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
+ //
+ // toolStripButton3
+ //
+ this.toolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
+ this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton3.Name = "toolStripButton3";
+ this.toolStripButton3.Size = new System.Drawing.Size(79, 24);
+ this.toolStripButton3.Text = "메일전송";
+ this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
+ //
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
- this.fpSpread1_Sheet1.ColumnCount = 38;
+ this.fpSpread1_Sheet1.ColumnCount = 50;
this.fpSpread1_Sheet1.RowCount = 1;
+ this.fpSpread1_Sheet1.AllowNoteEdit = false;
+ 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 = 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 = 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 = 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 = 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 = 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;
@@ -311,6 +351,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 = 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;
@@ -319,6 +360,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 = 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;
@@ -327,6 +369,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 = 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;
@@ -335,6 +378,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 = 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;
@@ -343,6 +387,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 = 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;
@@ -351,6 +396,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 = 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;
@@ -359,6 +405,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 = 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;
@@ -367,38 +414,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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;
@@ -407,6 +471,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 = 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;
@@ -416,24 +481,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)))));
- 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).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).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 = 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 = "직급";
@@ -447,68 +527,165 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "사용휴가";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "잔여휴가";
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 = 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 = 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 = 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 = 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;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 69F;
+ this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "01";
+ this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "02";
+ this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "03";
+ this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "04";
+ this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "05";
+ this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(17).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(18).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(19).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(20).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(21).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(22).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(23).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(24).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(25).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(26).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(27).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(28).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(29).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(30).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(31).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(32).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(33).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(34).Width = 35F;
+ this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(35).Label = "발생년차";
+ this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(35).Width = 54F;
+ this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(36).Label = "사용휴가";
+ this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(36).Width = 54F;
+ this.fpSpread1_Sheet1.Columns.Get(37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(37).Label = "잔여휴가";
+ this.fpSpread1_Sheet1.Columns.Get(37).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(37).Width = 54F;
+ this.fpSpread1_Sheet1.Columns.Get(38).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(38).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(39).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(39).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(40).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(40).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(41).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(41).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(42).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(42).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(43).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(43).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(44).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(44).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(45).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(45).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(46).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(46).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(47).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(47).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(48).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(48).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(49).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(49).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.FrozenColumnCount = 4;
+ this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.ReadOnly;
this.fpSpread1_Sheet1.PrintInfo.ColEnd = 37;
this.fpSpread1_Sheet1.PrintInfo.ColStart = 0;
this.fpSpread1_Sheet1.PrintInfo.Footer = "";
@@ -520,25 +697,27 @@
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 = "";
this.fpSpread1_Sheet1.PrintInfo.PrintType = FarPoint.Win.Spread.PrintType.CellRange;
this.fpSpread1_Sheet1.PrintInfo.RowEnd = 0;
this.fpSpread1_Sheet1.PrintInfo.RowStart = 0;
+ this.fpSpread1_Sheet1.Protect = false;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+ this.fpSpread1_Sheet1.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// WorkTable
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(948, 786);
+ this.ClientSize = new System.Drawing.Size(926, 572);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
@@ -569,7 +748,6 @@
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
private System.Windows.Forms.ToolStrip toolStrip1;
- private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripTextBox tbSD;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripTextBox tbED;
@@ -583,6 +761,9 @@
private FarPoint.Win.Spread.FpSpread fpSpread1;
private System.Windows.Forms.ToolStripLabel toolStripLabel3;
private System.Windows.Forms.ToolStripTextBox tbGrp;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.ToolStripLabel lbStt;
+ private System.Windows.Forms.ToolStripButton toolStripButton3;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
}
}
\ No newline at end of file
diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs
index ee9ef2f..20d226b 100644
--- a/SubProject/FBS0000/Holiday/WorkTable.cs
+++ b/SubProject/FBS0000/Holiday/WorkTable.cs
@@ -45,6 +45,7 @@ namespace FBS0000
void RefreshData()
{
fpSpread1_Sheet1.Rows.Count = 0;
+
//열제목
var cols = new List();
@@ -59,13 +60,16 @@ namespace FBS0000
cols.Add(curDate.Day.ToString("00"));
if (curDate.ToShortDateString() == ed.ToShortDateString()) break;
}
- cols.AddRange(new string[]{ "발생년차","사용휴가","잔여휴가"});
+ cols.AddRange(new string[] { "발생", "사용", "잔여" });
//열제목 설정
fpSpread1_Sheet1.Columns.Count = cols.Count;
for (int c = 0; c < cols.Count; c++)
{
fpSpread1_Sheet1.Columns[c].Label = cols[c];
+ if (c < 4) fpSpread1_Sheet1.Columns[c].BackColor = Color.WhiteSmoke;
+ else if (c > cols.Count - 4) fpSpread1_Sheet1.Columns[c].BackColor = Color.WhiteSmoke;
+ else fpSpread1_Sheet1.Columns[c].BackColor = Color.White;
}
//fpSpread1_Sheet1.Cells[0, c].Value = cols[c];
@@ -73,9 +77,9 @@ namespace FBS0000
var taUser = new dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
var dtUser = taUser.GetData(FCOMMON.info.Login.gcode, tbGrp.Text);
var users = new List();
- foreach(var item in dtUser)
+ foreach (var item in dtUser)
{
- if(string.IsNullOrEmpty(item.indate))
+ if (string.IsNullOrEmpty(item.indate))
{
//입사일자를 체크해서. 이 날짜가 입사일 이전이면 넘어간다
}
@@ -86,6 +90,9 @@ namespace FBS0000
var taHoly = new dsMSSQLTableAdapters.HolydayTableAdapter();
var dtHoly = taHoly.GetByGrp(tbSD.Text, tbED.Text, FCOMMON.info.Login.gcode, this.tbGrp.Text);
+ var qta = new dsMSSQLTableAdapters.QueriesTableAdapter();
+
+
//사용자 목록을 1번열에 나열한다.
var rowindex = 0;
@@ -97,22 +104,58 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade;
fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name;
+ //이월잔액
+ var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToShortDateString());
+ var used = 0.0;
+
+ fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
+ fpSpread1_Sheet1.Rows[rowindex].Border = new FarPoint.Win.LineBorder(Color.Gainsboro, 1,false, false,true, true);
+
//각 일자별로 특이사항을 찾는다
- for(int c= 4; c < cols.Count;c++)
+ int c = 0;
+ for (c = 4; c < cols.Count - 3; c++)
{
- var curDate = sd.AddDays(c-4);
+ var curDate = sd.AddDays(c - 4);
var dr = dtHoly.Where(t => t.uid == item.empno && t.sdate.ToShortDateString() == curDate.ToShortDateString()).FirstOrDefault();
if (dr != null)
{
- //자료가있다.
- if (dr.term == 1.0) fpSpread1_Sheet1.Cells[rowindex, c].Value = "Y";
- else if(dr.term != 0) fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.term.ToString() +"Y";
+ if (dr.term > 0)
+ used += dr.term;
- if (dr.CrTime != 0) fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.CrTime.ToString();
+ //자료가있다.
+ if (string.IsNullOrEmpty(dr.tag) == false) fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.tag;
+ else if (dr.term > 0)
+ {
+ fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.Lime;
+ fpSpread1_Sheet1.Cells[rowindex, c].Value = "Y";
+ }
+ else if (dr.term != 0) fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.term.ToString() + "Y";
+
+ if (dr.CrTime != 0)
+ {
+ fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.CrTime.ToString();
+ fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DeepSkyBlue;
+ }
+
+ if (string.IsNullOrEmpty(dr.contents) == false) fpSpread1_Sheet1.Cells[rowindex, c].Note = dr.contents;
+ else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
- else fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty;
+ else
+ {
+ fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty;
+ fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.White;
+ fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
+ }
+
+
}
+ var jan = jand - used;
+ fpSpread1_Sheet1.Cells[rowindex, c++].Value = jand > 0 ? jand.ToString() : string.Empty;
+ fpSpread1_Sheet1.Cells[rowindex, c++].Value = used > 0 ? used.ToString() : string.Empty;
+ fpSpread1_Sheet1.Cells[rowindex, c++].Value = jan > 0 ? jan.ToString() : string.Empty;
+
+
rowindex += 1;
}
@@ -122,7 +165,7 @@ namespace FBS0000
private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
this.Validate();
- // this.bs.EndEdit();
+ // this.bs.EndEdit();
var dlg = FCOMMON.Util.MsgQ("변경된 내용을 저장하시겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
try
@@ -166,6 +209,51 @@ namespace FBS0000
}
}
-
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ var sd = new SaveFileDialog();
+ sd.Filter = "Excel|*.xls";
+ sd.FileName = string.Format("Worktable_{0}_{1}", tbSD.Text.Replace("-", ""), tbED.Text.Replace("-", ""));
+ if (sd.ShowDialog() != DialogResult.OK) return;
+ fpSpread1.SaveExcel(sd.FileName,
+ FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+ | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
+ | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+ | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+ }
+
+ private void lbStt_Click(object sender, EventArgs e)
+ {
+ var f = new FCOMMON.fSelectMonth();
+ if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
+ var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
+ tbSD.Text = sdDate.ToShortDateString();
+ tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
+ this.RefreshData();
+ }
+
+ private void toolStripButton3_Click(object sender, EventArgs e)
+ {
+
+ var FileName = FCOMMON.Util.CurrentPath + string.Format("Worktable_{0}_{1}", tbSD.Text.Replace("-", ""), tbED.Text.Replace("-", "")) + ".xls";
+ fpSpread1.SaveExcel(FileName,
+ FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+ | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
+ | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+ | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders
+ | FarPoint.Excel.ExcelSaveFlags.SaveAlternatingRowStyles
+ | FarPoint.Excel.ExcelSaveFlags.UseDefaultColorPalette
+ );
+
+
+ Outlook.Application outlookApplication = new Outlook.Application();
+ Outlook.MailItem newTask = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
+ newTask.Subject = tbSD.Text.Substring(0,7) +"월 출근부";
+ //newTask.To = "Chikyun.Kim@amkor.co.kr";
+ //newTask.HTMLBody = "this is test mail";
+ newTask.BodyFormat = OlBodyFormat.olFormatHTML;
+ newTask.Attachments.Add(FileName);
+ newTask.Display();
+ }
}
}
diff --git a/SubProject/FBS0000/Holiday/WorkTable.resx b/SubProject/FBS0000/Holiday/WorkTable.resx
index f946638..4d73c23 100644
--- a/SubProject/FBS0000/Holiday/WorkTable.resx
+++ b/SubProject/FBS0000/Holiday/WorkTable.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 122, 17
+ 17, 17
@@ -159,12 +159,42 @@
kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+
+
+
+
+ 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==
+
+
+
+
+ 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==
- 188, 17
+ 83, 17
- 294, 17
+ 189, 17
\ No newline at end of file
diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs
index fd50869..cf99fba 100644
--- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs
+++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs
@@ -30,15 +30,18 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday));
- FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
- 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.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 textCellType4 = 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.DateTimeCellType dateTimeCellType4 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+ 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 textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = 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();
@@ -49,10 +52,9 @@
this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.btAdd = new System.Windows.Forms.ToolStripButton();
+ this.btDel = new System.Windows.Forms.ToolStripButton();
+ this.btSave = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
this.sbUse = new System.Windows.Forms.ToolStripLabel();
@@ -63,12 +65,7 @@
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.dsMSSQL = new FBS0000.dsMSSQL();
- this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.sendToMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
- this.autoResizeComlumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tbSD = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.tbED = new System.Windows.Forms.ToolStripTextBox();
@@ -82,14 +79,24 @@
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
+ this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
+ this.cmO = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
+ 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.lbStt = new System.Windows.Forms.ToolStripLabel();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
- this.cm1.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+ this.cmO.SuspendLayout();
this.SuspendLayout();
//
// bn
@@ -109,10 +116,9 @@
this.bindingNavigatorMoveNextItem,
this.bindingNavigatorMoveLastItem,
this.bindingNavigatorSeparator2,
- this.toolStripButton3,
- this.bindingNavigatorAddNewItem,
- this.bindingNavigatorDeleteItem,
- this.toolStripButton2,
+ this.btAdd,
+ this.btDel,
+ this.btSave,
this.toolStripSeparator1,
this.toolStripLabel7,
this.sbUse,
@@ -122,14 +128,14 @@
this.sbJan,
this.toolStripButton4,
this.toolStripButton5});
- this.bn.Location = new System.Drawing.Point(0, 531);
+ this.bn.Location = new System.Drawing.Point(0, 582);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
- this.bn.Size = new System.Drawing.Size(984, 27);
+ this.bn.Size = new System.Drawing.Size(1162, 27);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -200,41 +206,35 @@
this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 27);
//
- // toolStripButton3
+ // btAdd
//
- this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
- this.toolStripButton3.Name = "toolStripButton3";
- this.toolStripButton3.RightToLeftAutoMirrorImage = true;
- this.toolStripButton3.Size = new System.Drawing.Size(81, 24);
- this.toolStripButton3.Text = "줄추가(&L)";
- this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
+ this.btAdd.Enabled = false;
+ this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image")));
+ this.btAdd.Name = "btAdd";
+ this.btAdd.RightToLeftAutoMirrorImage = true;
+ this.btAdd.Size = new System.Drawing.Size(71, 24);
+ this.btAdd.Text = "추가(&A)";
+ this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
//
- // bindingNavigatorAddNewItem
+ // btDel
//
- this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
- this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
- this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(71, 24);
- this.bindingNavigatorAddNewItem.Text = "추가(&A)";
- this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
+ this.btDel.Enabled = false;
+ this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image")));
+ this.btDel.Name = "btDel";
+ this.btDel.RightToLeftAutoMirrorImage = true;
+ this.btDel.Size = new System.Drawing.Size(72, 24);
+ this.btDel.Text = "삭제(&D)";
+ this.btDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
//
- // bindingNavigatorDeleteItem
+ // btSave
//
- this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
- this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
- this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(72, 24);
- this.bindingNavigatorDeleteItem.Text = "삭제(&D)";
- this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
- //
- // toolStripButton2
- //
- this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
- this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton2.Name = "toolStripButton2";
- this.toolStripButton2.Size = new System.Drawing.Size(70, 24);
- this.toolStripButton2.Text = "저장(&S)";
- this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ this.btSave.Enabled = false;
+ this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image")));
+ this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btSave.Name = "btSave";
+ this.btSave.Size = new System.Drawing.Size(70, 24);
+ this.btSave.Text = "저장(&S)";
+ this.btSave.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripSeparator1
//
@@ -306,39 +306,11 @@
this.dsMSSQL.DataSetName = "dsMSSQL";
this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
- // cm1
- //
- this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.sendToMailToolStripMenuItem,
- this.toolStripMenuItem1,
- this.autoResizeComlumnsToolStripMenuItem});
- this.cm1.Name = "contextMenuStrip1";
- this.cm1.Size = new System.Drawing.Size(201, 54);
- //
- // sendToMailToolStripMenuItem
- //
- this.sendToMailToolStripMenuItem.Name = "sendToMailToolStripMenuItem";
- this.sendToMailToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
- this.sendToMailToolStripMenuItem.Text = "Mail (Preview)";
- this.sendToMailToolStripMenuItem.Click += new System.EventHandler(this.sendToMailToolStripMenuItem_Click);
- //
- // toolStripMenuItem1
- //
- this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(197, 6);
- //
- // autoResizeComlumnsToolStripMenuItem
- //
- this.autoResizeComlumnsToolStripMenuItem.Name = "autoResizeComlumnsToolStripMenuItem";
- this.autoResizeComlumnsToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
- this.autoResizeComlumnsToolStripMenuItem.Text = "Auto Resize Comlumns";
- this.autoResizeComlumnsToolStripMenuItem.Click += new System.EventHandler(this.autoResizeComlumnsToolStripMenuItem_Click);
- //
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripLabel1,
+ this.lbStt,
this.tbSD,
this.toolStripLabel2,
this.tbED,
@@ -350,16 +322,10 @@
this.toolStripButton6});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(984, 31);
+ this.toolStrip1.Size = new System.Drawing.Size(1162, 31);
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
- // toolStripLabel1
- //
- this.toolStripLabel1.Name = "toolStripLabel1";
- this.toolStripLabel1.Size = new System.Drawing.Size(31, 28);
- this.toolStripLabel1.Text = "기간";
- //
// tbSD
//
this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -426,22 +392,34 @@
//
// fpSpread1
//
- this.fpSpread1.AccessibleDescription = "";
+ this.fpSpread1.AccessibleDescription = "fpSpread1, WorkTable";
+ this.fpSpread1.AllowCellOverflow = true;
+ this.fpSpread1.AllowDragFill = true;
+ this.fpSpread1.ClipboardPasteToFill = true;
+ this.fpSpread1.ContextMenuStrip = this.cmO;
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.fpSpread1.EditModeReplace = true;
this.fpSpread1.Location = new System.Drawing.Point(0, 31);
this.fpSpread1.Name = "fpSpread1";
+ this.fpSpread1.RangeDragFillMode = FarPoint.Win.Spread.DragFillMode.Series;
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(984, 500);
+ this.fpSpread1.Size = new System.Drawing.Size(1162, 551);
+ this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
+ this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
+ this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
+ this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown);
+ this.fpSpread1.SetViewportLeftColumn(0, 0, 1);
+ this.fpSpread1.SetActiveViewport(0, -1, -1);
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
- this.fpSpread1_Sheet1.SheetName = "Sheet1";
+ this.fpSpread1_Sheet1.SheetName = "WorkTable";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
- this.fpSpread1_Sheet1.ColumnCount = 9;
+ this.fpSpread1_Sheet1.ColumnCount = 14;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.AutoGenerateColumns = false;
@@ -452,70 +430,133 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "사용(일)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "사용(H)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "내용";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "발생(일)";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "발생(H)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "#";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "발생(일)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "발생(H)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "잔량(일)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "잔량(H)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "전일(일)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(H)";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
- 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(2020, 9, 7, 9, 10, 20, 482);
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType1;
+ dateTimeCellType4.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
+ dateTimeCellType4.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+ dateTimeCellType4.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+ dateTimeCellType4.TimeDefault = new System.DateTime(2020, 9, 8, 12, 47, 57, 76);
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType4;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "sdate";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "일자";
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+ this.fpSpread1_Sheet1.Columns.Get(0).Tag = "pdate";
+ this.fpSpread1_Sheet1.Columns.Get(0).Width = 71F;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType16;
this.fpSpread1_Sheet1.Columns.Get(1).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")";
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(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+ this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "uid";
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).Tag = "empno";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F;
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).CellType = textCellType3;
- this.fpSpread1_Sheet1.Columns.Get(3).DataField = "UserName";
+ textCellType18.ReadOnly = true;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType18;
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).Tag = "name";
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)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
- numberCellType1.MaximumValue = 999999999999999D;
- numberCellType1.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType1;
+ numberCellType19.MaximumValue = 999999999999999D;
+ numberCellType19.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType19;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "term";
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 = "dr";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
- numberCellType2.MaximumValue = 999999999999999D;
- numberCellType2.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType2;
+ numberCellType20.MaximumValue = 999999999999999D;
+ numberCellType20.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType20;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "CrTime";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(H)";
+ this.fpSpread1_Sheet1.Columns.Get(5).Tag = "drh";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType19;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "contents";
this.fpSpread1_Sheet1.Columns.Get(6).Label = "내용";
- this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- numberCellType3.MaximumValue = 999999999999999D;
- numberCellType3.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3;
- this.fpSpread1_Sheet1.Columns.Get(7).DataField = "termDr";
+ this.fpSpread1_Sheet1.Columns.Get(6).Width = 151F;
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType20;
+ this.fpSpread1_Sheet1.Columns.Get(7).DataField = "tag";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(7).Label = "발생(일)";
+ this.fpSpread1_Sheet1.Columns.Get(7).Label = "#";
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(7).Width = 40F;
this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- numberCellType4.MaximumValue = 999999999999999D;
- numberCellType4.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4;
- this.fpSpread1_Sheet1.Columns.Get(8).DataField = "DrTime";
+ numberCellType21.MaximumValue = 999999999999999D;
+ numberCellType21.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType21;
+ this.fpSpread1_Sheet1.Columns.Get(8).DataField = "termDr";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(8).Label = "발생(H)";
+ this.fpSpread1_Sheet1.Columns.Get(8).Label = "발생(일)";
+ this.fpSpread1_Sheet1.Columns.Get(8).Tag = "cr";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ numberCellType22.MaximumValue = 999999999999999D;
+ numberCellType22.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType22;
+ this.fpSpread1_Sheet1.Columns.Get(9).DataField = "DrTime";
+ this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(H)";
+ this.fpSpread1_Sheet1.Columns.Get(9).Tag = "crh";
+ 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)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ numberCellType23.DecimalPlaces = 1;
+ numberCellType23.MaximumValue = 999999999999999D;
+ numberCellType23.MinimumValue = -999999999999999D;
+ numberCellType23.ReadOnly = true;
+ this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType23;
+ this.fpSpread1_Sheet1.Columns.Get(10).Formula = "RC[2]+RC[-2]-RC[-6]";
+ this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(10).Label = "잔량(일)";
+ this.fpSpread1_Sheet1.Columns.Get(10).Tag = "jand";
+ 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)))));
+ this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType23;
+ 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 = "잔량(H)";
+ this.fpSpread1_Sheet1.Columns.Get(11).Tag = "janh";
+ 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)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+ numberCellType24.DecimalPlaces = 1;
+ numberCellType24.MaximumValue = 999999999999999D;
+ numberCellType24.MinimumValue = -999999999999999D;
+ numberCellType24.ReadOnly = true;
+ this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType24;
+ this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Gray;
+ this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(12).Label = "전일(일)";
+ this.fpSpread1_Sheet1.Columns.Get(12).Tag = "yjand";
+ 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)))));
+ this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType24;
+ 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 = "전일(H)";
+ this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjanh";
+ this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
+ this.fpSpread1_Sheet1.FrozenColumnCount = 1;
+ this.fpSpread1_Sheet1.LockBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+ this.fpSpread1_Sheet1.ShowEditingRowSelector = true;
+ this.fpSpread1_Sheet1.ShowRowSelector = true;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// bs
@@ -527,27 +568,106 @@
//
this.ta.ClearBeforeFill = true;
//
+ // taUser
+ //
+ this.taUser.ClearBeforeFill = true;
+ //
+ // cmO
+ //
+ this.cmO.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.cmO.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripMenuItem2,
+ this.toolStripSeparator2,
+ this.현재사원원장보기ToolStripMenuItem});
+ this.cmO.Name = "cm1";
+ this.cmO.Size = new System.Drawing.Size(307, 82);
+ //
+ // toolStripMenuItem2
+ //
+ this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripMenuItem3,
+ this.toolStripMenuItem4,
+ this.toolStripMenuItem5,
+ this.toolStripMenuItem6});
+ this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(306, 36);
+ this.toolStripMenuItem2.Text = "Column Size";
+ //
+ // toolStripMenuItem3
+ //
+ this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image")));
+ this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+ this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 36);
+ this.toolStripMenuItem3.Text = "Auto";
+ this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
+ //
+ // toolStripMenuItem4
+ //
+ this.toolStripMenuItem4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem4.Image")));
+ this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+ this.toolStripMenuItem4.Size = new System.Drawing.Size(149, 36);
+ this.toolStripMenuItem4.Text = "Reset";
+ this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
+ //
+ // toolStripMenuItem5
+ //
+ this.toolStripMenuItem5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem5.Image")));
+ this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+ this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 36);
+ this.toolStripMenuItem5.Text = "Save";
+ this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
+ //
+ // toolStripMenuItem6
+ //
+ this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
+ this.toolStripMenuItem6.Name = "toolStripMenuItem6";
+ this.toolStripMenuItem6.Size = new System.Drawing.Size(149, 36);
+ this.toolStripMenuItem6.Text = "Load";
+ this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(303, 6);
+ //
+ // 현재사원원장보기ToolStripMenuItem
+ //
+ 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);
+ //
+ // lbStt
+ //
+ this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.lbStt.ForeColor = System.Drawing.Color.Blue;
+ this.lbStt.Name = "lbStt";
+ this.lbStt.Size = new System.Drawing.Size(31, 28);
+ this.lbStt.Text = "기간";
+ this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
+ //
// fHolyday
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(984, 558);
+ this.ClientSize = new System.Drawing.Size(1162, 609);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
this.Name = "fHolyday";
this.Text = "출근부";
this.Load += new System.EventHandler(this.@__Load);
+ this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.fHolyday_KeyPress);
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
this.bn.ResumeLayout(false);
this.bn.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
- this.cm1.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+ this.cmO.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -557,9 +677,9 @@
private dsMSSQL dsMSSQL;
private System.Windows.Forms.BindingNavigator bn;
- private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;
+ private System.Windows.Forms.ToolStripButton btAdd;
private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
- private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem;
+ private System.Windows.Forms.ToolStripButton btDel;
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator;
@@ -569,17 +689,12 @@
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
private System.Windows.Forms.ToolStrip toolStrip1;
- private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripTextBox tbSD;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripTextBox tbED;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripLabel toolStripLabel3;
private System.Windows.Forms.ToolStripComboBox cmbUser;
- private System.Windows.Forms.ContextMenuStrip cm1;
- private System.Windows.Forms.ToolStripMenuItem autoResizeComlumnsToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem sendToMailToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripLabel toolStripLabel7;
private System.Windows.Forms.ToolStripLabel sbUse;
@@ -590,13 +705,22 @@
private FarPoint.Win.Spread.FpSpread fpSpread1;
private System.Windows.Forms.BindingSource bs;
private dsMSSQLTableAdapters.HolydayTableAdapter ta;
- private System.Windows.Forms.ToolStripButton toolStripButton2;
- private System.Windows.Forms.ToolStripButton toolStripButton3;
+ private System.Windows.Forms.ToolStripButton btSave;
private System.Windows.Forms.ToolStripButton toolStripButton4;
- private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripButton toolStripButton5;
private System.Windows.Forms.ToolStripLabel toolStripLabel4;
private System.Windows.Forms.ToolStripComboBox cmbGrp;
private System.Windows.Forms.ToolStripButton toolStripButton6;
+ private dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter taUser;
+ private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+ private System.Windows.Forms.ContextMenuStrip cmO;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripMenuItem 현재사원원장보기ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripLabel lbStt;
}
}
\ No newline at end of file
diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs
index d154595..3d5794a 100644
--- a/SubProject/FBS0000/Holiday/fHolyday.cs
+++ b/SubProject/FBS0000/Holiday/fHolyday.cs
@@ -14,9 +14,11 @@ namespace FBS0000
{
public partial class fHolyday : FCOMMON.fBase
{
+ string fn_fpcolsize = "";
public fHolyday()
{
InitializeComponent();
+ fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + "i.ini");
this.dsMSSQL.vHoliday_uselist.TableNewRow += Holyday_TableNewRow;
//this.dv1.CellFormatting += dv1_CellFormatting;
}
@@ -33,6 +35,12 @@ namespace FBS0000
private void __Load(object sender, EventArgs e)
{
+ //엔터키누르면 아래로 이동하게함ㄷ
+ 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);
+ im.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
+ im2.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
+
tbSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
tbED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
@@ -74,13 +82,18 @@ namespace FBS0000
if (curLevel >= 5)
{
//권한이 잇으므로 모든 사용자로 한다.
- cmbUser.SelectedIndex = 0;
+ if (cmbUser.Items.Count > 0)
+ cmbUser.SelectedIndex = 0;
+ btSave.Enabled = true;
+ btDel.Enabled = true;
+ btAdd.Enabled = true;
}
else
{
this.cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK);
this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다.
this.cmbGrp.Enabled = false;
+
}
RefreshData();
@@ -107,6 +120,7 @@ namespace FBS0000
return uid;
}
+ string seluid = string.Empty;
void RefreshData()
{
if (this.dsMSSQL.Holyday.GetChanges() != null)
@@ -116,13 +130,13 @@ namespace FBS0000
}
//update data
- string uid = GetUIDValue();
+ seluid = GetUIDValue();
var sd = DateTime.Parse(tbSD.Text + " 00:00:00");
var ed = DateTime.Parse(tbED.Text + " 23:59:59");
try
{
- this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, uid, FCOMMON.info.Login.gcode);
+ this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, FCOMMON.info.Login.gcode, seluid);
this.dsMSSQL.Holyday.AcceptChanges();
}
catch (Exception ex)
@@ -149,10 +163,33 @@ namespace FBS0000
if (janD < 0) sbJan.ForeColor = Color.Red;
else sbJan.ForeColor = Color.Blue;
- //색상변경
+ //현재그룹의 사용자 목록을 조호힌다.
+ taUser.Fill(this.dsMSSQL.EETGW_WorkTableUser, FCOMMON.info.Login.gcode, cmbGrp.Text);
+ //모든데이터의 성명을 표시해준다
+ var qta = new dsMSSQLTableAdapters.QueriesTableAdapter();
+ var col_name = this.fpSpread1.ActiveSheet.Columns["name"].Index;
+ var col_jand = this.fpSpread1.ActiveSheet.Columns["jand"].Index;
+ var col_yjand = this.fpSpread1.ActiveSheet.Columns["yjand"].Index;
+ var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index;
+ var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index;
+ for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
+ {
+ var drindex = this.fpSpread1.ActiveSheet.GetModelRowFromViewRow(i);
+ var dr = this.dsMSSQL.Holyday.Rows[drindex] as dsMSSQL.HolydayRow;
+ this.fpSpread1.ActiveSheet.Cells[i, col_name].Value = dr.UserName;
+
+ //이 사용자의 이전까지의 잔량을 가져온다
+ var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, dr.sdate.ToShortDateString());
+ var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, dr.uid, dr.sdate.ToShortDateString());
+ var jand = yjand + dr.termDr - dr.term;
+ var janh = yjanh + dr.DrTime - dr.CrTime;
+ this.fpSpread1.ActiveSheet.Cells[i, col_yjand].Value = yjand;
+ this.fpSpread1.ActiveSheet.Cells[i, col_yjanh].Value = yjanh;
+ //this.fpSpread1.ActiveSheet.Cells[i, col_jand].Value = jand;
+ //this.fpSpread1.ActiveSheet.Cells[i, col_janh].Value = janh;
+ }
- // this.dv1.AutoResizeColumns();
}
private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
@@ -172,12 +209,39 @@ namespace FBS0000
private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
{
- var f = new fHolyday_Add();
- f.TopMost = true;
- if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
- {
- RefreshData();
- }
+ var newdr = this.dsMSSQL.Holyday.NewHolydayRow();
+ if (this.cmbUser.SelectedIndex == 0) newdr.uid = FCOMMON.info.Login.no;
+ else newdr.uid = seluid;
+ newdr.gcode = FCOMMON.info.Login.gcode;
+ newdr.sdate = DateTime.Now;
+ newdr.edate = DateTime.Now;
+ newdr.contents = string.Empty;
+ newdr.wuid = FCOMMON.info.Login.no;
+ newdr.wdate = DateTime.Now;
+ this.dsMSSQL.Holyday.AddHolydayRow(newdr);
+ var rowindex = this.bs.Count - 1;
+
+ //잔액및 성명찾기
+ //모든데이터의 성명을 표시해준다
+ var qta = new dsMSSQLTableAdapters.QueriesTableAdapter();
+ var col_name = this.fpSpread1.ActiveSheet.Columns["name"].Index;
+ var col_jand = this.fpSpread1.ActiveSheet.Columns["jand"].Index;
+ var col_yjand = this.fpSpread1.ActiveSheet.Columns["yjand"].Index;
+ var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index;
+ var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index;
+
+ var drUser= this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault();
+ var username = drUser == null ? string.Empty : drUser.name;
+ fpSpread1.ActiveSheet.Cells[rowindex, col_name].Value = username;
+
+ //이 사용자의 이전까지의 잔량을 가져온다
+ var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, this.seluid, newdr.sdate.ToShortDateString());
+ var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, newdr.sdate.ToShortDateString());
+ //var jand = yjand + dr.termDr - dr.term;
+ //var janh = yjanh + dr.DrTime - dr.CrTime;
+ this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjand].Value = yjand;
+ this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjanh].Value = yjanh;
+
}
private void autoResizeComlumnsToolStripMenuItem_Click(object sender, EventArgs e)
@@ -288,7 +352,9 @@ namespace FBS0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
- var f = new WorkTable(tbSD.Text, tbED.Text, this.cmbGrp.Text);
+ var sd = DateTime.Now.ToString("yyyy-MM-01");
+ var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
+ var f = new WorkTable(sd, ed, this.cmbGrp.Text);
f.ShowDialog();
}
@@ -301,5 +367,138 @@ namespace FBS0000
{
this.bs.RemoveCurrent();
}
+
+ private void fHolyday_KeyPress(object sender, KeyPressEventArgs e)
+ {
+
+ }
+
+ private void fpSpread1_KeyDown(object sender, KeyEventArgs e)
+ {
+
+ }
+
+ private void fpSpread1_EditModeOff(object sender, EventArgs e)
+ {
+
+ var cell = this.fpSpread1.ActiveSheet.ActiveCell;
+ if (cell.Column.Tag != null && cell.Column.Tag.ToString() == "pdate")
+ {
+ //날짜가 바뀌면 전일잔액을 바꿔야한다
+ var pdate = ((DateTime)cell.Value).ToString("yyyy-MM-dd");
+ var empno = fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["empno"].Index].Value.ToString();
+ var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();
+ var jand = ta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, empno, pdate);
+ var janh = ta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, empno, pdate);
+
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["yjand"].Index].Value = jand;
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["yjanh"].Index].Value = janh;
+ }
+ else if (cell.Column.Tag != null && cell.Column.Tag.ToString() == "empno")
+ {
+
+ //입력을 새로 했으므로 데이터를 조회해서 이름을 자동 설정 해준다.
+ var pdate = ((DateTime)(fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["pdate"].Index].Value)).ToString("yyyy-MM-dd");
+ var empno = fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["empno"].Index].Value.ToString();
+ var users = this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno.Contains(empno) || t.name.Contains(empno)).ToList();
+ if (users.Count == 1)
+ {
+ var dr = users.FirstOrDefault();
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["name"].Index].Value = dr.name;
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["empno"].Index].Value = dr.empno;
+ fpSpread1.ActiveSheet.ActiveColumnIndex = fpSpread1.ActiveSheet.Columns["dr"].Index;
+ empno = dr.empno;
+
+ //전일잔액표시
+ var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();
+ var jand = ta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, empno, pdate);
+ var janh = ta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, empno, pdate);
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["yjand"].Index].Value = jand;
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["yjanh"].Index].Value = janh;
+
+ }
+ else if (users.Count == 0)
+ {
+ FCOMMON.Util.MsgE("입력값({0})에 해당하는 사원번호/이름이 없습니다", empno);
+ fpSpread1.ActiveSheet.ActiveColumnIndex = fpSpread1.ActiveSheet.Columns["empno"].Index;
+ }
+ else
+ {
+ //lov
+ var flov = new fLovWorkUser(users);
+ if (flov.ShowDialog() == DialogResult.OK)
+ {
+ //전일잔액표시
+ var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();
+ var jand = ta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, flov.dr.empno, pdate);
+ var janh = ta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, flov.dr.empno, pdate);
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["yjand"].Index].Value = jand;
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["yjanh"].Index].Value = janh;
+
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["name"].Index].Value = flov.dr.name;
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["empno"].Index].Value = flov.dr.empno;
+ fpSpread1.ActiveSheet.ActiveColumnIndex = fpSpread1.ActiveSheet.Columns["dr"].Index;
+ }
+ else
+ {
+ fpSpread1.ActiveSheet.Cells[cell.Row.Index, fpSpread1.ActiveSheet.Columns["name"].Index].Value = "?";
+ fpSpread1.ActiveSheet.ActiveColumnIndex = fpSpread1.ActiveSheet.Columns["dr"].Index;
+ }
+ }
+ }
+ }
+
+ private void fpSpread1_CellClick(object sender, FarPoint.Win.Spread.CellClickEventArgs e)
+ {
+
+ }
+
+ private void toolStripMenuItem5_Click(object sender, EventArgs e)
+ {
+ FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize);
+ }
+
+ private void toolStripMenuItem6_Click(object sender, EventArgs e)
+ {
+ FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
+ }
+
+ private void toolStripMenuItem3_Click(object sender, EventArgs e)
+ {
+ this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true;
+
+ for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
+ this.fpSpread1.ActiveSheet.SetRowHeight(i, 25);
+ }
+
+ private void toolStripMenuItem4_Click(object sender, EventArgs e)
+ {
+ foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns)
+ {
+ col.Width = 100;
+ }
+ }
+
+
+ private void 현재사원원장보기ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var drv = this.bs.Current as DataRowView;
+ var dr = drv.Row as dsMSSQL.HolydayRow;
+ this.tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
+ this.tbED.Text = DateTime.Now.Year.ToString("0000") + "-12-31";
+ var username = string.Format("[{0}] {1}",dr.uid,dr.UserName);
+ this.cmbUser.Text = username;
+ RefreshData();
+ }
+
+ private void lbStt_Click(object sender, EventArgs e)
+ {
+ var f = new FCOMMON.fSelectMonth();
+ if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
+ var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
+ tbSD.Text = sdDate.ToShortDateString();
+ tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
+ this.RefreshData();
+ }
}
}
diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx
index da8c4e5..fd80762 100644
--- a/SubProject/FBS0000/Holiday/fHolyday.resx
+++ b/SubProject/FBS0000/Holiday/fHolyday.resx
@@ -161,7 +161,7 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
@@ -173,19 +173,7 @@
rkJggg==
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
- pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
- Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
- /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
- zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
- IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
- rkJggg==
-
-
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
@@ -197,7 +185,7 @@
bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE1SURBVDhPY/hPIQAbcOn57//T915BwW1rjoFx/oJz//N6
@@ -211,43 +199,40 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ7SURBVDhPjZNtSBNxHMd7Ib2uV72KWursRQQRRe+CglCU
- 6IGCiB7EqfQqarIso5FBQb0IJCofkOWSLE2bT5uGbrN5hw8XbRNbeuqWuuZcyra77nQb3/53y7OxvfAP
- H47/we/7/9z37rZJi2GY/KFnGgxWFqC/eD/IraNbZK80fJCmaW6UdoCh7bBcy0M8Ht8Scoher99uMpmu
- 9z0px3BdOSxX8yAIQgo8z4PjOIVIJIJYLJYMSDWwwXxZnRawEbJBNBrF+vp6qoH5UTkctWUwX1JDFEWZ
- e80+VBp9uEPQNXmhM3hRQZAslADFgEoa9FxUY21tTUYaNtqCaCK8sQZhGAziVuOcHCBZpRj0VJfhy8tS
- dF/IldMl/j9VSwZvN7C4Wc/KHYTD4URGg85zuXJBUoAoCrC7fGijpmCw+vDOsYheZh6rv5ewsrLCkYDD
- mwb6Ugy90KDzbM6/YRFNA9PoZpYw/YvHXEjEyEwElm/L6BudRSgUytABZYPpdLYcIHXwgfJjciGKUe8f
- ULM8hgluv4iWIS+cTieysrKOKQZd9zWw15SgozBbKbFxwAs2KIKa4eBgOQx4omB+inhrX0AgEEg3GCcG
- 7QX7lBJbyDNPLvKwTyWHJcbnRdT1/kj/ErvulsD6vBjtpzYDbE4/RtgIvpIh2itgjJze5Yyi1tiJecac
- 2aDtpAqJREJ+E8urPOjvQbSSLt4P+9HQP4dXxl64LQ0YqyuDrmhPlWyg1WpVzYUH0HHlCFpPqMCyLDwe
- DyYmJuByueTC3G63fLV/fI2R+huY7avBp+p8gVgkV3HOjuMPDu16WKLeqSHbTL+uQkXR7qrPj8+L/U/P
- 4C8G28iAvxi6KAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqqsoU2cXEUQU3QUFoSjR
+ BwURfYhz0lXUxCyjkV0EdRFIVM4h5pIsTZlT9xFzO7YP/DjRPrClR7elWzqXwnZOO9scT+85y2PDXfjC
+ j8N74P+8v/Occ3YIi6bpirHncow2VcJccxDk1vFtsl8YPuxwONgJlx20i4LxRjnW19e3hRiiUql26nS6
+ m6an9XCo62G8Xo5kMpkHx3FgWVYiHo8jk8nkAvINbDBclW0J2AjZIJFIIJ1O5xsYntTD3qaA4YoMPM+L
+ POgOoUkbwj1CY1cQjZ1BNBAECylAMnDmDIYvy5BKpUSEYa0tii7CW2sUnaNR3OkIiAGCVZ7BcIsCX17V
+ YehSmZgu8P+pSjJ4V8PgdjsjdhAOh7MFDQYvlIkFCQE8nwTlCaHPOYNOawjv7WGM0AtY+72M1dVVlgQc
+ 3TRQ1WHspRyD50v/DfPossxiiF7G7C8OgRiP8bk4jN9WYJqYRywWK9CB0wbd2RIxQOjgozOC6cUEJoJ/
+ 4Jzn4CB4Izx6xoJwu90oKio6IRnoH8pBtdZioKpEKrHDEgQT5eGcY2FnWFj8CdA/ebyjFrG0tLTVYIoY
+ 9FcekErsIc88HeZAzeSGBaYWeKhHfmz9EvX3a2F9UYP+M5sBNncE40wcX8mQK5jEJDld706gTTuIBdpQ
+ 2KDvdDGy2az4JlbWOLi+R9FLuvjgiEBjDuC1dgReowaTagUaq/c1iwZKpbK4u+oQBq4dQ++pYjAMA7/f
+ D5/PB4/HIxbm9XrFK/XpDcbbb2He1IqBlookscitmtJdJx8d2fO4VrZbTraFfl2Jhuq9zZ9VF3nzs3P4
+ C1QYyCost3OuAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ7SURBVDhPjZNbSFNxHMd7GD3XU09RS509RBBR9BYUhKJE
- Fwoiusim0lPUxCyjkRFBPQQSlRdkbUmWpszbpqFuNs/wcsJdsKXHXVLXnGvKdk47cxvf/ucsjw334B8+
- HP4Hft//53zPOTuERdN00egLFYZrijFYdhDk1vFtsl8YPkxRFDths4K2WWC6UYhUKrUtxBCNRrPTYDDc
- HHhWibHGSpiuFyIej2fBcRxYlpWIRqNIJpOZgGwDM4xXFVsCNkI2iMViWF9fzzYwPqmEtaECxisK8Dwv
- 8qDVjxq9H/cI1TofqrU+VBEECylAMqAyBn2XFUgkEiLCsN4cgo7wbiQE7XAId1q8YoBglWXQV1eBr6/L
- 0XupQEwX+P9UNRm828zgdhMjdrC2tpbOadB9oUAsSAjg+TgsDj86qFloR/z4YF1CP72A1d/LiEQiLAk4
- ummgKcfoKxW6z+f/G+ahG5pDL72MuV8cvGEe4/NRmKZXMDDhQTgcztEBZYbhbJ4YIHTwiQpgZjGGCd8f
- UB4OYwRngEfbqA92ux0ymeyEZNDzUAVLvRJdJXlSiS1DPjAhHtQ8CyvDYsgdA/2Tx3vLIoLB4FaDKWLQ
- WXxAKrGNPPPMEgfLbGZYYGqBR2P/j61fYs99JUZelqHzzGaA2R7AOBPFNzJk88UxSU7vscfQoO/GAm3M
- bdBxWo50Oi2+iZVVDrbvIbSTLj6OBdA86MUbfT+cpmZMNlagunRfrWigVqvlrSWH0HXtGNpPycEwDNxu
- N1wuFxwOh1iY0+kUr5bPbzHedAuegXp01RXFiUVmleXvOvnoyJ7HSsVuFdnm+nUlqkr31n55epEffH4O
- fwHQEchmrws3yAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7GF3XVVdRS51dRBBRdBcUhKJE
+ HxRE9CHOja6iJmYZjewiqItAonKKrC3J0hzbdJuGutk+cHqifWBLj7rlXDqXwnZOO9ONp/ec5bHhLnzh
+ x+E98H/e33nOOTv4RVFUxehzOYYbKzFYcxDk1vFtsp8fPuxyuRivxwnK44DtRjmy2ey2EELUavVOo9F4
+ c+CpEi6NErbr5Uin0wWwLAuGYUSSySTW19fzAYUGdlivyrYEbIRskEqlsLa2VmhgfaKEs1UB6xUZOI4T
+ eNAZQaM+gnuEBl0YDdow6gm8hRggGrjzBv2XZchkMgL8sN4eh47wdiQO7XAcdzrmhADeqsCgv1mBL6/q
+ 0HepTEjn+f9UFRm8207jdhstdBCNRnNFDUwXyoSC+ACOS8Phj6DHPQXtSATvnQuwUPNY/b2ElZUVhgQc
+ 3TRQ12H0pRym86X/hjnohqbRRy1h+heLuQSHsZkkbN+WMeCdRSKRKNKB2w7j2RIhgO/gozuGyWgK3vAf
+ uGdZuAiBGIeu0TB8Ph8kEskJ0cD8UA5HSy0MVSViiR1DYdBxDu4ZBk6awVAoBeonh3eOKBYXF7caTBCD
+ 3soDYold5JknF1g4pvLDPBPzHDSWH1u/RPP9Woy8qEHvmc0Auy+GMTqJr2TIE05jnJxu9qXQqjdhnrIW
+ N+g5LUUulxPexPIqC8/3OLpJFx9cMbQPzuG13oKArR3jGgUaqvc1CQYqlUraWXUIhmvH0H1KCpqmEQqF
+ EAwG4ff7hcICgYBwdXx6g7G2W5gdaIGhuSJNLPKrpnTXyUdH9jyule2Wk22xX1ekvnpv02f1RW7w2Tn8
+ BU0oyCcGs6xoAAAAAElFTkSuQmCC
17, 17
-
- 294, 17
-
188, 17
@@ -266,23 +251,68 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-
- 647, 17
+
+ 659, 17
-
+
+ 507, 17
+
+
AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
- AAD///////////////8A/////ws=
+ AAD/////AQgAAP////8AAQgAAAs=
- 521, 17
+ 294, 17
- 585, 17
+ 358, 17
+
+ 420, 17
+
+
+
+ R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
+ 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg
+ wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO
+ GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE
+ pRQTK6YYEAA7
+
+
+
+
+ R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R
+ PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg
+ oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX
+ dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7
+
+
+
+
+ R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
+ e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw
+ QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK
+ HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC
+ un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs=
+
+
+
+
+ R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7
+ 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ
+ IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj
+ SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG
+ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
+
+
\ No newline at end of file
diff --git a/SubProject/FBS0000/Holiday/fHolydayJobReport.cs b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs
index 4463f9d..33dd71f 100644
--- a/SubProject/FBS0000/Holiday/fHolydayJobReport.cs
+++ b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs
@@ -43,6 +43,9 @@ namespace FBS0000
if (curLevel >= 5)
{
//권한이 잇으므로 모든 사용자로 한다.
+ if (cmbUser.Items.Count > 0)
+ cmbUser.SelectedIndex = 0;
+
}
else
{
diff --git a/SubProject/FBS0000/Holiday/fWorkTableUser.Designer.cs b/SubProject/FBS0000/Holiday/fWorkTableUser.Designer.cs
index d55e7f0..0a42b17 100644
--- a/SubProject/FBS0000/Holiday/fWorkTableUser.Designer.cs
+++ b/SubProject/FBS0000/Holiday/fWorkTableUser.Designer.cs
@@ -30,14 +30,13 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fWorkTableUser));
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
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.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -308,6 +307,7 @@
//
// fpSpread1
//
+ this.fpSpread1.AccessibleDescription = "";
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fpSpread1.Location = new System.Drawing.Point(0, 31);
this.fpSpread1.Name = "fpSpread1";
@@ -322,34 +322,31 @@
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
- this.fpSpread1_Sheet1.ColumnCount = 8;
+ this.fpSpread1_Sheet1.ColumnCount = 7;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+ this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 32F;
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
+ this.fpSpread1_Sheet1.Columns.Get(0).DataField = "grp";
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType1.MaximumValue = 2147483647D;
numberCellType1.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
- this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
- this.fpSpread1_Sheet1.Columns.Get(1).DataField = "gcode";
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType1;
+ this.fpSpread1_Sheet1.Columns.Get(1).DataField = "seq";
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
- this.fpSpread1_Sheet1.Columns.Get(2).DataField = "grp";
+ this.fpSpread1_Sheet1.Columns.Get(2).DataField = "grade";
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "empno";
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "name";
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5;
- this.fpSpread1_Sheet1.Columns.Get(5).DataField = "grade";
+ this.fpSpread1_Sheet1.Columns.Get(5).DataField = "indate";
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6;
- this.fpSpread1_Sheet1.Columns.Get(6).DataField = "wuid";
- 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(2020, 9, 3, 21, 28, 15, 133);
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = dateTimeCellType1;
- this.fpSpread1_Sheet1.Columns.Get(7).DataField = "wdate";
+ this.fpSpread1_Sheet1.Columns.Get(6).DataField = "email";
this.fpSpread1_Sheet1.DataSource = this.bs;
+ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// fWorkTableUser
diff --git a/SubProject/FBS0000/Holiday/fWorkTableUser.resx b/SubProject/FBS0000/Holiday/fWorkTableUser.resx
index 8ff4a37..2cfd58d 100644
--- a/SubProject/FBS0000/Holiday/fWorkTableUser.resx
+++ b/SubProject/FBS0000/Holiday/fWorkTableUser.resx
@@ -238,14 +238,4 @@
647, 17
-
-
- AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
- cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
- cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
- AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
- K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
- AAD/////AQgAAP////8AAQgAAAs=
-
-
\ No newline at end of file
diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs
index 5bc045b..53c59db 100644
--- a/SubProject/FBS0000/dsMSSQL.Designer.cs
+++ b/SubProject/FBS0000/dsMSSQL.Designer.cs
@@ -1315,6 +1315,8 @@ namespace FBS0000 {
private global::System.Data.DataColumn columnUserName;
+ private global::System.Data.DataColumn columntag;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public HolydayDataTable() {
@@ -1508,6 +1510,14 @@ namespace FBS0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public global::System.Data.DataColumn tagColumn {
+ get {
+ return this.columntag;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1564,7 +1574,8 @@ namespace FBS0000 {
string gcode,
double DrTime,
double CrTime,
- string UserName) {
+ string UserName,
+ string tag) {
HolydayRow rowHolydayRow = ((HolydayRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1586,7 +1597,8 @@ namespace FBS0000 {
gcode,
DrTime,
CrTime,
- UserName};
+ UserName,
+ tag};
rowHolydayRow.ItemArray = columnValuesArray;
this.Rows.Add(rowHolydayRow);
return rowHolydayRow;
@@ -1636,6 +1648,7 @@ namespace FBS0000 {
this.columnDrTime = base.Columns["DrTime"];
this.columnCrTime = base.Columns["CrTime"];
this.columnUserName = base.Columns["UserName"];
+ this.columntag = base.Columns["tag"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1681,6 +1694,8 @@ namespace FBS0000 {
base.Columns.Add(this.columnCrTime);
this.columnUserName = new global::System.Data.DataColumn("UserName", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUserName);
+ this.columntag = new global::System.Data.DataColumn("tag", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columntag);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1703,6 +1718,7 @@ namespace FBS0000 {
this.columngcode.MaxLength = 10;
this.columnUserName.ReadOnly = true;
this.columnUserName.MaxLength = 200;
+ this.columntag.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2495,6 +2511,8 @@ namespace FBS0000 {
private global::System.Data.DataColumn columnindate;
+ private global::System.Data.DataColumn columnemail;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public EETGW_WorkTableUserDataTable() {
@@ -2608,6 +2626,14 @@ namespace FBS0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public global::System.Data.DataColumn emailColumn {
+ get {
+ return this.columnemail;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2645,7 +2671,7 @@ namespace FBS0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
- public EETGW_WorkTableUserRow AddEETGW_WorkTableUserRow(string gcode, string grp, int seq, string grade, string empno, string name, string wuid, System.DateTime wdate, string indate) {
+ public EETGW_WorkTableUserRow AddEETGW_WorkTableUserRow(string gcode, string grp, int seq, string grade, string empno, string name, string wuid, System.DateTime wdate, string indate, string email) {
EETGW_WorkTableUserRow rowEETGW_WorkTableUserRow = ((EETGW_WorkTableUserRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -2657,7 +2683,8 @@ namespace FBS0000 {
name,
wuid,
wdate,
- indate};
+ indate,
+ email};
rowEETGW_WorkTableUserRow.ItemArray = columnValuesArray;
this.Rows.Add(rowEETGW_WorkTableUserRow);
return rowEETGW_WorkTableUserRow;
@@ -2697,6 +2724,7 @@ namespace FBS0000 {
this.columnwuid = base.Columns["wuid"];
this.columnwdate = base.Columns["wdate"];
this.columnindate = base.Columns["indate"];
+ this.columnemail = base.Columns["email"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2722,6 +2750,8 @@ namespace FBS0000 {
base.Columns.Add(this.columnwdate);
this.columnindate = new global::System.Data.DataColumn("indate", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnindate);
+ this.columnemail = new global::System.Data.DataColumn("email", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnemail);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -2740,6 +2770,7 @@ namespace FBS0000 {
this.columnwuid.MaxLength = 20;
this.columnwdate.AllowDBNull = false;
this.columnindate.MaxLength = 10;
+ this.columnemail.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3504,7 +3535,7 @@ namespace FBS0000 {
public double term {
get {
if (this.IstermNull()) {
- return 1D;
+ return 0D;
}
else {
return ((double)(this[this.tableHolyday.termColumn]));
@@ -3724,6 +3755,22 @@ namespace FBS0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public string tag {
+ get {
+ if (this.IstagNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableHolyday.tagColumn]));
+ }
+ }
+ set {
+ this[this.tableHolyday.tagColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IscateNull() {
@@ -3915,6 +3962,18 @@ namespace FBS0000 {
public void SetUserNameNull() {
this[this.tableHolyday.UserNameColumn] = global::System.Convert.DBNull;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public bool IstagNull() {
+ return this.IsNull(this.tableHolyday.tagColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public void SettagNull() {
+ this[this.tableHolyday.tagColumn] = global::System.Convert.DBNull;
+ }
}
///
@@ -4296,6 +4355,22 @@ namespace FBS0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public string email {
+ get {
+ if (this.IsemailNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableEETGW_WorkTableUser.emailColumn]));
+ }
+ }
+ set {
+ this[this.tableEETGW_WorkTableUser.emailColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsgrpNull() {
@@ -4367,6 +4442,18 @@ namespace FBS0000 {
public void SetindateNull() {
this[this.tableEETGW_WorkTableUser.indateColumn] = global::System.Convert.DBNull;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public bool IsemailNull() {
+ return this.IsNull(this.tableEETGW_WorkTableUser.emailColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public void SetemailNull() {
+ this[this.tableEETGW_WorkTableUser.emailColumn] = global::System.Convert.DBNull;
+ }
}
///
@@ -5994,133 +6081,115 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
tableMapping.ColumnMappings.Add("DrTime", "DrTime");
tableMapping.ColumnMappings.Add("CrTime", "CrTime");
tableMapping.ColumnMappings.Add("UserName", "UserName");
+ tableMapping.ColumnMappings.Add("tag", "tag");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
- this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)))";
+ this._adapter.DeleteCommand.CommandText = "DELETE FROM Holyday\r\nWHERE (idx = @Original_idx)";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_result", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_term", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_term", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_title", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_mail", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_mailsend", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_termDr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
- this._adapter.InsertCommand.CommandText = @"INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime);
-SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid";
+ this._adapter.InsertCommand.CommandText = @"INSERT INTO Holyday
+ (cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, tag)
+VALUES (@cate,@result,@sdate,@edate,@term,@title,@contents,@uid,@tolist,@mail,@mailsend,@reason,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag);
+SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CrTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
- this._adapter.UpdateCommand.CommandText = "UPDATE [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate" +
- "] = @edate, [term] = @term, [title] = @title, [contents] = @contents, [uid] = @u" +
- "id, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reas" +
- "on, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr, [gcode] = @gcode, [DrT" +
- "ime] = @DrTime, [CrTime] = @CrTime WHERE (([idx] = @Original_idx) AND ((@IsNull_" +
- "cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result " +
- "= 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate " +
- "= 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1" +
- " AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND" +
- " [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [titl" +
- "e] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS N" +
- "ULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR (" +
- "[mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR " +
- "([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = " +
- "@Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @" +
- "Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [" +
- "DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND " +
- "[CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)));\r\nSELECT idx, cate, result," +
- " sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid," +
- " wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Hol" +
- "yday WHERE (idx = @idx) ORDER BY sdate, edate, uid";
+ this._adapter.UpdateCommand.CommandText = "UPDATE Holyday\r\nSET cate = @cate, result = @result, sdate = @sdate, edate " +
+ "= @edate, term = @term, title = @title, contents = @contents, uid = @uid, tolist" +
+ " = @tolist, mail = @mail, mailsend = @mailsend, \r\n reason = @reaso" +
+ "n, wuid = @wuid, wdate = @wdate, termDr = @termDr, gcode = @gcode, DrTime = @DrT" +
+ "ime, CrTime = @CrTime, tag = @tag\r\nWHERE (idx = @Original_idx) AND (@IsNull_cat" +
+ "e = 1 AND cate IS NULL OR\r\n cate = @Original_cate) AND (@IsNull_re" +
+ "sult = 1 AND result IS NULL OR\r\n result = @Original_result) AND (@" +
+ "IsNull_sdate = 1 AND sdate IS NULL OR\r\n sdate = @Original_sdate) A" +
+ "ND (@IsNull_edate = 1 AND edate IS NULL OR\r\n edate = @Original_eda" +
+ "te) AND (@IsNull_term = 1 AND term IS NULL OR\r\n term = @Original_t" +
+ "erm) AND (@IsNull_title = 1 AND title IS NULL OR\r\n title = @Origin" +
+ "al_title) AND (@IsNull_uid = 1 AND uid IS NULL OR\r\n uid = @Origina" +
+ "l_uid) AND (@IsNull_mail = 1 AND mail IS NULL OR\r\n mail = @Origina" +
+ "l_mail) AND (@IsNull_mailsend = 1 AND mailsend IS NULL OR\r\n mailse" +
+ "nd = @Original_mailsend) AND (wuid = @Original_wuid) AND (wdate = @Original_wdat" +
+ "e) AND (@IsNull_termDr = 1 AND termDr IS NULL OR\r\n termDr = @Origi" +
+ "nal_termDr) AND (gcode = @Original_gcode) AND (@IsNull_DrTime = 1 AND DrTime IS " +
+ "NULL OR\r\n DrTime = @Original_DrTime) AND (@IsNull_CrTime = 1 AND C" +
+ "rTime IS NULL OR\r\n CrTime = @Original_CrTime) AND (@IsNull_tag = 1" +
+ " AND tag IS NULL OR\r\n tag = @Original_tag); \r\nSELECT idx, cate, re" +
+ "sult, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, " +
+ "wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, ta" +
+ "g FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CrTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_result", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_term", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_term", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_title", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_mail", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_mailsend", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mailsend", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_termDr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_termDr", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DrTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CrTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6136,19 +6205,19 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
- this._commandCollection[0].CommandText = @"SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName
+ this._commandCollection[0].CommandText = @"SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag
FROM Holyday
-WHERE (sdate >= @sd) AND (edate <= @ed) AND (wuid LIKE @uid) AND (gcode = @gcode)
+WHERE (sdate >= @sd) AND (edate <= @ed) AND (gcode = @gcode) AND (uid LIKE @uid)
ORDER BY sdate, edate, uid";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = @"SELECT Holyday.idx, Holyday.cate, Holyday.result, Holyday.sdate, Holyday.edate, Holyday.term, Holyday.title, Holyday.contents, Holyday.uid, Holyday.tolist, Holyday.mail, Holyday.mailsend,
- Holyday.reason, Holyday.wuid, Holyday.wdate, Holyday.termDr, Holyday.gcode, Holyday.DrTime, Holyday.CrTime, dbo.getUserName(Holyday.uid) AS UserName
+ Holyday.reason, Holyday.wuid, Holyday.wdate, Holyday.termDr, Holyday.gcode, Holyday.DrTime, Holyday.CrTime, dbo.getUserName(Holyday.uid) AS UserName, Holyday.tag
FROM Holyday LEFT OUTER JOIN
EETGW_WorkTableUser ON Holyday.gcode = EETGW_WorkTableUser.gcode AND Holyday.uid = EETGW_WorkTableUser.empno
WHERE (Holyday.sdate >= @sd) AND (Holyday.edate <= @ed) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp)
@@ -6162,7 +6231,8 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = "SELECT CrTime, DrTime, cate, contents, edate, gcode, idx, mail, mailsend, reason" +
", result, sdate, term, termDr, title, tolist, uid, wdate, wuid, dbo.getUserName(" +
- "uid) AS UserName\r\nFROM Holyday\r\nWHERE (gcode = @gcode) AND (idx = @idx)";
+ "uid) AS UserName, tag\r\nFROM Holyday\r\nWHERE (gcode = @gcode) AND (idx = @idx" +
+ ")";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -6172,7 +6242,7 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
- public virtual int Fill(dsMSSQL.HolydayDataTable dataTable, string sd, string ed, string uid, string gcode) {
+ public virtual int Fill(dsMSSQL.HolydayDataTable dataTable, string sd, string ed, string gcode, string uid) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -6186,17 +6256,17 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(ed));
}
- if ((uid == null)) {
- throw new global::System.ArgumentNullException("uid");
- }
- else {
- this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
- }
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
- this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
+ this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode));
+ }
+ if ((uid == null)) {
+ this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
@@ -6209,7 +6279,7 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
- public virtual dsMSSQL.HolydayDataTable GetData(string sd, string ed, string uid, string gcode) {
+ public virtual dsMSSQL.HolydayDataTable GetData(string sd, string ed, string gcode, string uid) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -6223,17 +6293,17 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(ed));
}
- if ((uid == null)) {
- throw new global::System.ArgumentNullException("uid");
- }
- else {
- this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
- }
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
- this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
+ this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode));
+ }
+ if ((uid == null)) {
+ this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid));
}
dsMSSQL.HolydayDataTable dataTable = new dsMSSQL.HolydayDataTable();
this.Adapter.Fill(dataTable);
@@ -6383,133 +6453,8 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
- public virtual int Delete(
- int Original_idx,
- string Original_cate,
- string Original_result,
- global::System.Nullable Original_sdate,
- global::System.Nullable Original_edate,
- global::System.Nullable Original_term,
- string Original_title,
- string Original_uid,
- global::System.Nullable Original_mail,
- global::System.Nullable Original_mailsend,
- string Original_wuid,
- System.DateTime Original_wdate,
- global::System.Nullable Original_termDr,
- string Original_gcode,
- global::System.Nullable Original_DrTime,
- global::System.Nullable Original_CrTime) {
+ public virtual int Delete(int Original_idx) {
this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
- if ((Original_cate == null)) {
- this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_cate));
- }
- if ((Original_result == null)) {
- this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_result));
- }
- if ((Original_sdate.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[6].Value = ((System.DateTime)(Original_sdate.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value;
- }
- if ((Original_edate.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[8].Value = ((System.DateTime)(Original_edate.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value;
- }
- if ((Original_term.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[10].Value = ((double)(Original_term.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value;
- }
- if ((Original_title == null)) {
- this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_title));
- }
- if ((Original_uid == null)) {
- this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_uid));
- }
- if ((Original_mail.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[16].Value = ((bool)(Original_mail.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value;
- }
- if ((Original_mailsend.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[18].Value = ((bool)(Original_mailsend.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value;
- }
- if ((Original_wuid == null)) {
- throw new global::System.ArgumentNullException("Original_wuid");
- }
- else {
- this.Adapter.DeleteCommand.Parameters[19].Value = ((string)(Original_wuid));
- }
- this.Adapter.DeleteCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate));
- if ((Original_termDr.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[22].Value = ((double)(Original_termDr.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value;
- }
- if ((Original_gcode == null)) {
- throw new global::System.ArgumentNullException("Original_gcode");
- }
- else {
- this.Adapter.DeleteCommand.Parameters[23].Value = ((string)(Original_gcode));
- }
- if ((Original_DrTime.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[25].Value = ((double)(Original_DrTime.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[25].Value = global::System.DBNull.Value;
- }
- if ((Original_CrTime.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[27].Value = ((double)(Original_CrTime.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[27].Value = global::System.DBNull.Value;
- }
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -6533,8 +6478,8 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
public virtual int Insert(
string cate,
string result,
- global::System.Nullable sdate,
- global::System.Nullable edate,
+ string sdate,
+ string edate,
global::System.Nullable term,
string title,
string contents,
@@ -6548,7 +6493,8 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
global::System.Nullable termDr,
string gcode,
global::System.Nullable DrTime,
- global::System.Nullable CrTime) {
+ global::System.Nullable CrTime,
+ string tag) {
if ((cate == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -6561,17 +6507,17 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
else {
this.Adapter.InsertCommand.Parameters[1].Value = ((string)(result));
}
- if ((sdate.HasValue == true)) {
- this.Adapter.InsertCommand.Parameters[2].Value = ((System.DateTime)(sdate.Value));
- }
- else {
+ if ((sdate == null)) {
this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value;
}
- if ((edate.HasValue == true)) {
- this.Adapter.InsertCommand.Parameters[3].Value = ((System.DateTime)(edate.Value));
+ else {
+ this.Adapter.InsertCommand.Parameters[2].Value = ((string)(sdate));
+ }
+ if ((edate == null)) {
+ this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value;
+ this.Adapter.InsertCommand.Parameters[3].Value = ((string)(edate));
}
if ((term.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[4].Value = ((double)(term.Value));
@@ -6652,6 +6598,12 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
else {
this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value;
}
+ if ((tag == null)) {
+ this.Adapter.InsertCommand.Parameters[18].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[18].Value = ((string)(tag));
+ }
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -6675,8 +6627,8 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
public virtual int Update(
string cate,
string result,
- global::System.Nullable sdate,
- global::System.Nullable edate,
+ string sdate,
+ string edate,
global::System.Nullable term,
string title,
string contents,
@@ -6691,11 +6643,12 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
string gcode,
global::System.Nullable DrTime,
global::System.Nullable CrTime,
+ string tag,
int Original_idx,
string Original_cate,
string Original_result,
- global::System.Nullable Original_sdate,
- global::System.Nullable Original_edate,
+ string Original_sdate,
+ string Original_edate,
global::System.Nullable Original_term,
string Original_title,
string Original_uid,
@@ -6707,6 +6660,7 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
string Original_gcode,
global::System.Nullable Original_DrTime,
global::System.Nullable Original_CrTime,
+ string Original_tag,
int idx) {
if ((cate == null)) {
this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -6720,17 +6674,17 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
else {
this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(result));
}
- if ((sdate.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[2].Value = ((System.DateTime)(sdate.Value));
- }
- else {
+ if ((sdate == null)) {
this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
}
- if ((edate.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[3].Value = ((System.DateTime)(edate.Value));
+ else {
+ this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(sdate));
+ }
+ if ((edate == null)) {
+ this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(edate));
}
if ((term.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[4].Value = ((double)(term.Value));
@@ -6811,117 +6765,131 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
else {
this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
}
- this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx));
- if ((Original_cate == null)) {
- this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
+ if ((tag == null)) {
+ this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_cate));
+ this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(tag));
+ }
+ this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_idx));
+ if ((Original_cate == null)) {
+ this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_cate));
}
if ((Original_result == null)) {
- this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_result));
+ this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_result));
}
- if ((Original_sdate.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_sdate.Value));
+ if ((Original_sdate == null)) {
+ this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_sdate));
}
- if ((Original_edate.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[26].Value = ((System.DateTime)(Original_edate.Value));
+ if ((Original_edate == null)) {
+ this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_edate));
}
if ((Original_term.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[28].Value = ((double)(Original_term.Value));
+ this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[29].Value = ((double)(Original_term.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
}
if ((Original_title == null)) {
- this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_title));
+ this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_title));
}
if ((Original_uid == null)) {
- this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_uid));
+ this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_uid));
}
if ((Original_mail.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[34].Value = ((bool)(Original_mail.Value));
+ this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[35].Value = ((bool)(Original_mail.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
}
if ((Original_mailsend.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[36].Value = ((bool)(Original_mailsend.Value));
+ this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[37].Value = ((bool)(Original_mailsend.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
}
if ((Original_wuid == null)) {
throw new global::System.ArgumentNullException("Original_wuid");
}
else {
- this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_wuid));
+ this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_wuid));
}
- this.Adapter.UpdateCommand.Parameters[38].Value = ((System.DateTime)(Original_wdate));
+ this.Adapter.UpdateCommand.Parameters[39].Value = ((System.DateTime)(Original_wdate));
if ((Original_termDr.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[40].Value = ((double)(Original_termDr.Value));
+ this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[41].Value = ((double)(Original_termDr.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value;
}
if ((Original_gcode == null)) {
throw new global::System.ArgumentNullException("Original_gcode");
}
else {
- this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_gcode));
+ this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_gcode));
}
if ((Original_DrTime.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[43].Value = ((double)(Original_DrTime.Value));
+ this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[44].Value = ((double)(Original_DrTime.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value;
}
if ((Original_CrTime.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[45].Value = ((double)(Original_CrTime.Value));
+ this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[46].Value = ((double)(Original_CrTime.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value;
}
- this.Adapter.UpdateCommand.Parameters[46].Value = ((int)(idx));
+ if ((Original_tag == null)) {
+ this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_tag));
+ }
+ this.Adapter.UpdateCommand.Parameters[49].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -6937,48 +6905,6 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
}
}
}
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
- [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
- public virtual int Update(
- string cate,
- string result,
- global::System.Nullable sdate,
- global::System.Nullable edate,
- global::System.Nullable term,
- string title,
- string contents,
- string uid,
- string tolist,
- global::System.Nullable mail,
- global::System.Nullable mailsend,
- string reason,
- string wuid,
- System.DateTime wdate,
- global::System.Nullable termDr,
- string gcode,
- global::System.Nullable DrTime,
- global::System.Nullable CrTime,
- int Original_idx,
- string Original_cate,
- string Original_result,
- global::System.Nullable Original_sdate,
- global::System.Nullable Original_edate,
- global::System.Nullable Original_term,
- string Original_title,
- string Original_uid,
- global::System.Nullable Original_mail,
- global::System.Nullable Original_mailsend,
- string Original_wuid,
- System.DateTime Original_wdate,
- global::System.Nullable Original_termDr,
- string Original_gcode,
- global::System.Nullable Original_DrTime,
- global::System.Nullable Original_CrTime) {
- return this.Update(cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, Original_idx, Original_cate, Original_result, Original_sdate, Original_edate, Original_term, Original_title, Original_uid, Original_mail, Original_mailsend, Original_wuid, Original_wdate, Original_termDr, Original_gcode, Original_DrTime, Original_CrTime, Original_idx);
- }
}
///
@@ -7567,10 +7493,11 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
tableMapping.ColumnMappings.Add("wuid", "wuid");
tableMapping.ColumnMappings.Add("wdate", "wdate");
tableMapping.ColumnMappings.Add("indate", "indate");
+ tableMapping.ColumnMappings.Add("email", "email");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
- this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)))";
+ this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -7588,10 +7515,12 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_indate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_email", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
- this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate], [indate]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate, @indate);
-SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq";
+ this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate], [indate], [email]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate, @indate, @email);
+SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -7602,10 +7531,11 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
- this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate, [indate] = @indate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)));
-SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq";
+ this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate, [indate] = @indate, [email] = @email WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)));
+SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -7616,6 +7546,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -7632,6 +7563,8 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_indate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_email", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -7648,15 +7581,16 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
- this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate\r\nFROM E" +
- "ETGW_WorkTableUser\r\nWHERE (gcode = @gcode) AND (grp = @grp)\r\nORDER BY seq";
+ this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email\r\nFRO" +
+ "M EETGW_WorkTableUser\r\nWHERE (gcode = @gcode) AND (grp = @grp)\r\nORDER BY se" +
+ "q";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
- this._commandCollection[1].CommandText = "SELECT empno, gcode, grade, grp, idx, indate, name, seq, wdate, wuid FROM EETGW_W" +
- "orkTableUser WHERE (gcode = @gcode) AND (empno = @empno)";
+ this._commandCollection[1].CommandText = "SELECT email, empno, gcode, grade, grp, idx, indate, name, seq, wdate, wuid FROM " +
+ "EETGW_WorkTableUser WHERE (gcode = @gcode) AND (empno = @empno)";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@empno", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "empno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -7815,7 +7749,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.IDbCommand[1];
+ this._commandCollection = new global::System.Data.IDbCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FBS0000.Properties.Settings.Default.gwcs);
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "SELECT ISNULL(grp, \'\') AS grp\r\nFROM EETGW_WorkTableUser\r\nWHERE (gcode = @gc" +
@@ -7823,6 +7757,22 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandType = global::System.Data.CommandType.Text;
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@empno", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "empno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FBS0000.Properties.Settings.Default.gwcs);
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandText = "SELECT ISNULL(SUM(termDr), 0) - ISNULL(SUM(term), 0) AS jan\r\nFROM Holyday\r\nW" +
+ "HERE (gcode = @gcode) AND (uid = @uid) AND (sdate < @pdate)";
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandType = global::System.Data.CommandType.Text;
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FBS0000.Properties.Settings.Default.gwcs);
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandText = "SELECT ISNULL(SUM(DrTime), 0) - ISNULL(SUM(CrTime), 0) AS jan\r\nFROM Holyday\r" +
+ "\nWHERE (gcode = @gcode) AND (uid = @uid) AND (sdate < @pdate)";
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandType = global::System.Data.CommandType.Text;
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7864,6 +7814,98 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
return ((string)(returnValue));
}
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ public virtual global::System.Nullable WorkUserJan_Yesterday_Day(string gcode, string uid, string pdate) {
+ global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[1]));
+ if ((gcode == null)) {
+ throw new global::System.ArgumentNullException("gcode");
+ }
+ else {
+ command.Parameters[0].Value = ((string)(gcode));
+ }
+ if ((uid == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(uid));
+ }
+ if ((pdate == null)) {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[2].Value = ((string)(pdate));
+ }
+ global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+ if (((command.Connection.State & global::System.Data.ConnectionState.Open)
+ != global::System.Data.ConnectionState.Open)) {
+ command.Connection.Open();
+ }
+ object returnValue;
+ try {
+ returnValue = command.ExecuteScalar();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ if (((returnValue == null)
+ || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+ return new global::System.Nullable();
+ }
+ else {
+ return new global::System.Nullable(((double)(returnValue)));
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ public virtual global::System.Nullable WorkUserJan_YesterDay_Time(string gcode, string uid, string pdate) {
+ global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[2]));
+ if ((gcode == null)) {
+ throw new global::System.ArgumentNullException("gcode");
+ }
+ else {
+ command.Parameters[0].Value = ((string)(gcode));
+ }
+ if ((uid == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(uid));
+ }
+ if ((pdate == null)) {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[2].Value = ((string)(pdate));
+ }
+ global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+ if (((command.Connection.State & global::System.Data.ConnectionState.Open)
+ != global::System.Data.ConnectionState.Open)) {
+ command.Connection.Open();
+ }
+ object returnValue;
+ try {
+ returnValue = command.ExecuteScalar();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ if (((returnValue == null)
+ || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+ return new global::System.Nullable();
+ }
+ else {
+ return new global::System.Nullable(((double)(returnValue)));
+ }
+ }
}
///
diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd
index 77cde36..e9b63e0 100644
--- a/SubProject/FBS0000/dsMSSQL.xsd
+++ b/SubProject/FBS0000/dsMSSQL.xsd
@@ -232,131 +232,127 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
- DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)))
+ DELETE FROM Holyday
+WHERE (idx = @Original_idx)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime);
-SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid
+ INSERT INTO Holyday
+ (cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, tag)
+VALUES (@cate,@result,@sdate,@edate,@term,@title,@contents,@uid,@tolist,@mail,@mailsend,@reason,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag);
+SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName
+ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag
FROM Holyday
-WHERE (sdate >= @sd) AND (edate <= @ed) AND (wuid LIKE @uid) AND (gcode = @gcode)
+WHERE (sdate >= @sd) AND (edate <= @ed) AND (gcode = @gcode) AND (uid LIKE @uid)
ORDER BY sdate, edate, uid
-
+
- UPDATE [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate] = @edate, [term] = @term, [title] = @title, [contents] = @contents, [uid] = @uid, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reason, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr, [gcode] = @gcode, [DrTime] = @DrTime, [CrTime] = @CrTime WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)));
-SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid
+ UPDATE Holyday
+SET cate = @cate, result = @result, sdate = @sdate, edate = @edate, term = @term, title = @title, contents = @contents, uid = @uid, tolist = @tolist, mail = @mail, mailsend = @mailsend,
+ reason = @reason, wuid = @wuid, wdate = @wdate, termDr = @termDr, gcode = @gcode, DrTime = @DrTime, CrTime = @CrTime, tag = @tag
+WHERE (idx = @Original_idx) AND (@IsNull_cate = 1 AND cate IS NULL OR
+ cate = @Original_cate) AND (@IsNull_result = 1 AND result IS NULL OR
+ result = @Original_result) AND (@IsNull_sdate = 1 AND sdate IS NULL OR
+ sdate = @Original_sdate) AND (@IsNull_edate = 1 AND edate IS NULL OR
+ edate = @Original_edate) AND (@IsNull_term = 1 AND term IS NULL OR
+ term = @Original_term) AND (@IsNull_title = 1 AND title IS NULL OR
+ title = @Original_title) AND (@IsNull_uid = 1 AND uid IS NULL OR
+ uid = @Original_uid) AND (@IsNull_mail = 1 AND mail IS NULL OR
+ mail = @Original_mail) AND (@IsNull_mailsend = 1 AND mailsend IS NULL OR
+ mailsend = @Original_mailsend) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate) AND (@IsNull_termDr = 1 AND termDr IS NULL OR
+ termDr = @Original_termDr) AND (gcode = @Original_gcode) AND (@IsNull_DrTime = 1 AND DrTime IS NULL OR
+ DrTime = @Original_DrTime) AND (@IsNull_CrTime = 1 AND CrTime IS NULL OR
+ CrTime = @Original_CrTime) AND (@IsNull_tag = 1 AND tag IS NULL OR
+ tag = @Original_tag);
+SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -383,13 +379,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
+
SELECT Holyday.idx, Holyday.cate, Holyday.result, Holyday.sdate, Holyday.edate, Holyday.term, Holyday.title, Holyday.contents, Holyday.uid, Holyday.tolist, Holyday.mail, Holyday.mailsend,
- Holyday.reason, Holyday.wuid, Holyday.wdate, Holyday.termDr, Holyday.gcode, Holyday.DrTime, Holyday.CrTime, dbo.getUserName(Holyday.uid) AS UserName
+ Holyday.reason, Holyday.wuid, Holyday.wdate, Holyday.termDr, Holyday.gcode, Holyday.DrTime, Holyday.CrTime, dbo.getUserName(Holyday.uid) AS UserName, Holyday.tag
FROM Holyday LEFT OUTER JOIN
EETGW_WorkTableUser ON Holyday.gcode = EETGW_WorkTableUser.gcode AND Holyday.uid = EETGW_WorkTableUser.empno
WHERE (Holyday.sdate >= @sd) AND (Holyday.edate <= @ed) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp)
@@ -406,7 +403,7 @@ ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid
- SELECT CrTime, DrTime, cate, contents, edate, gcode, idx, mail, mailsend, reason, result, sdate, term, termDr, title, tolist, uid, wdate, wuid, dbo.getUserName(uid) AS UserName
+ SELECT CrTime, DrTime, cate, contents, edate, gcode, idx, mail, mailsend, reason, result, sdate, term, termDr, title, tolist, uid, wdate, wuid, dbo.getUserName(uid) AS UserName, tag
FROM Holyday
WHERE (gcode = @gcode) AND (idx = @idx)
@@ -489,7 +486,7 @@ ORDER BY grp
- DELETE FROM [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)))
+ DELETE FROM [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)))
@@ -507,13 +504,15 @@ ORDER BY grp
+
+
- INSERT INTO [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate], [indate]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate, @indate);
-SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq
+ INSERT INTO [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate], [indate], [email]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate, @indate, @email);
+SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq
@@ -524,12 +523,13 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
+
- SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate
+ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email
FROM EETGW_WorkTableUser
WHERE (gcode = @gcode) AND (grp = @grp)
ORDER BY seq
@@ -541,8 +541,8 @@ ORDER BY seq
- UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate, [indate] = @indate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)));
-SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq
+ UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate, [indate] = @indate, [email] = @email WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)));
+SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq
@@ -553,6 +553,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
+
@@ -569,6 +570,8 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
+
+
@@ -586,12 +589,13 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_
+
- SELECT empno, gcode, grade, grp, idx, indate, name, seq, wdate, wuid FROM EETGW_WorkTableUser WHERE (gcode = @gcode) AND (empno = @empno)
+ SELECT email, empno, gcode, grade, grp, idx, indate, name, seq, wdate, wuid FROM EETGW_WorkTableUser WHERE (gcode = @gcode) AND (empno = @empno)
@@ -616,6 +620,34 @@ WHERE (gcode = @gcode) AND (empno = @empno)
+
+
+
+ SELECT ISNULL(SUM(termDr), 0) - ISNULL(SUM(term), 0) AS jan
+FROM Holyday
+WHERE (gcode = @gcode) AND (uid = @uid) AND (sdate < @pdate)
+
+
+
+
+
+
+
+
+
+
+
+ SELECT ISNULL(SUM(DrTime), 0) - ISNULL(SUM(CrTime), 0) AS jan
+FROM Holyday
+WHERE (gcode = @gcode) AND (uid = @uid) AND (sdate < @pdate)
+
+
+
+
+
+
+
+
@@ -755,7 +787,7 @@ WHERE (gcode = @gcode) AND (empno = @empno)
-
+
@@ -818,6 +850,13 @@ WHERE (gcode = @gcode) AND (empno = @empno)
+
+
+
+
+
+
+
@@ -934,6 +973,13 @@ WHERE (gcode = @gcode) AND (empno = @empno)
+
+
+
+
+
+
+
diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss
index ccc774b..4dc2bcd 100644
--- a/SubProject/FBS0000/dsMSSQL.xss
+++ b/SubProject/FBS0000/dsMSSQL.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -12,7 +12,7 @@
-
+
\ No newline at end of file
diff --git a/SubProject/FBS0000/fLovWorkUser.Designer.cs b/SubProject/FBS0000/fLovWorkUser.Designer.cs
new file mode 100644
index 0000000..d585bd0
--- /dev/null
+++ b/SubProject/FBS0000/fLovWorkUser.Designer.cs
@@ -0,0 +1,141 @@
+namespace FBS0000
+{
+ partial class fLovWorkUser
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.arDatagridView1 = new arCtl.arDatagridView();
+ this.bs = new System.Windows.Forms.BindingSource(this.components);
+ this.dsMSSQL = new FBS0000.dsMSSQL();
+ this.empnoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.gradeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
+ this.SuspendLayout();
+ //
+ // arDatagridView1
+ //
+ this.arDatagridView1.A_DelCurrentCell = true;
+ this.arDatagridView1.A_EnterToTab = true;
+ this.arDatagridView1.A_KoreanField = null;
+ this.arDatagridView1.A_UpperField = null;
+ this.arDatagridView1.A_ViewRownumOnHeader = true;
+ this.arDatagridView1.AllowUserToAddRows = false;
+ this.arDatagridView1.AllowUserToDeleteRows = false;
+ this.arDatagridView1.AutoGenerateColumns = false;
+ this.arDatagridView1.ColumnHeadersHeight = 30;
+ this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.empnoDataGridViewTextBoxColumn,
+ this.nameDataGridViewTextBoxColumn,
+ this.gradeDataGridViewTextBoxColumn});
+ this.arDatagridView1.DataSource = this.bs;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.arDatagridView1.DefaultCellStyle = dataGridViewCellStyle1;
+ this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.arDatagridView1.Location = new System.Drawing.Point(0, 0);
+ this.arDatagridView1.Name = "arDatagridView1";
+ this.arDatagridView1.ReadOnly = true;
+ this.arDatagridView1.RowHeadersVisible = false;
+ this.arDatagridView1.RowTemplate.Height = 23;
+ this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+ this.arDatagridView1.Size = new System.Drawing.Size(313, 496);
+ this.arDatagridView1.TabIndex = 0;
+ this.arDatagridView1.DoubleClick += new System.EventHandler(this.arDatagridView1_DoubleClick);
+ this.arDatagridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.arDatagridView1_KeyDown);
+ //
+ // bs
+ //
+ this.bs.DataMember = "EETGW_WorkTableUser";
+ this.bs.DataSource = this.dsMSSQL;
+ this.bs.Sort = "name";
+ //
+ // dsMSSQL
+ //
+ this.dsMSSQL.DataSetName = "dsMSSQL";
+ this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+ //
+ // empnoDataGridViewTextBoxColumn
+ //
+ this.empnoDataGridViewTextBoxColumn.DataPropertyName = "empno";
+ this.empnoDataGridViewTextBoxColumn.HeaderText = "사원번호";
+ this.empnoDataGridViewTextBoxColumn.Name = "empnoDataGridViewTextBoxColumn";
+ this.empnoDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // nameDataGridViewTextBoxColumn
+ //
+ this.nameDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.nameDataGridViewTextBoxColumn.DataPropertyName = "name";
+ this.nameDataGridViewTextBoxColumn.HeaderText = "성명";
+ this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
+ this.nameDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // gradeDataGridViewTextBoxColumn
+ //
+ this.gradeDataGridViewTextBoxColumn.DataPropertyName = "grade";
+ this.gradeDataGridViewTextBoxColumn.HeaderText = "직책";
+ this.gradeDataGridViewTextBoxColumn.Name = "gradeDataGridViewTextBoxColumn";
+ this.gradeDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // fLovWorkUser
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(313, 496);
+ this.Controls.Add(this.arDatagridView1);
+ this.KeyPreview = true;
+ this.Name = "fLovWorkUser";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "fLovWorkUser";
+ this.Load += new System.EventHandler(this.fLovWorkUser_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private arCtl.arDatagridView arDatagridView1;
+ private System.Windows.Forms.BindingSource bs;
+ private dsMSSQL dsMSSQL;
+ private System.Windows.Forms.DataGridViewTextBoxColumn empnoDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn gradeDataGridViewTextBoxColumn;
+ }
+}
\ No newline at end of file
diff --git a/SubProject/FBS0000/fLovWorkUser.cs b/SubProject/FBS0000/fLovWorkUser.cs
new file mode 100644
index 0000000..2a36420
--- /dev/null
+++ b/SubProject/FBS0000/fLovWorkUser.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FBS0000
+{
+ public partial class fLovWorkUser : Form
+ {
+ public dsMSSQL.EETGW_WorkTableUserRow dr = null;
+ public fLovWorkUser(List users)
+ {
+ InitializeComponent();
+ this.dsMSSQL.Merge(users.ToArray());
+ this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); };
+ }
+
+ private void fLovWorkUser_Load(object sender, EventArgs e)
+ {
+ this.Show();
+ Application.DoEvents();
+ this.arDatagridView1.AutoResizeColumns();
+ }
+
+ private void arDatagridView1_DoubleClick(object sender, EventArgs e)
+ {
+
+ }
+
+ private void arDatagridView1_KeyDown(object sender, KeyEventArgs e)
+ {
+ if(e.KeyCode == Keys.Enter)
+ {
+ var drv = this.bs.Current as DataRowView;
+ dr = drv.Row as dsMSSQL.EETGW_WorkTableUserRow;
+ DialogResult = DialogResult.OK;
+ }
+ }
+ }
+}
diff --git a/SubProject/FBS0000/fLovWorkUser.resx b/SubProject/FBS0000/fLovWorkUser.resx
new file mode 100644
index 0000000..fce65cb
--- /dev/null
+++ b/SubProject/FBS0000/fLovWorkUser.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
+ 156, 17
+
+
\ No newline at end of file
diff --git a/SubProject/FCOMMON/Util.cs b/SubProject/FCOMMON/Util.cs
index ea66bd5..680fdfc 100644
--- a/SubProject/FCOMMON/Util.cs
+++ b/SubProject/FCOMMON/Util.cs
@@ -272,16 +272,19 @@ namespace FCOMMON
#region "MessageBox"
- public static void MsgI(string m)
+ public static void MsgI(string m, params string[] args)
{
+ m = string.Format(m, args);
MessageBox.Show(m, "확인", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
- public static void MsgE(string m)
+ public static void MsgE(string m,params string[] args)
{
+ m = string.Format(m, args);
MessageBox.Show(m, "오류", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
- public static DialogResult MsgQ(string m)
+ public static DialogResult MsgQ(string m,params string[] args)
{
+ m = string.Format(m, args);
DialogResult dlg = MessageBox.Show(m, "확인", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
return dlg;
}
diff --git a/SubProject/FPJ0000/Project/fProjectIOMap.Designer.cs b/SubProject/FPJ0000/Project/fProjectIOMap.Designer.cs
index 90be561..aa21f98 100644
--- a/SubProject/FPJ0000/Project/fProjectIOMap.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectIOMap.Designer.cs
@@ -30,16 +30,16 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectIOMap));
- FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
- 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.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
- 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.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
+ 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 textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
this.dsPRJ = new FPJ0000.dsPRJ();
this.bsIn = new System.Windows.Forms.BindingSource(this.components);
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
@@ -119,9 +119,10 @@
this.bindingNavigatorSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.bindingNavigatorAddNewItem3 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
- this.label3 = new System.Windows.Forms.Label();
- this.DefaultMake = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.DefaultMake = new System.Windows.Forms.ToolStripButton();
+ this.label3 = new System.Windows.Forms.Label();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsIn)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpIN)).BeginInit();
@@ -161,6 +162,7 @@
// tam
//
this.tam.BackupDataSetBeforeUpdate = false;
+ this.tam.EETGW_NoteTableAdapter = null;
this.tam.JobReportTableAdapter = null;
this.tam.ProjectsHistoryTableAdapter = null;
this.tam.ProjectsIOMapTableAdapter = this.ta;
@@ -269,18 +271,18 @@
this.fpIN_Sheet1.AutoGenerateColumns = false;
this.fpIN_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Title";
this.fpIN_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F;
- this.fpIN_Sheet1.Columns.Get(0).CellType = textCellType1;
+ this.fpIN_Sheet1.Columns.Get(0).CellType = textCellType21;
this.fpIN_Sheet1.Columns.Get(0).DataField = "PIn";
this.fpIN_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpIN_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpIN_Sheet1.Columns.Get(0).Width = 93F;
- this.fpIN_Sheet1.Columns.Get(1).CellType = textCellType2;
+ this.fpIN_Sheet1.Columns.Get(1).CellType = textCellType22;
this.fpIN_Sheet1.Columns.Get(1).DataField = "Description";
this.fpIN_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpIN_Sheet1.Columns.Get(1).Label = "Title";
this.fpIN_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpIN_Sheet1.Columns.Get(1).Width = 93F;
- this.fpIN_Sheet1.Columns.Get(2).CellType = textCellType3;
+ this.fpIN_Sheet1.Columns.Get(2).CellType = textCellType23;
this.fpIN_Sheet1.Columns.Get(2).DataField = "Remark";
this.fpIN_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpIN_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
@@ -551,18 +553,18 @@
this.fpOut_Sheet1.AutoGenerateColumns = false;
this.fpOut_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Title";
this.fpOut_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F;
- this.fpOut_Sheet1.Columns.Get(0).CellType = textCellType4;
+ this.fpOut_Sheet1.Columns.Get(0).CellType = textCellType28;
this.fpOut_Sheet1.Columns.Get(0).DataField = "PIn";
this.fpOut_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpOut_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpOut_Sheet1.Columns.Get(0).Width = 93F;
- this.fpOut_Sheet1.Columns.Get(1).CellType = textCellType5;
+ this.fpOut_Sheet1.Columns.Get(1).CellType = textCellType29;
this.fpOut_Sheet1.Columns.Get(1).DataField = "Description";
this.fpOut_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpOut_Sheet1.Columns.Get(1).Label = "Title";
this.fpOut_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpOut_Sheet1.Columns.Get(1).Width = 93F;
- this.fpOut_Sheet1.Columns.Get(2).CellType = textCellType6;
+ this.fpOut_Sheet1.Columns.Get(2).CellType = textCellType30;
this.fpOut_Sheet1.Columns.Get(2).DataField = "Remark";
this.fpOut_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpOut_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
@@ -809,23 +811,23 @@
this.fpEtc_Sheet1.AutoGenerateColumns = false;
this.fpEtc_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Title";
this.fpEtc_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F;
- this.fpEtc_Sheet1.Columns.Get(0).CellType = textCellType7;
+ this.fpEtc_Sheet1.Columns.Get(0).CellType = textCellType24;
this.fpEtc_Sheet1.Columns.Get(0).DataField = "Dir";
this.fpEtc_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpEtc_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpEtc_Sheet1.Columns.Get(0).Width = 93F;
- this.fpEtc_Sheet1.Columns.Get(1).CellType = textCellType8;
+ this.fpEtc_Sheet1.Columns.Get(1).CellType = textCellType25;
this.fpEtc_Sheet1.Columns.Get(1).DataField = "PIn";
this.fpEtc_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpEtc_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpEtc_Sheet1.Columns.Get(1).Width = 93F;
- this.fpEtc_Sheet1.Columns.Get(2).CellType = textCellType9;
+ this.fpEtc_Sheet1.Columns.Get(2).CellType = textCellType26;
this.fpEtc_Sheet1.Columns.Get(2).DataField = "Description";
this.fpEtc_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpEtc_Sheet1.Columns.Get(2).Label = "Title";
this.fpEtc_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpEtc_Sheet1.Columns.Get(2).Width = 93F;
- this.fpEtc_Sheet1.Columns.Get(3).CellType = textCellType10;
+ this.fpEtc_Sheet1.Columns.Get(3).CellType = textCellType27;
this.fpEtc_Sheet1.Columns.Get(3).DataField = "Remark";
this.fpEtc_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpEtc_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
@@ -862,7 +864,8 @@
this.bindingNavigatorDeleteItem3,
this.toolStripButton1,
this.toolStripSeparator3,
- this.DefaultMake});
+ this.DefaultMake,
+ this.toolStripButton2});
this.bindingNavigator3.Location = new System.Drawing.Point(0, 158);
this.bindingNavigator3.MoveFirstItem = this.bindingNavigatorMoveFirstItem3;
this.bindingNavigator3.MoveLastItem = this.bindingNavigatorMoveLastItem3;
@@ -970,6 +973,20 @@
this.toolStripButton1.Text = "Save(&S)";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 26);
+ //
+ // DefaultMake
+ //
+ this.DefaultMake.Image = ((System.Drawing.Image)(resources.GetObject("DefaultMake.Image")));
+ this.DefaultMake.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.DefaultMake.Name = "DefaultMake";
+ this.DefaultMake.Size = new System.Drawing.Size(107, 23);
+ this.DefaultMake.Text = "목록 자동 생성";
+ this.DefaultMake.Click += new System.EventHandler(this.DefaultMake_Click);
+ //
// label3
//
this.label3.BackColor = System.Drawing.Color.LightGray;
@@ -982,19 +999,14 @@
this.label3.Text = "ETC";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // DefaultMake
+ // toolStripButton2
//
- this.DefaultMake.Image = ((System.Drawing.Image)(resources.GetObject("DefaultMake.Image")));
- this.DefaultMake.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.DefaultMake.Name = "DefaultMake";
- this.DefaultMake.Size = new System.Drawing.Size(107, 23);
- this.DefaultMake.Text = "목록 자동 생성";
- this.DefaultMake.Click += new System.EventHandler(this.DefaultMake_Click);
- //
- // toolStripSeparator3
- //
- this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 26);
+ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(99, 23);
+ this.toolStripButton2.Text = "전체내보내기";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// fProjectIOMap
//
@@ -1122,5 +1134,6 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem13;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripButton DefaultMake;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/Project/fProjectIOMap.cs b/SubProject/FPJ0000/Project/fProjectIOMap.cs
index 05e7ff0..71f65ba 100644
--- a/SubProject/FPJ0000/Project/fProjectIOMap.cs
+++ b/SubProject/FPJ0000/Project/fProjectIOMap.cs
@@ -36,7 +36,7 @@ namespace FPJ0000
private void fProjectSchedule_Load(object sender, EventArgs e)
{
RefreshData();
-
+
}
void RefreshData()
{
@@ -51,9 +51,9 @@ namespace FPJ0000
{
System.Windows.Forms.MessageBox.Show(ex.Message);
}
-
+
}
-
+
private void autoToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -84,14 +84,7 @@ namespace FPJ0000
FPUtil.ColSizeLoad(ref this.fpIN, fn_fpcolsizeI);
}
- private void exportListToolStripMenuItem_Click(object sender, EventArgs e)
- {
- fpIN.SaveExcel("iomap_in.xls",
- FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
- | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
- | FarPoint.Excel.ExcelSaveFlags.NoFormulas
- | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
- }
+
private void toolStripButton1_Click(object sender, EventArgs e)
{
@@ -102,16 +95,33 @@ namespace FPJ0000
try
{
this.tam.UpdateAll(this.dsPRJ);
- } catch (Exception ex)
+ }
+ catch (Exception ex)
{
FCOMMON.Util.MsgE(ex.Message);
}
-
+
+ }
+ private void exportListToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var sd = new SaveFileDialog();
+ sd.Filter = "Excel|*.xls";
+ sd.FileName = "iomap_in";
+ if (sd.ShowDialog() != DialogResult.OK) return;
+ fpIN.SaveExcel(sd.FileName,
+ FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+ | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
+ | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+ | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
}
private void toolStripMenuItem7_Click(object sender, EventArgs e)
{
- fpIN.SaveExcel("iomap_out.xls",
+ var sd = new SaveFileDialog();
+ sd.Filter = "Excel|*.xls";
+ sd.FileName = "iomap_out";
+ if (sd.ShowDialog() != DialogResult.OK) return;
+ fpIN.SaveExcel(sd.FileName,
FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
| FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
| FarPoint.Excel.ExcelSaveFlags.NoFormulas
@@ -120,7 +130,11 @@ namespace FPJ0000
private void toolStripMenuItem13_Click(object sender, EventArgs e)
{
- fpIN.SaveExcel("iomap_etc.xls",
+ var sd = new SaveFileDialog();
+ sd.Filter = "Excel|*.xls";
+ sd.FileName = "iomap_etc";
+ if (sd.ShowDialog() != DialogResult.OK) return;
+ fpIN.SaveExcel(sd.FileName,
FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
| FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
| FarPoint.Excel.ExcelSaveFlags.NoFormulas
@@ -187,7 +201,7 @@ namespace FPJ0000
{
var newitem = bsIn.AddNew() as DataRowView;
newitem["Dir"] = "IN";
-
+
}
private void bindingNavigatorAddNewItem2_Click(object sender, EventArgs e)
@@ -213,7 +227,7 @@ namespace FPJ0000
var dlg = util.MsgQ("입력 64, 출력 64개의 목록을 생성 합니다\n진행 할까요?");
if (dlg != DialogResult.Yes) return;
- for(int i = 0; i < 64;i++)
+ for (int i = 0; i < 64; i++)
{
//input
var newdi = this.dsPRJ.ProjectsIOMap.NewProjectsIOMapRow();
@@ -226,8 +240,30 @@ namespace FPJ0000
newdo.Dir = "OUT";
newdo.PIn = "Y" + i.ToString("X2");
this.dsPRJ.ProjectsIOMap.AddProjectsIOMapRow(newdo);
-
+
}
}
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ var bs = new BindingSource(this.dsPRJ, "ProjectsIOMap");
+ bs.Sort = "Dir desc";
+ var fp = new FarPoint.Win.Spread.FpSpread();
+ var newsheet = new FarPoint.Win.Spread.SheetView();
+ newsheet.SheetName = "Sheet1";
+ newsheet.DataSource = bs;
+ fp.Sheets.Add(newsheet);
+ var sd = new SaveFileDialog();
+ sd.Filter = "Excel|*.xls";
+ sd.FileName = "iomap";
+ if (sd.ShowDialog() != DialogResult.OK) return;
+ var rlt = fp.SaveExcel(sd.FileName,
+ FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+ | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
+ | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+ | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+ if (rlt == false)
+ FCOMMON.Util.MsgE("저장 실패");
+ }
}
}
diff --git a/SubProject/FPJ0000/Project/fProjectIOMap.resx b/SubProject/FPJ0000/Project/fProjectIOMap.resx
index 9f197f4..c976b14 100644
--- a/SubProject/FPJ0000/Project/fProjectIOMap.resx
+++ b/SubProject/FPJ0000/Project/fProjectIOMap.resx
@@ -132,6 +132,9 @@
248, 17
+
+ 1146, 17
+
@@ -172,233 +175,15 @@
vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
-
- 329, 56
-
678, 17
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
- DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
- rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
- i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
- 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
- QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
- bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
- wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
- v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
- UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
- Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
- lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
- 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
- Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
- 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
- n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
- N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
- oAc0QjgAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
- h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
- twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
- kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
- WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
- 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
- pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
- Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
- /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
- zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
- IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
- rkJggg==
-
-
-
- 575, 56
-
-
-
- R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
- 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg
- wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO
- GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE
- pRQTK6YYEAA7
-
-
-
-
- R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R
- PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg
- oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX
- dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7
-
-
-
-
- R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
- e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw
- QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK
- HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC
- un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs=
-
-
-
-
- R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7
- 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ
- IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj
- SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG
- vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
-
-
-
- 448, 56
-
-
- 508, 17
-
- 17, 56
+ 834, 17
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
- DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
- rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
- i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
- 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
- QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
- bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
- wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
- v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
- UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
- Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
- lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
- 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
- Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
- 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
- n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
- N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
- oAc0QjgAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
- h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
- twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
- kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
- WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
- 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
- pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
- Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
- /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
- zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
- IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
- rkJggg==
-
-
- 664, 49
+ 222, 56
-
-
- R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
- 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg
- wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO
- GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE
- pRQTK6YYEAA7
-
-
-
-
- R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R
- PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg
- oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX
- dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7
-
-
-
-
- R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
- e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw
- QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK
- HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC
- un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs=
-
-
-
-
- R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7
- 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF
- Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ
- IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj
- SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG
- vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
-
-
385, 17
@@ -406,7 +191,7 @@
593, 17
- 173, 56
+ 990, 17
@@ -482,15 +267,251 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHnSURBVDhPlZBNiFJRGIa/VRQURKGOmxstomiCQQbRINTx
- BwP1WjuxfWYUbYpWTYgu3YXMOqiFwcRoThJp/jWBMjNGUhFM7ls03Hu9f4vBN6+cWciNwXlW7/l4n3MO
- H83D+Iv7lLK1dJcd50PtLHNKZ/mBkeWtaxGlvdg3stbiLkpNbr7LlM9L35TOYlVpXq5ou7cgt7gno4Zd
- GNXPJ1nlaOT2lVXtaxL6z4fQ955B3YlAqp1V/zQsp1nFjNy9ujB5ta60LkHb5aH/zqL9ike/dAd7jXtQ
- eysQaychfqA1pvwfucmtqv3baL+OQ9d1jMdj7Gwkof24D6FK3/crdIFVzUjtBYv0yVaNRqPo9XrQNA2D
- wQCNlxHovx5DrNBIfE9uVp9F/WjnRrVzpXg8jlQqhXw+j2KxiMraykR+CmGTDsRN2hbK9JwpZnien8pu
- txt+vx+xWAzK9mSBdTuk6hnsl4ljVTOHssvlgs/ng9VqNb78Qng3eblM18US9YW3lGb1WRKJBHK53FT2
- er2wWCww5lKZbogbVDUy3tCJv+t008gzhMNhZLNZk3yIsE4hFs0EAgFkMhk4nU54PB6TfCTpdBrD4RAO
- hwOhUOh4soFxQbfbRaFQmC6MjecnGAw+Mr5ts9mOLxPRP4fvCzLiRd6HAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVDhPlZBNiFJRGIa/VRQUEaGOmxuziKIJBhlEg1DH
+ HwzUa+3E9plRtClaNSG6dDfIrINaGEylOV3CxD8mUGbGSCqCyX2LRu/V+7MYfPPKmYXcGJxn9Z6P9/nO
+ 4dA8jL84z8jby/fYcT6U5gonN1ce6nm0fT0k15c6elbr3KJU4+ZbJjeXv8nNJUGuXSmpe7cxqnNPh1Xr
+ YFi5GGeV4xk1rq6pX+PQfj6Ctv8cym4IYvm88qdqOssqRkatawuTWyty/TLUPR7a7zQar3h0CnexX70P
+ pb0K8fNpiJ9ogyn/Z1Tj1pTOHTReR6FpGsbjMXbfx6H+eIC+QN8PSnSJVY1IjQWTVLEI4XAY7XYbqqqi
+ 2+2i+jIE7dcTiCUaih/JyeqzKGUrNyxfKESjUSQSCWSzWeTzeZQ2VifyM/S36FDcop1BkV4wxQjP81PZ
+ 6XTC6/UiEolA3glBqlghCedwUCSOVY0cyQ6HAx6PB2azWX/yev/D5OYi3RAL1Bm8pSSrzxKLxZDJZKay
+ 2+2GyWSCPpeKdFN8R4Ke8YZO/d2kW3qeIRgMIp1OG+QjBpsUYNGIz+dDKpWC3W6Hy+UyyMeSTCbR6/Vg
+ s9kQCAROJuvoC1qtFnK53PTD2Hh+/H7/Y/3ZFovl5DIR/QNpDAsmLfHLrAAAAABJRU5ErkJggg==
+
+
+
+
+ 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==
+
+
+
+ 678, 17
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+ DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+ rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+ i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+ 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+ QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+ wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+ v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+ UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+ Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+ lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+ 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+ Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+ n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+ N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+ oAc0QjgAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+ h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+ twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+ WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+ pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
+ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
+ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
+ zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
+ IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
+ rkJggg==
+
+
+
+ 144, 56
+
+
+ 17, 56
+
+
+ 508, 17
+
+
+
+ R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
+ 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg
+ wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO
+ GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE
+ pRQTK6YYEAA7
+
+
+
+
+ R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R
+ PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg
+ oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX
+ dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7
+
+
+
+
+ R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
+ e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw
+ QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK
+ HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC
+ un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs=
+
+
+
+
+ R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7
+ 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ
+ IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj
+ SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG
+ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
+
+
+
+ 834, 17
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+ DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+ rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+ i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+ 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+ QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+ wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+ v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+ UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+ Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+ lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+ 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+ Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+ n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+ N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+ oAc0QjgAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+ h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+ twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+ WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+ pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
+ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
+ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
+ zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
+ IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
+ rkJggg==
+
+
+
+
+ R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
+ 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg
+ wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO
+ GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE
+ pRQTK6YYEAA7
+
+
+
+
+ R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R
+ PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg
+ oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX
+ dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7
+
+
+
+
+ R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
+ e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw
+ QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK
+ HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC
+ un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs=
+
+
+
+
+ R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7
+ 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF
+ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ
+ IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj
+ SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG
+ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
\ No newline at end of file