From bd442b73a830317b60c1397d407335e6f52de5cc Mon Sep 17 00:00:00 2001 From: chi Date: Fri, 5 Jun 2020 13:10:14 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=ED=8E=B8=EC=A7=91=EA=B8=B0?= =?UTF-8?q?=20=EC=B0=BD=20=EB=B3=84=EB=8F=84=20=EC=B6=94=EA=B0=80=ED=96=88?= =?UTF-8?q?=EC=9D=8C,=20=ED=9C=B4=EA=B0=80=EB=82=B4=EC=97=AD=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- .../FBS0000/Holiday/fHolyday.Designer.cs | 5 + SubProject/FBS0000/Holiday/fHolyday.cs | 9 +- .../FBS0000/Holiday/fHolyday_Add.Designer.cs | 32 +- SubProject/FBS0000/Holiday/fHolyday_Add.cs | 6 +- SubProject/FBS0000/dsMSSQL.Designer.cs | 810 +++++------ SubProject/FBS0000/dsMSSQL.xsd | 10 +- SubProject/FBS0000/dsMSSQL.xss | 16 +- SubProject/FPJ0000/FPJ0000.csproj | 9 + .../FPJ0000/Note/fTextEditor.Designer.cs | 130 ++ SubProject/FPJ0000/Note/fTextEditor.cs | 88 ++ SubProject/FPJ0000/Note/fTextEditor.resx | 135 ++ .../FPJ0000/Project/fProjectData.Designer.cs | 605 +++++++- SubProject/FPJ0000/Project/fProjectData.cs | 35 +- SubProject/FPJ0000/Project/fProjectData.resx | 12 + .../FPJ0000/Project/fProjectList.Designer.cs | 1296 +++++++++-------- SubProject/FPJ0000/Project/fProjectList.cs | 62 +- SubProject/FPJ0000/Project/fProjectList.resx | 157 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 408 +++++- SubProject/FPJ0000/dsPRJ.xsd | 66 +- 20 files changed, 2697 insertions(+), 1198 deletions(-) create mode 100644 SubProject/FPJ0000/Note/fTextEditor.Designer.cs create mode 100644 SubProject/FPJ0000/Note/fTextEditor.cs create mode 100644 SubProject/FPJ0000/Note/fTextEditor.resx diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index a3d2c21..54aba40 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("20.06.05.1030")] -[assembly: AssemblyFileVersion("20.06.05.1030")] +[assembly: AssemblyVersion("20.06.05.1240")] +[assembly: AssemblyFileVersion("20.06.05.1240")] diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index 1f44075..ea1bb4c 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -31,6 +31,7 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FBS0000.dsMSSQL(); @@ -400,6 +401,7 @@ // this.termDataGridViewTextBoxColumn.DataPropertyName = "term"; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Red; this.termDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; this.termDataGridViewTextBoxColumn.HeaderText = "사용"; this.termDataGridViewTextBoxColumn.Name = "termDataGridViewTextBoxColumn"; @@ -408,6 +410,9 @@ // termDr // this.termDr.DataPropertyName = "termDr"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Blue; + this.termDr.DefaultCellStyle = dataGridViewCellStyle2; this.termDr.HeaderText = "발생"; this.termDr.Name = "termDr"; this.termDr.ReadOnly = true; diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 5732196..0ed7c3c 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -103,10 +103,13 @@ namespace FBS0000 //잔량계산 - double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr); + double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr); //전체발생수량 + double sumdrN = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate == "10").Sum(t => t.termDr); //일반발생 + double sumdrE = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate != "10").Sum(t => t.termDr); //기타발생 + double sumcr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.term); double jan = sumdr - sumcr; - sbGen.Text = sumdr.ToString("N0"); + sbGen.Text = string.Format("{0}+{1}",sumdrN, sumdrE); sbUse.Text = sumcr.ToString("N0"); sbJan.Text = jan.ToString("N0"); if (jan < 0) sbJan.ForeColor = Color.Red; @@ -159,7 +162,7 @@ namespace FBS0000 var drv = this.bs.Current as DataRowView; if (drv == null) return; var dr = drv.Row as dsMSSQL.vHoliday_uselistRow; - if(dr.cate == "0") + if(dr.cate == "10" || dr.cate=="11") { var f = new fHolyday_Add(dr.idx); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs index e05fbe3..8c788d8 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs @@ -42,6 +42,8 @@ this.cmbUser = new System.Windows.Forms.ComboBox(); this.btOK = new System.Windows.Forms.Button(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.radNormall = new System.Windows.Forms.RadioButton(); + this.radEtc = new System.Windows.Forms.RadioButton(); sdateLabel = new System.Windows.Forms.Label(); contentsLabel = new System.Windows.Forms.Label(); uidLabel = new System.Windows.Forms.Label(); @@ -135,7 +137,7 @@ this.dateTimePicker1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "sdate", true)); this.dateTimePicker1.Location = new System.Drawing.Point(87, 45); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(422, 27); + this.dateTimePicker1.Size = new System.Drawing.Size(300, 27); this.dateTimePicker1.TabIndex = 3; this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged); // @@ -174,11 +176,35 @@ this.numericUpDown1.TabIndex = 7; this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // radNormall + // + this.radNormall.AutoSize = true; + this.radNormall.Checked = true; + this.radNormall.Location = new System.Drawing.Point(393, 47); + this.radNormall.Name = "radNormall"; + this.radNormall.Size = new System.Drawing.Size(55, 23); + this.radNormall.TabIndex = 9; + this.radNormall.TabStop = true; + this.radNormall.Text = "일반"; + this.radNormall.UseVisualStyleBackColor = true; + // + // radEtc + // + this.radEtc.AutoSize = true; + this.radEtc.Location = new System.Drawing.Point(454, 47); + this.radEtc.Name = "radEtc"; + this.radEtc.Size = new System.Drawing.Size(55, 23); + this.radEtc.TabIndex = 10; + this.radEtc.Text = "기타"; + this.radEtc.UseVisualStyleBackColor = true; + // // fHolyday_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(523, 340); + this.Controls.Add(this.radEtc); + this.Controls.Add(this.radNormall); this.Controls.Add(this.numericUpDown1); this.Controls.Add(label1); this.Controls.Add(this.btOK); @@ -192,7 +218,7 @@ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.MinimizeBox = false; this.Name = "fHolyday_Add"; - this.Text = "휴가 등록"; + this.Text = "휴가 발생 등록"; this.TopMost = true; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); @@ -214,5 +240,7 @@ private System.Windows.Forms.ComboBox cmbUser; private System.Windows.Forms.Button btOK; private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.RadioButton radNormall; + private System.Windows.Forms.RadioButton radEtc; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index 942a1b3..f68c309 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.cs @@ -34,6 +34,8 @@ namespace FBS0000 { ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx); this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow; + if (dr.cate == "10") radNormall.Checked = true; + else radEtc.Checked = true; } this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); @@ -53,9 +55,9 @@ namespace FBS0000 private void btOK_Click(object sender, EventArgs e) { + if (radEtc.Checked) dr.cate = "11"; //OT년차발생 + else dr.cate = "10";//일반 년차발생 //기본값처리 - - this.Validate(); this.bs.EndEdit(); this.dr.EndEdit(); diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs index d779e17..d0e3795 100644 --- a/SubProject/FBS0000/dsMSSQL.Designer.cs +++ b/SubProject/FBS0000/dsMSSQL.Designer.cs @@ -35,7 +35,7 @@ namespace FBS0000 { private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public dsMSSQL() { this.BeginInit(); this.InitClass(); @@ -46,7 +46,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected dsMSSQL(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context, false) { if ((this.IsBinarySerialized(info, context) == true)) { @@ -91,7 +91,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public minutesDataTable minutes { @@ -101,7 +101,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public BoardDataTable Board { @@ -111,7 +111,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public HolydayDataTable Holyday { @@ -121,7 +121,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public vHoliday_uselistDataTable vHoliday_uselist { @@ -131,7 +131,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] public override global::System.Data.SchemaSerializationMode SchemaSerializationMode { @@ -144,7 +144,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataTableCollection Tables { get { @@ -153,7 +153,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataRelationCollection Relations { get { @@ -162,7 +162,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void InitializeDerivedDataSet() { this.BeginInit(); this.InitClass(); @@ -170,7 +170,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public override global::System.Data.DataSet Clone() { dsMSSQL cln = ((dsMSSQL)(base.Clone())); cln.InitVars(); @@ -179,19 +179,19 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override bool ShouldSerializeTables() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override bool ShouldSerializeRelations() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) { if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { this.Reset(); @@ -225,7 +225,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() { global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(); this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null)); @@ -234,13 +234,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.InitVars(true); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars(bool initTable) { this.tableminutes = ((minutesDataTable)(base.Tables["minutes"])); if ((initTable == true)) { @@ -269,7 +269,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitClass() { this.DataSetName = "dsMSSQL"; this.Prefix = ""; @@ -287,31 +287,31 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private bool ShouldSerializeminutes() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private bool ShouldSerializeBoard() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private bool ShouldSerializeHolyday() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private bool ShouldSerializevHoliday_uselist() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { this.InitVars(); @@ -319,7 +319,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) { dsMSSQL ds = new dsMSSQL(); global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); @@ -365,16 +365,16 @@ namespace FBS0000 { return type; } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public delegate void minutesRowChangeEventHandler(object sender, minutesRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public delegate void BoardRowChangeEventHandler(object sender, BoardRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public delegate void HolydayRowChangeEventHandler(object sender, HolydayRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public delegate void vHoliday_uselistRowChangeEventHandler(object sender, vHoliday_uselistRowChangeEvent e); /// @@ -409,7 +409,7 @@ namespace FBS0000 { private global::System.Data.DataColumn columnwdate; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesDataTable() { this.TableName = "minutes"; this.BeginInit(); @@ -418,7 +418,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal minutesDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -435,14 +435,14 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected minutesDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn idxColumn { get { return this.columnidx; @@ -450,7 +450,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn stimeColumn { get { return this.columnstime; @@ -458,7 +458,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn etimeColumn { get { return this.columnetime; @@ -466,7 +466,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn titleColumn { get { return this.columntitle; @@ -474,7 +474,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn placeColumn { get { return this.columnplace; @@ -482,7 +482,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn contentsColumn { get { return this.columncontents; @@ -490,7 +490,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn projectColumn { get { return this.columnproject; @@ -498,7 +498,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn mainColumn { get { return this.columnmain; @@ -506,7 +506,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn subColumn { get { return this.columnsub; @@ -514,7 +514,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn memoColumn { get { return this.columnmemo; @@ -522,7 +522,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wuidColumn { get { return this.columnwuid; @@ -530,7 +530,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wdateColumn { get { return this.columnwdate; @@ -538,7 +538,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -547,33 +547,33 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesRow this[int index] { get { return ((minutesRow)(this.Rows[index])); } } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event minutesRowChangeEventHandler minutesRowChanging; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event minutesRowChangeEventHandler minutesRowChanged; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event minutesRowChangeEventHandler minutesRowDeleting; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event minutesRowChangeEventHandler minutesRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void AddminutesRow(minutesRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesRow AddminutesRow(System.DateTime stime, System.DateTime etime, string title, string place, string contents, int project, string main, string sub, string memo, string wuid, System.DateTime wdate) { minutesRow rowminutesRow = ((minutesRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -595,14 +595,14 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesRow FindByidx(int idx) { return ((minutesRow)(this.Rows.Find(new object[] { idx}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public override global::System.Data.DataTable Clone() { minutesDataTable cln = ((minutesDataTable)(base.Clone())); cln.InitVars(); @@ -610,13 +610,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new minutesDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.columnidx = base.Columns["idx"]; this.columnstime = base.Columns["stime"]; @@ -633,7 +633,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitClass() { this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidx); @@ -679,25 +679,25 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesRow NewminutesRow() { return ((minutesRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new minutesRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Type GetRowType() { return typeof(minutesRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.minutesRowChanged != null)) { @@ -706,7 +706,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.minutesRowChanging != null)) { @@ -715,7 +715,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.minutesRowDeleted != null)) { @@ -724,7 +724,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.minutesRowDeleting != null)) { @@ -733,13 +733,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void RemoveminutesRow(minutesRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -830,7 +830,7 @@ namespace FBS0000 { private global::System.Data.DataColumn columnwdate; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardDataTable() { this.TableName = "Board"; this.BeginInit(); @@ -839,7 +839,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal BoardDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -856,14 +856,14 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected BoardDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn idxColumn { get { return this.columnidx; @@ -871,7 +871,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn bidxColumn { get { return this.columnbidx; @@ -879,7 +879,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn headerColumn { get { return this.columnheader; @@ -887,7 +887,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn cateColumn { get { return this.columncate; @@ -895,7 +895,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn titleColumn { get { return this.columntitle; @@ -903,7 +903,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn contentsColumn { get { return this.columncontents; @@ -911,7 +911,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn fileColumn { get { return this.columnfile; @@ -919,7 +919,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn guidColumn { get { return this.columnguid; @@ -927,7 +927,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wuidColumn { get { return this.columnwuid; @@ -935,7 +935,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wdateColumn { get { return this.columnwdate; @@ -943,7 +943,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -952,33 +952,33 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardRow this[int index] { get { return ((BoardRow)(this.Rows[index])); } } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event BoardRowChangeEventHandler BoardRowChanging; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event BoardRowChangeEventHandler BoardRowChanged; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event BoardRowChangeEventHandler BoardRowDeleting; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event BoardRowChangeEventHandler BoardRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void AddBoardRow(BoardRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardRow AddBoardRow(int bidx, bool header, string cate, string title, string contents, string file, string guid, string wuid, System.DateTime wdate) { BoardRow rowBoardRow = ((BoardRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -998,14 +998,14 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardRow FindByidx(int idx) { return ((BoardRow)(this.Rows.Find(new object[] { idx}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public override global::System.Data.DataTable Clone() { BoardDataTable cln = ((BoardDataTable)(base.Clone())); cln.InitVars(); @@ -1013,13 +1013,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new BoardDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.columnidx = base.Columns["idx"]; this.columnbidx = base.Columns["bidx"]; @@ -1034,7 +1034,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitClass() { this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidx); @@ -1075,25 +1075,25 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardRow NewBoardRow() { return ((BoardRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new BoardRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Type GetRowType() { return typeof(BoardRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.BoardRowChanged != null)) { @@ -1102,7 +1102,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.BoardRowChanging != null)) { @@ -1111,7 +1111,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.BoardRowDeleted != null)) { @@ -1120,7 +1120,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.BoardRowDeleting != null)) { @@ -1129,13 +1129,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void RemoveBoardRow(BoardRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -1240,7 +1240,7 @@ namespace FBS0000 { private global::System.Data.DataColumn columngcode; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayDataTable() { this.TableName = "Holyday"; this.BeginInit(); @@ -1249,7 +1249,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal HolydayDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -1266,14 +1266,14 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected HolydayDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn idxColumn { get { return this.columnidx; @@ -1281,7 +1281,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn cateColumn { get { return this.columncate; @@ -1289,7 +1289,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn resultColumn { get { return this.columnresult; @@ -1297,7 +1297,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn sdateColumn { get { return this.columnsdate; @@ -1305,7 +1305,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn edateColumn { get { return this.columnedate; @@ -1313,7 +1313,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn termColumn { get { return this.columnterm; @@ -1321,7 +1321,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn titleColumn { get { return this.columntitle; @@ -1329,7 +1329,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn contentsColumn { get { return this.columncontents; @@ -1337,7 +1337,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn uidColumn { get { return this.columnuid; @@ -1345,7 +1345,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn tolistColumn { get { return this.columntolist; @@ -1353,7 +1353,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn mailColumn { get { return this.columnmail; @@ -1361,7 +1361,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn mailsendColumn { get { return this.columnmailsend; @@ -1369,7 +1369,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn reasonColumn { get { return this.columnreason; @@ -1377,7 +1377,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wuidColumn { get { return this.columnwuid; @@ -1385,7 +1385,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wdateColumn { get { return this.columnwdate; @@ -1393,7 +1393,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn termDrColumn { get { return this.columntermDr; @@ -1401,7 +1401,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn gcodeColumn { get { return this.columngcode; @@ -1409,7 +1409,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -1418,33 +1418,33 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayRow this[int index] { get { return ((HolydayRow)(this.Rows[index])); } } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event HolydayRowChangeEventHandler HolydayRowChanging; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event HolydayRowChangeEventHandler HolydayRowChanged; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event HolydayRowChangeEventHandler HolydayRowDeleting; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event HolydayRowChangeEventHandler HolydayRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void AddHolydayRow(HolydayRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayRow AddHolydayRow( string cate, string result, @@ -1487,14 +1487,14 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayRow FindByidx(int idx) { return ((HolydayRow)(this.Rows.Find(new object[] { idx}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public override global::System.Data.DataTable Clone() { HolydayDataTable cln = ((HolydayDataTable)(base.Clone())); cln.InitVars(); @@ -1502,13 +1502,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new HolydayDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.columnidx = base.Columns["idx"]; this.columncate = base.Columns["cate"]; @@ -1530,7 +1530,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitClass() { this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidx); @@ -1589,25 +1589,25 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayRow NewHolydayRow() { return ((HolydayRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new HolydayRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Type GetRowType() { return typeof(HolydayRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.HolydayRowChanged != null)) { @@ -1616,7 +1616,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.HolydayRowChanging != null)) { @@ -1625,7 +1625,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.HolydayRowDeleted != null)) { @@ -1634,7 +1634,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.HolydayRowDeleting != null)) { @@ -1643,13 +1643,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void RemoveHolydayRow(HolydayRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -1740,7 +1740,7 @@ namespace FBS0000 { private global::System.Data.DataColumn columnwdate; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistDataTable() { this.TableName = "vHoliday_uselist"; this.BeginInit(); @@ -1749,7 +1749,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal vHoliday_uselistDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -1766,14 +1766,14 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected vHoliday_uselistDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn idxColumn { get { return this.columnidx; @@ -1781,7 +1781,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn cateColumn { get { return this.columncate; @@ -1789,7 +1789,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn gcodeColumn { get { return this.columngcode; @@ -1797,7 +1797,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn pdateColumn { get { return this.columnpdate; @@ -1805,7 +1805,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn termColumn { get { return this.columnterm; @@ -1813,7 +1813,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn termDrColumn { get { return this.columntermDr; @@ -1821,7 +1821,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn contentsColumn { get { return this.columncontents; @@ -1829,7 +1829,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn uidColumn { get { return this.columnuid; @@ -1837,7 +1837,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wuidColumn { get { return this.columnwuid; @@ -1845,7 +1845,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn wdateColumn { get { return this.columnwdate; @@ -1853,7 +1853,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -1862,33 +1862,33 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistRow this[int index] { get { return ((vHoliday_uselistRow)(this.Rows[index])); } } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event vHoliday_uselistRowChangeEventHandler vHoliday_uselistRowChanging; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event vHoliday_uselistRowChangeEventHandler vHoliday_uselistRowChanged; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event vHoliday_uselistRowChangeEventHandler vHoliday_uselistRowDeleting; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public event vHoliday_uselistRowChangeEventHandler vHoliday_uselistRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void AddvHoliday_uselistRow(vHoliday_uselistRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistRow AddvHoliday_uselistRow(int idx, string cate, string gcode, System.DateTime pdate, double term, double termDr, string contents, string uid, string wuid, System.DateTime wdate) { vHoliday_uselistRow rowvHoliday_uselistRow = ((vHoliday_uselistRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -1908,7 +1908,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistRow FindByidxcate(int idx, string cate) { return ((vHoliday_uselistRow)(this.Rows.Find(new object[] { idx, @@ -1916,7 +1916,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public override global::System.Data.DataTable Clone() { vHoliday_uselistDataTable cln = ((vHoliday_uselistDataTable)(base.Clone())); cln.InitVars(); @@ -1924,13 +1924,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new vHoliday_uselistDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.columnidx = base.Columns["idx"]; this.columncate = base.Columns["cate"]; @@ -1945,7 +1945,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitClass() { this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidx); @@ -1972,7 +1972,7 @@ namespace FBS0000 { this.columncate}, true)); this.columnidx.AllowDBNull = false; this.columncate.AllowDBNull = false; - this.columncate.MaxLength = 1; + this.columncate.MaxLength = 10; this.columngcode.AllowDBNull = false; this.columngcode.MaxLength = 10; this.columntermDr.AllowDBNull = false; @@ -1984,25 +1984,25 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistRow NewvHoliday_uselistRow() { return ((vHoliday_uselistRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new vHoliday_uselistRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Type GetRowType() { return typeof(vHoliday_uselistRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.vHoliday_uselistRowChanged != null)) { @@ -2011,7 +2011,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.vHoliday_uselistRowChanging != null)) { @@ -2020,7 +2020,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.vHoliday_uselistRowDeleted != null)) { @@ -2029,7 +2029,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.vHoliday_uselistRowDeleting != null)) { @@ -2038,13 +2038,13 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void RemovevHoliday_uselistRow(vHoliday_uselistRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -2115,14 +2115,14 @@ namespace FBS0000 { private minutesDataTable tableminutes; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal minutesRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tableminutes = ((minutesDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int idx { get { return ((int)(this[this.tableminutes.idxColumn])); @@ -2133,7 +2133,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime stime { get { try { @@ -2149,7 +2149,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime etime { get { try { @@ -2165,7 +2165,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string title { get { try { @@ -2181,7 +2181,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string place { get { try { @@ -2197,7 +2197,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string contents { get { try { @@ -2213,7 +2213,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int project { get { try { @@ -2229,7 +2229,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string main { get { try { @@ -2245,7 +2245,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string sub { get { try { @@ -2261,7 +2261,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string memo { get { try { @@ -2277,7 +2277,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string wuid { get { return ((string)(this[this.tableminutes.wuidColumn])); @@ -2288,7 +2288,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime wdate { get { return ((global::System.DateTime)(this[this.tableminutes.wdateColumn])); @@ -2299,109 +2299,109 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsstimeNull() { return this.IsNull(this.tableminutes.stimeColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetstimeNull() { this[this.tableminutes.stimeColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsetimeNull() { return this.IsNull(this.tableminutes.etimeColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetetimeNull() { this[this.tableminutes.etimeColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IstitleNull() { return this.IsNull(this.tableminutes.titleColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SettitleNull() { this[this.tableminutes.titleColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsplaceNull() { return this.IsNull(this.tableminutes.placeColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetplaceNull() { this[this.tableminutes.placeColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscontentsNull() { return this.IsNull(this.tableminutes.contentsColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetcontentsNull() { this[this.tableminutes.contentsColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsprojectNull() { return this.IsNull(this.tableminutes.projectColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetprojectNull() { this[this.tableminutes.projectColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsmainNull() { return this.IsNull(this.tableminutes.mainColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetmainNull() { this[this.tableminutes.mainColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IssubNull() { return this.IsNull(this.tableminutes.subColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetsubNull() { this[this.tableminutes.subColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsmemoNull() { return this.IsNull(this.tableminutes.memoColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetmemoNull() { this[this.tableminutes.memoColumn] = global::System.Convert.DBNull; } @@ -2415,14 +2415,14 @@ namespace FBS0000 { private BoardDataTable tableBoard; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal BoardRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tableBoard = ((BoardDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int idx { get { return ((int)(this[this.tableBoard.idxColumn])); @@ -2433,7 +2433,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int bidx { get { try { @@ -2449,7 +2449,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool header { get { try { @@ -2465,7 +2465,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string cate { get { try { @@ -2481,7 +2481,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string title { get { try { @@ -2497,7 +2497,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string contents { get { try { @@ -2513,7 +2513,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string file { get { try { @@ -2529,7 +2529,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string guid { get { try { @@ -2545,7 +2545,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string wuid { get { return ((string)(this[this.tableBoard.wuidColumn])); @@ -2556,7 +2556,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime wdate { get { return ((global::System.DateTime)(this[this.tableBoard.wdateColumn])); @@ -2567,85 +2567,85 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsbidxNull() { return this.IsNull(this.tableBoard.bidxColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetbidxNull() { this[this.tableBoard.bidxColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsheaderNull() { return this.IsNull(this.tableBoard.headerColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetheaderNull() { this[this.tableBoard.headerColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscateNull() { return this.IsNull(this.tableBoard.cateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetcateNull() { this[this.tableBoard.cateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IstitleNull() { return this.IsNull(this.tableBoard.titleColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SettitleNull() { this[this.tableBoard.titleColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscontentsNull() { return this.IsNull(this.tableBoard.contentsColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetcontentsNull() { this[this.tableBoard.contentsColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsfileNull() { return this.IsNull(this.tableBoard.fileColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetfileNull() { this[this.tableBoard.fileColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsguidNull() { return this.IsNull(this.tableBoard.guidColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetguidNull() { this[this.tableBoard.guidColumn] = global::System.Convert.DBNull; } @@ -2659,14 +2659,14 @@ namespace FBS0000 { private HolydayDataTable tableHolyday; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal HolydayRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tableHolyday = ((HolydayDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int idx { get { return ((int)(this[this.tableHolyday.idxColumn])); @@ -2677,7 +2677,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string cate { get { if (this.IscateNull()) { @@ -2693,7 +2693,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string result { get { if (this.IsresultNull()) { @@ -2709,7 +2709,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime sdate { get { try { @@ -2725,7 +2725,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime edate { get { try { @@ -2741,7 +2741,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public double term { get { if (this.IstermNull()) { @@ -2757,7 +2757,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string title { get { if (this.IstitleNull()) { @@ -2773,7 +2773,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string contents { get { if (this.IscontentsNull()) { @@ -2789,7 +2789,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string uid { get { if (this.IsuidNull()) { @@ -2805,7 +2805,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string tolist { get { if (this.IstolistNull()) { @@ -2821,7 +2821,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool mail { get { if (this.IsmailNull()) { @@ -2837,7 +2837,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool mailsend { get { if (this.IsmailsendNull()) { @@ -2853,7 +2853,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string reason { get { if (this.IsreasonNull()) { @@ -2869,7 +2869,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string wuid { get { return ((string)(this[this.tableHolyday.wuidColumn])); @@ -2880,7 +2880,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime wdate { get { return ((global::System.DateTime)(this[this.tableHolyday.wdateColumn])); @@ -2891,7 +2891,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public double termDr { get { if (this.IstermDrNull()) { @@ -2907,7 +2907,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string gcode { get { return ((string)(this[this.tableHolyday.gcodeColumn])); @@ -2918,157 +2918,157 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscateNull() { return this.IsNull(this.tableHolyday.cateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetcateNull() { this[this.tableHolyday.cateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsresultNull() { return this.IsNull(this.tableHolyday.resultColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetresultNull() { this[this.tableHolyday.resultColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IssdateNull() { return this.IsNull(this.tableHolyday.sdateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetsdateNull() { this[this.tableHolyday.sdateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsedateNull() { return this.IsNull(this.tableHolyday.edateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetedateNull() { this[this.tableHolyday.edateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IstermNull() { return this.IsNull(this.tableHolyday.termColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SettermNull() { this[this.tableHolyday.termColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IstitleNull() { return this.IsNull(this.tableHolyday.titleColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SettitleNull() { this[this.tableHolyday.titleColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscontentsNull() { return this.IsNull(this.tableHolyday.contentsColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetcontentsNull() { this[this.tableHolyday.contentsColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsuidNull() { return this.IsNull(this.tableHolyday.uidColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetuidNull() { this[this.tableHolyday.uidColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IstolistNull() { return this.IsNull(this.tableHolyday.tolistColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SettolistNull() { this[this.tableHolyday.tolistColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsmailNull() { return this.IsNull(this.tableHolyday.mailColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetmailNull() { this[this.tableHolyday.mailColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsmailsendNull() { return this.IsNull(this.tableHolyday.mailsendColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetmailsendNull() { this[this.tableHolyday.mailsendColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsreasonNull() { return this.IsNull(this.tableHolyday.reasonColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetreasonNull() { this[this.tableHolyday.reasonColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IstermDrNull() { return this.IsNull(this.tableHolyday.termDrColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SettermDrNull() { this[this.tableHolyday.termDrColumn] = global::System.Convert.DBNull; } @@ -3082,14 +3082,14 @@ namespace FBS0000 { private vHoliday_uselistDataTable tablevHoliday_uselist; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal vHoliday_uselistRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tablevHoliday_uselist = ((vHoliday_uselistDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int idx { get { return ((int)(this[this.tablevHoliday_uselist.idxColumn])); @@ -3100,7 +3100,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string cate { get { return ((string)(this[this.tablevHoliday_uselist.cateColumn])); @@ -3111,7 +3111,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string gcode { get { return ((string)(this[this.tablevHoliday_uselist.gcodeColumn])); @@ -3122,7 +3122,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime pdate { get { try { @@ -3138,7 +3138,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public double term { get { if (this.IstermNull()) { @@ -3154,7 +3154,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public double termDr { get { return ((double)(this[this.tablevHoliday_uselist.termDrColumn])); @@ -3165,7 +3165,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string contents { get { if (this.IscontentsNull()) { @@ -3181,7 +3181,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string uid { get { try { @@ -3197,7 +3197,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string wuid { get { return ((string)(this[this.tablevHoliday_uselist.wuidColumn])); @@ -3208,7 +3208,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public System.DateTime wdate { get { return ((global::System.DateTime)(this[this.tablevHoliday_uselist.wdateColumn])); @@ -3219,49 +3219,49 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IspdateNull() { return this.IsNull(this.tablevHoliday_uselist.pdateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetpdateNull() { this[this.tablevHoliday_uselist.pdateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IstermNull() { return this.IsNull(this.tablevHoliday_uselist.termColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SettermNull() { this[this.tablevHoliday_uselist.termColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscontentsNull() { return this.IsNull(this.tablevHoliday_uselist.contentsColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetcontentsNull() { this[this.tablevHoliday_uselist.contentsColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsuidNull() { return this.IsNull(this.tablevHoliday_uselist.uidColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public void SetuidNull() { this[this.tablevHoliday_uselist.uidColumn] = global::System.Convert.DBNull; } @@ -3270,7 +3270,7 @@ namespace FBS0000 { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public class minutesRowChangeEvent : global::System.EventArgs { private minutesRow eventRow; @@ -3278,14 +3278,14 @@ namespace FBS0000 { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesRowChangeEvent(minutesRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesRow Row { get { return this.eventRow; @@ -3293,7 +3293,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -3304,7 +3304,7 @@ namespace FBS0000 { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public class BoardRowChangeEvent : global::System.EventArgs { private BoardRow eventRow; @@ -3312,14 +3312,14 @@ namespace FBS0000 { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardRowChangeEvent(BoardRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardRow Row { get { return this.eventRow; @@ -3327,7 +3327,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -3338,7 +3338,7 @@ namespace FBS0000 { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public class HolydayRowChangeEvent : global::System.EventArgs { private HolydayRow eventRow; @@ -3346,14 +3346,14 @@ namespace FBS0000 { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayRowChangeEvent(HolydayRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayRow Row { get { return this.eventRow; @@ -3361,7 +3361,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -3372,7 +3372,7 @@ namespace FBS0000 { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public class vHoliday_uselistRowChangeEvent : global::System.EventArgs { private vHoliday_uselistRow eventRow; @@ -3380,14 +3380,14 @@ namespace FBS0000 { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistRowChangeEvent(vHoliday_uselistRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistRow Row { get { return this.eventRow; @@ -3395,7 +3395,7 @@ namespace FBS0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -3429,13 +3429,13 @@ namespace FBS0000.dsMSSQLTableAdapters { private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public minutesTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -3446,7 +3446,7 @@ namespace FBS0000.dsMSSQLTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -3474,7 +3474,7 @@ namespace FBS0000.dsMSSQLTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -3500,7 +3500,7 @@ namespace FBS0000.dsMSSQLTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -3511,7 +3511,7 @@ namespace FBS0000.dsMSSQLTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -3522,7 +3522,7 @@ namespace FBS0000.dsMSSQLTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -3615,14 +3615,14 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); @@ -3638,7 +3638,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.minutesDataTable dataTable) { @@ -3651,7 +3651,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.minutesDataTable GetData() { @@ -3662,7 +3662,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, false)] public virtual int FillByIDX(dsMSSQL.minutesDataTable dataTable, int idx) { @@ -3676,7 +3676,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, false)] public virtual dsMSSQL.minutesDataTable GetbyIDX(int idx) { @@ -3688,21 +3688,21 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(dsMSSQL.minutesDataTable dataTable) { return this.Adapter.Update(dataTable); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(dsMSSQL dataSet) { return this.Adapter.Update(dataSet, "minutes"); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow dataRow) { return this.Adapter.Update(new global::System.Data.DataRow[] { @@ -3710,14 +3710,14 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow[] dataRows) { return this.Adapter.Update(dataRows); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, global::System.Nullable Original_stime, global::System.Nullable Original_etime, string Original_title, string Original_place, global::System.Nullable Original_project, string Original_main, string Original_sub, string Original_wuid, System.DateTime Original_wdate) { @@ -3802,7 +3802,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.Insert, true)] public virtual int Insert(global::System.Nullable stime, global::System.Nullable etime, string title, string place, string contents, global::System.Nullable project, string main, string sub, string memo, string wuid, System.DateTime wdate) { @@ -3884,7 +3884,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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( @@ -4053,7 +4053,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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( @@ -4104,13 +4104,13 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public BoardTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -4121,7 +4121,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -4149,7 +4149,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -4175,7 +4175,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -4186,7 +4186,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -4197,7 +4197,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -4280,14 +4280,14 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); @@ -4299,7 +4299,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.BoardDataTable dataTable, global::System.Nullable bidx) { @@ -4318,7 +4318,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.BoardDataTable GetData(global::System.Nullable bidx) { @@ -4335,21 +4335,21 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(dsMSSQL.BoardDataTable dataTable) { return this.Adapter.Update(dataTable); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(dsMSSQL dataSet) { return this.Adapter.Update(dataSet, "Board"); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow dataRow) { return this.Adapter.Update(new global::System.Data.DataRow[] { @@ -4357,14 +4357,14 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow[] dataRows) { return this.Adapter.Update(dataRows); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, global::System.Nullable Original_bidx, global::System.Nullable Original_header, string Original_cate, string Original_title, string Original_file, string Original_guid, string Original_wuid, System.DateTime Original_wdate) { @@ -4441,7 +4441,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.Insert, true)] public virtual int Insert(global::System.Nullable bidx, global::System.Nullable header, string cate, string title, string contents, string file, string guid, string wuid, System.DateTime wdate) { @@ -4511,7 +4511,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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( @@ -4657,7 +4657,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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( @@ -4705,13 +4705,13 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -4722,7 +4722,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -4750,7 +4750,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -4776,7 +4776,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -4787,7 +4787,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -4798,7 +4798,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -4935,14 +4935,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); @@ -4965,7 +4965,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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) { @@ -4996,7 +4996,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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) { @@ -5025,7 +5025,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, false)] public virtual int FillByIdx(dsMSSQL.HolydayDataTable dataTable, string gcode, int idx) { @@ -5045,7 +5045,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, false)] public virtual dsMSSQL.HolydayDataTable GetbyIdx(string gcode, int idx) { @@ -5063,21 +5063,21 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(dsMSSQL.HolydayDataTable dataTable) { return this.Adapter.Update(dataTable); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(dsMSSQL dataSet) { return this.Adapter.Update(dataSet, "Holyday"); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow dataRow) { return this.Adapter.Update(new global::System.Data.DataRow[] { @@ -5085,14 +5085,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow[] dataRows) { return this.Adapter.Update(dataRows); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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) { @@ -5207,7 +5207,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.Insert, true)] public virtual int Insert( @@ -5335,7 +5335,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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( @@ -5595,13 +5595,13 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -5612,7 +5612,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -5640,7 +5640,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -5666,7 +5666,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -5677,7 +5677,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -5688,7 +5688,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -5708,14 +5708,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); @@ -5738,7 +5738,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.vHoliday_uselistDataTable dataTable, string user, string sd, string ed, string gcode) { @@ -5775,7 +5775,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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.vHoliday_uselistDataTable GetData(string user, string sd, string ed, string gcode) { @@ -5810,7 +5810,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, false)] public virtual int FillByIdx(dsMSSQL.vHoliday_uselistDataTable dataTable, string gcode, int idx) { @@ -5830,7 +5830,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [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, false)] public virtual dsMSSQL.vHoliday_uselistDataTable GetbyIdx(string gcode, int idx) { @@ -5871,7 +5871,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail private global::System.Data.IDbConnection _connection; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public UpdateOrderOption UpdateOrder { get { return this._updateOrder; @@ -5882,7 +5882,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + "a", "System.Drawing.Design.UITypeEditor")] @@ -5896,7 +5896,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + "a", "System.Drawing.Design.UITypeEditor")] @@ -5910,7 +5910,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + "a", "System.Drawing.Design.UITypeEditor")] @@ -5924,7 +5924,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool BackupDataSetBeforeUpdate { get { return this._backupDataSetBeforeUpdate; @@ -5935,7 +5935,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] public global::System.Data.IDbConnection Connection { get { @@ -5962,7 +5962,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int TableAdapterInstanceCount { get { @@ -5984,7 +5984,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail ///Update rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private int UpdateUpdatedRows(dsMSSQL dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { int result = 0; if ((this._minutesTableAdapter != null)) { @@ -6021,7 +6021,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail ///Insert rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private int UpdateInsertedRows(dsMSSQL dataSet, global::System.Collections.Generic.List allAddedRows) { int result = 0; if ((this._minutesTableAdapter != null)) { @@ -6055,7 +6055,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail ///Delete rows in bottom-up order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private int UpdateDeletedRows(dsMSSQL dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; if ((this._holydayTableAdapter != null)) { @@ -6089,7 +6089,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail ///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List allAddedRows) { if (((updatedRows == null) || (updatedRows.Length < 1))) { @@ -6113,7 +6113,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail ///Update all changes to the dataset. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public virtual int UpdateAll(dsMSSQL dataSet) { if ((dataSet == null)) { throw new global::System.ArgumentNullException("dataSet"); @@ -6274,13 +6274,13 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) { global::System.Array.Sort(rows, new SelfReferenceComparer(relation, childFirst)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) { if ((this._connection != null)) { return true; @@ -6298,7 +6298,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail /// ///Update Order Option /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public enum UpdateOrderOption { InsertUpdateDelete = 0, @@ -6309,7 +6309,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail /// ///Used to sort self-referenced table's rows /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer { private global::System.Data.DataRelation _relation; @@ -6317,7 +6317,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail private int _childFirst; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) { this._relation = relation; if (childFirst) { @@ -6329,7 +6329,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) { global::System.Diagnostics.Debug.Assert((row != null)); global::System.Data.DataRow root = row; @@ -6368,7 +6368,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) { if (object.ReferenceEquals(row1, row2)) { return 0; diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd index 66e4ef3..2956f9e 100644 --- a/SubProject/FBS0000/dsMSSQL.xsd +++ b/SubProject/FBS0000/dsMSSQL.xsd @@ -456,7 +456,7 @@ WHERE gcode = @gcode and idx =@idx - + @@ -516,7 +516,7 @@ WHERE gcode = @gcode and idx =@idx - + @@ -568,7 +568,7 @@ WHERE gcode = @gcode and idx =@idx - + @@ -645,14 +645,14 @@ WHERE gcode = @gcode and idx =@idx - + - + diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss index 5f28270..b1b351b 100644 --- a/SubProject/FBS0000/dsMSSQL.xss +++ b/SubProject/FBS0000/dsMSSQL.xss @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 2a568bd..aaa460a 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -161,6 +161,12 @@ fNote.cs + + Form + + + fTextEditor.cs + Form @@ -298,6 +304,9 @@ fNote.cs + + fTextEditor.cs + fNote_Add.cs diff --git a/SubProject/FPJ0000/Note/fTextEditor.Designer.cs b/SubProject/FPJ0000/Note/fTextEditor.Designer.cs new file mode 100644 index 0000000..231a557 --- /dev/null +++ b/SubProject/FPJ0000/Note/fTextEditor.Designer.cs @@ -0,0 +1,130 @@ +namespace FPJ0000.Note +{ + partial class fTextEditor + { + /// + /// 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(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPRJ = new FPJ0000.dsPRJ(); + this.btSave = new System.Windows.Forms.Button(); + this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); + this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + this.SuspendLayout(); + // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsPRJ; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // btSave + // + this.btSave.BackColor = System.Drawing.Color.SkyBlue; + this.btSave.Dock = System.Windows.Forms.DockStyle.Bottom; + this.btSave.Location = new System.Drawing.Point(0, 632); + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(969, 49); + this.btSave.TabIndex = 20; + this.btSave.Text = "저장(&S)"; + this.btSave.UseVisualStyleBackColor = false; + this.btSave.Click += new System.EventHandler(this.button1_Click); + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_NoteTableAdapter = null; + this.tam.JobReportTableAdapter = this.ta; + this.tam.ProjectsHistoryTableAdapter = null; + this.tam.ProjectsIOMapTableAdapter = null; + this.tam.ProjectsMailListTableAdapter = null; + this.tam.ProjectsPartTableAdapter = null; + this.tam.ProjectsScheduleTableAdapter = null; + this.tam.ProjectsTableAdapter = null; + this.tam.SPMasterTableAdapter = null; + this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // + // richTextBoxEx1 + // + this.richTextBoxEx1.AllowBullets = true; + this.richTextBoxEx1.AllowDefaultInsertText = true; + this.richTextBoxEx1.AllowDefaultSmartText = true; + this.richTextBoxEx1.AllowHyphenation = true; + this.richTextBoxEx1.AllowPictures = true; + this.richTextBoxEx1.AllowSpellCheck = true; + this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; + this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBoxEx1.FilePath = ""; + this.richTextBoxEx1.Location = new System.Drawing.Point(0, 0); + this.richTextBoxEx1.Name = "richTextBoxEx1"; + this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n\\viewkind4\\uc" + + "1\\pard\\lang1042\\fs20 richTextBoxEx1\\par\r\n}\r\n"; + this.richTextBoxEx1.SetColorWithFont = true; + this.richTextBoxEx1.ShowToolStrip = true; + this.richTextBoxEx1.Size = new System.Drawing.Size(969, 632); + this.richTextBoxEx1.TabIndex = 58; + // + // fTextEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(969, 681); + this.Controls.Add(this.richTextBoxEx1); + this.Controls.Add(this.btSave); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fTextEditor"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "문자 편집"; + this.Load += new System.EventHandler(this.fJobReport_Add_Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private dsPRJ dsPRJ; + private System.Windows.Forms.BindingSource bs; + private dsPRJTableAdapters.JobReportTableAdapter ta; + private dsPRJTableAdapters.TableAdapterManager tam; + private System.Windows.Forms.Button btSave; + public RichTextBoxEx.RichTextBoxEx richTextBoxEx1; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/Note/fTextEditor.cs b/SubProject/FPJ0000/Note/fTextEditor.cs new file mode 100644 index 0000000..da55ff7 --- /dev/null +++ b/SubProject/FPJ0000/Note/fTextEditor.cs @@ -0,0 +1,88 @@ +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 FPJ0000.Note +{ + public partial class fTextEditor : Form + { + + Boolean bInit = false; + public fTextEditor(string rtf) + { + InitializeComponent(); + + this.KeyPreview = true; + this.StartPosition = FormStartPosition.CenterScreen; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + if (string.IsNullOrEmpty(rtf) == false) this.richTextBoxEx1.Rtf = rtf; + else this.richTextBoxEx1.Text = string.Empty; + + } + + + private void fJobReport_Add_Load(object sender, EventArgs e) + { + + + this.Show(); + Application.DoEvents(); + + this.richTextBoxEx1.Focus(); + + bInit = true; + } + // editform.editor ed; + void ctl_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + Control ctl = sender as Control; + string nm = ctl.Name.ToLower(); + string search = ctl.Text.Trim(); + + Console.WriteLine("inner keydown " + nm + ":" + search); + + switch (nm) + { + //case "cmbrequest": + + // //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다. + // var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbUser.Text + "%'", "pdate desc"); + // if (lastprocess != "") cbProcess.Text = lastprocess; + // tbSID.Focus(); + // break; + case "tbdescription": + if (e.Control) + { + btSave.Focus(); + } + break; + + default: + SendKeys.Send("{TAB}"); + break; + } + } + } + + private void button1_Click(object sender, EventArgs e) + { + this.Invalidate(); + + DialogResult = System.Windows.Forms.DialogResult.OK; + } + + + + + } +} diff --git a/SubProject/FPJ0000/Note/fTextEditor.resx b/SubProject/FPJ0000/Note/fTextEditor.resx new file mode 100644 index 0000000..401e1cf --- /dev/null +++ b/SubProject/FPJ0000/Note/fTextEditor.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 100, 17 + + + 17, 17 + + + 17, 17 + + + 164, 17 + + + 226, 17 + + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 991eced..77c995a 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -49,7 +49,7 @@ System.Windows.Forms.Label label5; System.Windows.Forms.Label label7; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -96,6 +96,7 @@ this.cmbPart = new System.Windows.Forms.ComboBox(); this.arLabel1 = new arCtl.arLabel(); this.panel1 = new System.Windows.Forms.Panel(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); this.cmbCate = new System.Windows.Forms.ComboBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.textBox4 = new System.Windows.Forms.TextBox(); @@ -136,6 +137,23 @@ this.bsSchedule = new System.Windows.Forms.BindingSource(this.components); this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taSchedule = new FPJ0000.dsPRJTableAdapters.ProjectsScheduleTableAdapter(); + this.panel4 = new System.Windows.Forms.Panel(); + this.rtBef = new System.Windows.Forms.RichTextBox(); + this.arLabel8 = new arCtl.arLabel(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.panel8 = new System.Windows.Forms.Panel(); + this.rtDesc = new System.Windows.Forms.RichTextBox(); + this.arLabel11 = new arCtl.arLabel(); + this.arPanel3 = new arCtl.arPanel(); + this.rtBack = new System.Windows.Forms.RichTextBox(); + this.arLabel10 = new arCtl.arLabel(); + this.panel6 = new System.Windows.Forms.Panel(); + this.rtAft = new System.Windows.Forms.RichTextBox(); + this.arLabel9 = new arCtl.arLabel(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.arLabel12 = new arCtl.arLabel(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); usermainLabel = new System.Windows.Forms.Label(); @@ -171,6 +189,14 @@ ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).BeginInit(); + this.panel4.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.panel8.SuspendLayout(); + this.arPanel3.SuspendLayout(); + this.panel6.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); this.SuspendLayout(); // // nameLabel @@ -194,34 +220,37 @@ // usermainLabel // usermainLabel.AutoSize = true; - usermainLabel.Location = new System.Drawing.Point(213, 35); + usermainLabel.Font = new System.Drawing.Font("맑은 고딕", 12F); + usermainLabel.Location = new System.Drawing.Point(49, 66); usermainLabel.Name = "usermainLabel"; - usermainLabel.Size = new System.Drawing.Size(29, 12); + usermainLabel.Size = new System.Drawing.Size(43, 21); usermainLabel.TabIndex = 24; usermainLabel.Text = "H/W"; // // usersubLabel // usersubLabel.AutoSize = true; - usersubLabel.Location = new System.Drawing.Point(214, 62); + usersubLabel.Font = new System.Drawing.Font("맑은 고딕", 12F); + usersubLabel.Location = new System.Drawing.Point(52, 99); usersubLabel.Name = "usersubLabel"; - usersubLabel.Size = new System.Drawing.Size(29, 12); + usersubLabel.Size = new System.Drawing.Size(40, 21); usersubLabel.TabIndex = 26; usersubLabel.Text = "S/W"; // // userManagerLabel // userManagerLabel.AutoSize = true; - userManagerLabel.Location = new System.Drawing.Point(22, 34); + userManagerLabel.Font = new System.Drawing.Font("맑은 고딕", 12F); + userManagerLabel.Location = new System.Drawing.Point(9, 33); userManagerLabel.Name = "userManagerLabel"; - userManagerLabel.Size = new System.Drawing.Size(63, 12); + userManagerLabel.Size = new System.Drawing.Size(84, 21); userManagerLabel.TabIndex = 32; userManagerLabel.Text = "Champion"; // // costoLabel // costoLabel.AutoSize = true; - costoLabel.Location = new System.Drawing.Point(189, 37); + costoLabel.Location = new System.Drawing.Point(189, 36); costoLabel.Name = "costoLabel"; costoLabel.Size = new System.Drawing.Size(66, 12); costoLabel.TabIndex = 40; @@ -230,7 +259,7 @@ // costnLabel // costnLabel.AutoSize = true; - costnLabel.Location = new System.Drawing.Point(23, 37); + costnLabel.Location = new System.Drawing.Point(23, 36); costnLabel.Name = "costnLabel"; costnLabel.Size = new System.Drawing.Size(62, 12); costnLabel.TabIndex = 42; @@ -239,7 +268,7 @@ // costeLabel // costeLabel.AutoSize = true; - costeLabel.Location = new System.Drawing.Point(355, 37); + costeLabel.Location = new System.Drawing.Point(355, 36); costeLabel.Name = "costeLabel"; costeLabel.Size = new System.Drawing.Size(70, 12); costeLabel.TabIndex = 44; @@ -248,7 +277,7 @@ // cntLabel // cntLabel.AutoSize = true; - cntLabel.Location = new System.Drawing.Point(56, 65); + cntLabel.Location = new System.Drawing.Point(56, 64); cntLabel.Name = "cntLabel"; cntLabel.Size = new System.Drawing.Size(29, 12); cntLabel.TabIndex = 46; @@ -315,9 +344,10 @@ // label8 // label8.AutoSize = true; - label8.Location = new System.Drawing.Point(387, 35); + label8.Font = new System.Drawing.Font("맑은 고딕", 12F); + label8.Location = new System.Drawing.Point(50, 132); label8.Name = "label8"; - label8.Size = new System.Drawing.Size(29, 12); + label8.Size = new System.Drawing.Size(42, 21); label8.TabIndex = 87; label8.Text = "전장"; // @@ -344,9 +374,10 @@ // label7 // label7.AutoSize = true; - label7.Location = new System.Drawing.Point(387, 62); + label7.Font = new System.Drawing.Font("맑은 고딕", 12F); + label7.Location = new System.Drawing.Point(50, 165); label7.Name = "label7"; - label7.Size = new System.Drawing.Size(29, 12); + label7.Size = new System.Drawing.Size(42, 21); label7.TabIndex = 89; label7.Text = "공정"; // @@ -364,6 +395,7 @@ // this.bs.DataMember = "Projects"; this.bs.DataSource = this.dsPRJ; + this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); // // dsPRJ // @@ -394,49 +426,52 @@ this.sdateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.sdateTextBox.Location = new System.Drawing.Point(93, 31); this.sdateTextBox.Name = "sdateTextBox"; - this.sdateTextBox.Size = new System.Drawing.Size(166, 21); + this.sdateTextBox.Size = new System.Drawing.Size(190, 21); this.sdateTextBox.TabIndex = 11; // // edateTextBox // this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); this.edateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.edateTextBox.Location = new System.Drawing.Point(356, 57); + this.edateTextBox.Location = new System.Drawing.Point(341, 58); this.edateTextBox.Name = "edateTextBox"; - this.edateTextBox.Size = new System.Drawing.Size(166, 21); + this.edateTextBox.Size = new System.Drawing.Size(190, 21); this.edateTextBox.TabIndex = 13; // // usermainTextBox // this.usermainTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usermain", true)); + this.usermainTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.usermainTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.usermainTextBox.Location = new System.Drawing.Point(249, 31); + this.usermainTextBox.Location = new System.Drawing.Point(98, 63); this.usermainTextBox.Name = "usermainTextBox"; - this.usermainTextBox.Size = new System.Drawing.Size(113, 21); + this.usermainTextBox.Size = new System.Drawing.Size(440, 29); this.usermainTextBox.TabIndex = 25; // // usersubTextBox // this.usersubTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usersub", true)); + this.usersubTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.usersubTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.usersubTextBox.Location = new System.Drawing.Point(249, 58); + this.usersubTextBox.Location = new System.Drawing.Point(98, 96); this.usersubTextBox.Name = "usersubTextBox"; - this.usersubTextBox.Size = new System.Drawing.Size(113, 21); + this.usersubTextBox.Size = new System.Drawing.Size(440, 29); this.usersubTextBox.TabIndex = 27; // // userManagerTextBox // this.userManagerTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userManager", true)); + this.userManagerTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.userManagerTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.userManagerTextBox.Location = new System.Drawing.Point(93, 30); + this.userManagerTextBox.Location = new System.Drawing.Point(98, 30); this.userManagerTextBox.Name = "userManagerTextBox"; - this.userManagerTextBox.Size = new System.Drawing.Size(113, 21); + this.userManagerTextBox.Size = new System.Drawing.Size(440, 29); this.userManagerTextBox.TabIndex = 33; // // costoTextBox // this.costoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costn", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); - this.costoTextBox.Location = new System.Drawing.Point(261, 33); + this.costoTextBox.Location = new System.Drawing.Point(261, 32); this.costoTextBox.Name = "costoTextBox"; this.costoTextBox.Size = new System.Drawing.Size(88, 21); this.costoTextBox.TabIndex = 41; @@ -445,7 +480,7 @@ // costnTextBox // this.costnTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costo", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); - this.costnTextBox.Location = new System.Drawing.Point(93, 33); + this.costnTextBox.Location = new System.Drawing.Point(93, 32); this.costnTextBox.Name = "costnTextBox"; this.costnTextBox.Size = new System.Drawing.Size(88, 21); this.costnTextBox.TabIndex = 43; @@ -455,7 +490,7 @@ // this.costeTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.costeTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "coste", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); - this.costeTextBox.Location = new System.Drawing.Point(434, 33); + this.costeTextBox.Location = new System.Drawing.Point(434, 32); this.costeTextBox.Name = "costeTextBox"; this.costeTextBox.Size = new System.Drawing.Size(88, 21); this.costeTextBox.TabIndex = 45; @@ -464,7 +499,7 @@ // cntTextBox // this.cntTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cnt", true)); - this.cntTextBox.Location = new System.Drawing.Point(93, 60); + this.cntTextBox.Location = new System.Drawing.Point(93, 59); this.cntTextBox.Name = "cntTextBox"; this.cntTextBox.Size = new System.Drawing.Size(88, 21); this.cntTextBox.TabIndex = 47; @@ -480,16 +515,16 @@ this.remark_reqTextBox.Multiline = true; this.remark_reqTextBox.Name = "remark_reqTextBox"; this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.remark_reqTextBox.Size = new System.Drawing.Size(433, 120); + this.remark_reqTextBox.Size = new System.Drawing.Size(411, 215); this.remark_reqTextBox.TabIndex = 49; // // ddateTextBox // this.ddateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); this.ddateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.ddateTextBox.Location = new System.Drawing.Point(356, 31); + this.ddateTextBox.Location = new System.Drawing.Point(341, 31); this.ddateTextBox.Name = "ddateTextBox"; - this.ddateTextBox.Size = new System.Drawing.Size(166, 21); + this.ddateTextBox.Size = new System.Drawing.Size(190, 21); this.ddateTextBox.TabIndex = 53; // // assetTextBox @@ -523,14 +558,14 @@ this.btMailAddr, this.btPath, this.btSendMail}); - this.bn.Location = new System.Drawing.Point(0, 517); + this.bn.Location = new System.Drawing.Point(0, 686); 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(1008, 25); + this.bn.Size = new System.Drawing.Size(984, 25); this.bn.TabIndex = 65; this.bn.Text = "bindingNavigator1"; // @@ -679,7 +714,7 @@ this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(433, 296); + this.dataGridView1.Size = new System.Drawing.Size(411, 354); this.dataGridView1.TabIndex = 0; this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick); // @@ -704,8 +739,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -753,9 +788,9 @@ // this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); this.textBox1.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox1.Location = new System.Drawing.Point(93, 57); + this.textBox1.Location = new System.Drawing.Point(93, 58); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(166, 21); + this.textBox1.Size = new System.Drawing.Size(190, 21); this.textBox1.TabIndex = 79; // // panel7 @@ -768,7 +803,7 @@ this.panel7.Controls.Add(reqstaffLabel); this.panel7.Controls.Add(this.cmbProcess); this.panel7.Controls.Add(label1); - this.panel7.Location = new System.Drawing.Point(12, 165); + this.panel7.Location = new System.Drawing.Point(6, 182); this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(547, 64); this.panel7.TabIndex = 85; @@ -833,6 +868,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.Gainsboro; + this.panel1.Controls.Add(this.checkBox2); this.panel1.Controls.Add(this.cmbCate); this.panel1.Controls.Add(label5); this.panel1.Controls.Add(this.linkLabel1); @@ -850,11 +886,21 @@ this.panel1.Controls.Add(label2); this.panel1.Controls.Add(nameLabel); this.panel1.Controls.Add(this.tbIdx); - this.panel1.Location = new System.Drawing.Point(12, 9); + this.panel1.Location = new System.Drawing.Point(6, 6); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(547, 145); + this.panel1.Size = new System.Drawing.Size(547, 169); this.panel1.TabIndex = 86; // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(93, 144); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(70, 16); + this.checkBox2.TabIndex = 88; + this.checkBox2.Text = "Fan-Out"; + this.checkBox2.UseVisualStyleBackColor = true; + // // cmbCate // this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -963,27 +1009,29 @@ this.panel5.Controls.Add(this.usermainTextBox); this.panel5.Controls.Add(userManagerLabel); this.panel5.Controls.Add(this.userManagerTextBox); - this.panel5.Location = new System.Drawing.Point(12, 235); + this.panel5.Location = new System.Drawing.Point(6, 252); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(547, 88); + this.panel5.Size = new System.Drawing.Size(547, 203); this.panel5.TabIndex = 85; // // textBox5 // this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userprocess", true)); + this.textBox5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.textBox5.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox5.Location = new System.Drawing.Point(423, 58); + this.textBox5.Location = new System.Drawing.Point(98, 162); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(113, 21); + this.textBox5.Size = new System.Drawing.Size(440, 29); this.textBox5.TabIndex = 90; // // textBox3 // this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true)); + this.textBox3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.textBox3.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox3.Location = new System.Drawing.Point(423, 31); + this.textBox3.Location = new System.Drawing.Point(98, 129); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(113, 21); + this.textBox3.Size = new System.Drawing.Size(440, 29); this.textBox3.TabIndex = 88; // // arLabel3 @@ -1042,15 +1090,15 @@ this.panel2.Controls.Add(this.ddateTextBox); this.panel2.Controls.Add(this.edateTextBox); this.panel2.Controls.Add(this.textBox1); - this.panel2.Location = new System.Drawing.Point(12, 329); + this.panel2.Location = new System.Drawing.Point(6, 461); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(546, 88); + this.panel2.Size = new System.Drawing.Size(547, 94); this.panel2.TabIndex = 86; // // linkLabel5 // this.linkLabel5.AutoSize = true; - this.linkLabel5.Location = new System.Drawing.Point(17, 61); + this.linkLabel5.Location = new System.Drawing.Point(17, 62); this.linkLabel5.Name = "linkLabel5"; this.linkLabel5.Size = new System.Drawing.Size(71, 12); this.linkLabel5.TabIndex = 90; @@ -1061,7 +1109,7 @@ // linkLabel4 // this.linkLabel4.AutoSize = true; - this.linkLabel4.Location = new System.Drawing.Point(307, 61); + this.linkLabel4.Location = new System.Drawing.Point(292, 62); this.linkLabel4.Name = "linkLabel4"; this.linkLabel4.Size = new System.Drawing.Size(41, 12); this.linkLabel4.TabIndex = 89; @@ -1072,7 +1120,7 @@ // linkLabel3 // this.linkLabel3.AutoSize = true; - this.linkLabel3.Location = new System.Drawing.Point(307, 35); + this.linkLabel3.Location = new System.Drawing.Point(292, 35); this.linkLabel3.Name = "linkLabel3"; this.linkLabel3.Size = new System.Drawing.Size(41, 12); this.linkLabel3.TabIndex = 88; @@ -1128,7 +1176,7 @@ this.arLabel4.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel4.SignColor = System.Drawing.Color.Yellow; this.arLabel4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel4.Size = new System.Drawing.Size(546, 23); + this.arLabel4.Size = new System.Drawing.Size(547, 23); this.arLabel4.TabIndex = 86; this.arLabel4.Text = "일정"; this.arLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1147,9 +1195,9 @@ this.panel3.Controls.Add(costnLabel); this.panel3.Controls.Add(this.costoTextBox); this.panel3.Controls.Add(costoLabel); - this.panel3.Location = new System.Drawing.Point(12, 423); + this.panel3.Location = new System.Drawing.Point(6, 561); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(546, 88); + this.panel3.Size = new System.Drawing.Size(546, 93); this.panel3.TabIndex = 86; // // arLabel5 @@ -1233,9 +1281,9 @@ this.arLabel6.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel6.SignColor = System.Drawing.Color.Yellow; this.arLabel6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel6.Size = new System.Drawing.Size(433, 23); + this.arLabel6.Size = new System.Drawing.Size(411, 23); this.arLabel6.TabIndex = 86; - this.arLabel6.Text = "개선방향"; + this.arLabel6.Text = "개선 방향"; this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.arLabel6.TextShadow = true; this.arLabel6.TextVisible = true; @@ -1252,7 +1300,7 @@ this.arPanel1.ForeColor = System.Drawing.Color.Khaki; this.arPanel1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; this.arPanel1.GradientRepeatBG = true; - this.arPanel1.Location = new System.Drawing.Point(565, 9); + this.arPanel1.Location = new System.Drawing.Point(559, 6); this.arPanel1.Name = "arPanel1"; this.arPanel1.Padding = new System.Windows.Forms.Padding(1); this.arPanel1.ProgressColor1 = System.Drawing.Color.LightSkyBlue; @@ -1263,7 +1311,7 @@ this.arPanel1.ProgressValue = 0F; this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.ShowBorder = true; - this.arPanel1.Size = new System.Drawing.Size(435, 145); + this.arPanel1.Size = new System.Drawing.Size(413, 240); this.arPanel1.TabIndex = 88; this.arPanel1.Text = "arPanel1"; this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1283,7 +1331,7 @@ this.arPanel2.ForeColor = System.Drawing.Color.Black; this.arPanel2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; this.arPanel2.GradientRepeatBG = true; - this.arPanel2.Location = new System.Drawing.Point(565, 165); + this.arPanel2.Location = new System.Drawing.Point(559, 250); this.arPanel2.Name = "arPanel2"; this.arPanel2.Padding = new System.Windows.Forms.Padding(1); this.arPanel2.ProgressColor1 = System.Drawing.Color.LightSkyBlue; @@ -1294,7 +1342,7 @@ this.arPanel2.ProgressValue = 0F; this.arPanel2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel2.ShowBorder = true; - this.arPanel2.Size = new System.Drawing.Size(435, 346); + this.arPanel2.Size = new System.Drawing.Size(413, 404); this.arPanel2.TabIndex = 89; this.arPanel2.Text = "arPanel2"; this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1321,14 +1369,14 @@ this.btwADd, this.btwEdit, this.btwDel}); - this.bindingNavigator1.Location = new System.Drawing.Point(1, 320); + this.bindingNavigator1.Location = new System.Drawing.Point(1, 378); this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem1; this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem1; this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem1; this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1; this.bindingNavigator1.Name = "bindingNavigator1"; this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1; - this.bindingNavigator1.Size = new System.Drawing.Size(433, 25); + this.bindingNavigator1.Size = new System.Drawing.Size(411, 25); this.bindingNavigator1.TabIndex = 87; this.bindingNavigator1.Text = "bindingNavigator1"; // @@ -1463,9 +1511,9 @@ this.arLabel7.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel7.SignColor = System.Drawing.Color.Yellow; this.arLabel7.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel7.Size = new System.Drawing.Size(433, 23); + this.arLabel7.Size = new System.Drawing.Size(411, 23); this.arLabel7.TabIndex = 86; - this.arLabel7.Text = "주간업무현황"; + this.arLabel7.Text = "주간 업무 현황"; this.arLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.arLabel7.TextShadow = true; this.arLabel7.TextVisible = true; @@ -1477,6 +1525,7 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_NoteTableAdapter = null; this.tam.JobReportTableAdapter = null; this.tam.ProjectsHistoryTableAdapter = null; this.tam.ProjectsIOMapTableAdapter = null; @@ -1500,18 +1549,402 @@ // this.taSchedule.ClearBeforeFill = true; // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.Gainsboro; + this.panel4.Controls.Add(this.rtBef); + this.panel4.Controls.Add(this.arLabel8); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(3, 257); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(479, 362); + this.panel4.TabIndex = 90; + // + // rtBef + // + this.rtBef.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtBef.Location = new System.Drawing.Point(0, 23); + this.rtBef.Name = "rtBef"; + this.rtBef.ReadOnly = true; + this.rtBef.Size = new System.Drawing.Size(479, 339); + this.rtBef.TabIndex = 87; + this.rtBef.Text = ""; + this.rtBef.Click += new System.EventHandler(this.rtBack_Click); + this.rtBef.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick); + // + // arLabel8 + // + this.arLabel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231))))); + this.arLabel8.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209))))); + this.arLabel8.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.arLabel8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel8.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel8.BorderSize = new System.Windows.Forms.Padding(1); + this.arLabel8.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.arLabel8.Cursor = System.Windows.Forms.Cursors.Arrow; + this.arLabel8.Dock = System.Windows.Forms.DockStyle.Top; + this.arLabel8.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.arLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel8.GradientEnable = true; + this.arLabel8.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + this.arLabel8.GradientRepeatBG = false; + this.arLabel8.isButton = false; + this.arLabel8.Location = new System.Drawing.Point(0, 0); + this.arLabel8.MouseDownColor = System.Drawing.Color.Yellow; + this.arLabel8.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.arLabel8.msg = null; + this.arLabel8.Name = "arLabel8"; + this.arLabel8.ProgressBorderColor = System.Drawing.Color.Black; + this.arLabel8.ProgressColor1 = System.Drawing.Color.LightSkyBlue; + this.arLabel8.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; + this.arLabel8.ProgressEnable = false; + this.arLabel8.ProgressFont = new System.Drawing.Font("Consolas", 10F); + this.arLabel8.ProgressForeColor = System.Drawing.Color.Black; + this.arLabel8.ProgressMax = 100F; + this.arLabel8.ProgressMin = 0F; + this.arLabel8.ProgressPadding = new System.Windows.Forms.Padding(0); + this.arLabel8.ProgressValue = 0F; + this.arLabel8.ShadowColor = System.Drawing.Color.WhiteSmoke; + this.arLabel8.Sign = ""; + this.arLabel8.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.arLabel8.SignColor = System.Drawing.Color.Yellow; + this.arLabel8.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.arLabel8.Size = new System.Drawing.Size(479, 23); + this.arLabel8.TabIndex = 86; + this.arLabel8.Text = "개선 전"; + this.arLabel8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.arLabel8.TextShadow = true; + this.arLabel8.TextVisible = true; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.panel8, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.arPanel3, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.panel6, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.panel4, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 35); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 254F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(970, 622); + this.tableLayoutPanel1.TabIndex = 91; + // + // panel8 + // + this.panel8.BackColor = System.Drawing.Color.Gainsboro; + this.panel8.Controls.Add(this.rtDesc); + this.panel8.Controls.Add(this.arLabel11); + this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel8.Location = new System.Drawing.Point(488, 3); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(479, 248); + this.panel8.TabIndex = 94; + // + // rtDesc + // + this.rtDesc.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtDesc.Location = new System.Drawing.Point(0, 23); + this.rtDesc.Name = "rtDesc"; + this.rtDesc.ReadOnly = true; + this.rtDesc.Size = new System.Drawing.Size(479, 225); + this.rtDesc.TabIndex = 87; + this.rtDesc.Text = ""; + this.rtDesc.Click += new System.EventHandler(this.rtBack_Click); + this.rtDesc.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick); + // + // arLabel11 + // + this.arLabel11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231))))); + this.arLabel11.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209))))); + this.arLabel11.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.arLabel11.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel11.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel11.BorderSize = new System.Windows.Forms.Padding(1); + this.arLabel11.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.arLabel11.Cursor = System.Windows.Forms.Cursors.Arrow; + this.arLabel11.Dock = System.Windows.Forms.DockStyle.Top; + this.arLabel11.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.arLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel11.GradientEnable = true; + this.arLabel11.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + this.arLabel11.GradientRepeatBG = false; + this.arLabel11.isButton = false; + this.arLabel11.Location = new System.Drawing.Point(0, 0); + this.arLabel11.MouseDownColor = System.Drawing.Color.Yellow; + this.arLabel11.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.arLabel11.msg = null; + this.arLabel11.Name = "arLabel11"; + this.arLabel11.ProgressBorderColor = System.Drawing.Color.Black; + this.arLabel11.ProgressColor1 = System.Drawing.Color.LightSkyBlue; + this.arLabel11.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; + this.arLabel11.ProgressEnable = false; + this.arLabel11.ProgressFont = new System.Drawing.Font("Consolas", 10F); + this.arLabel11.ProgressForeColor = System.Drawing.Color.Black; + this.arLabel11.ProgressMax = 100F; + this.arLabel11.ProgressMin = 0F; + this.arLabel11.ProgressPadding = new System.Windows.Forms.Padding(0); + this.arLabel11.ProgressValue = 0F; + this.arLabel11.ShadowColor = System.Drawing.Color.WhiteSmoke; + this.arLabel11.Sign = ""; + this.arLabel11.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.arLabel11.SignColor = System.Drawing.Color.Yellow; + this.arLabel11.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.arLabel11.Size = new System.Drawing.Size(479, 23); + this.arLabel11.TabIndex = 86; + this.arLabel11.Text = "완료내역"; + this.arLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.arLabel11.TextShadow = true; + this.arLabel11.TextVisible = true; + // + // arPanel3 + // + this.arPanel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); + this.arPanel3.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); + this.arPanel3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.arPanel3.BorderSize = new System.Windows.Forms.Padding(1); + this.arPanel3.Controls.Add(this.rtBack); + this.arPanel3.Controls.Add(this.arLabel10); + this.arPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.arPanel3.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.arPanel3.ForeColor = System.Drawing.Color.Khaki; + this.arPanel3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + this.arPanel3.GradientRepeatBG = true; + this.arPanel3.Location = new System.Drawing.Point(3, 3); + this.arPanel3.Name = "arPanel3"; + this.arPanel3.Padding = new System.Windows.Forms.Padding(1); + this.arPanel3.ProgressColor1 = System.Drawing.Color.LightSkyBlue; + this.arPanel3.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; + this.arPanel3.ProgressMax = 100F; + this.arPanel3.ProgressMin = 0F; + this.arPanel3.ProgressPadding = new System.Windows.Forms.Padding(0); + this.arPanel3.ProgressValue = 0F; + this.arPanel3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); + this.arPanel3.ShowBorder = true; + this.arPanel3.Size = new System.Drawing.Size(479, 248); + this.arPanel3.TabIndex = 92; + this.arPanel3.Text = "arPanel3"; + this.arPanel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.arPanel3.TextShadow = false; + this.arPanel3.UseProgressBar = false; + // + // rtBack + // + this.rtBack.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtBack.Location = new System.Drawing.Point(1, 24); + this.rtBack.Name = "rtBack"; + this.rtBack.ReadOnly = true; + this.rtBack.Size = new System.Drawing.Size(477, 223); + this.rtBack.TabIndex = 87; + this.rtBack.Text = ""; + this.rtBack.Click += new System.EventHandler(this.rtBack_Click); + this.rtBack.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick); + // + // arLabel10 + // + this.arLabel10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231))))); + this.arLabel10.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209))))); + this.arLabel10.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.arLabel10.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel10.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel10.BorderSize = new System.Windows.Forms.Padding(0, 0, 0, 1); + this.arLabel10.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.arLabel10.Cursor = System.Windows.Forms.Cursors.Arrow; + this.arLabel10.Dock = System.Windows.Forms.DockStyle.Top; + this.arLabel10.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.arLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel10.GradientEnable = true; + this.arLabel10.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + this.arLabel10.GradientRepeatBG = false; + this.arLabel10.isButton = false; + this.arLabel10.Location = new System.Drawing.Point(1, 1); + this.arLabel10.MouseDownColor = System.Drawing.Color.Yellow; + this.arLabel10.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.arLabel10.msg = null; + this.arLabel10.Name = "arLabel10"; + this.arLabel10.ProgressBorderColor = System.Drawing.Color.Black; + this.arLabel10.ProgressColor1 = System.Drawing.Color.LightSkyBlue; + this.arLabel10.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; + this.arLabel10.ProgressEnable = false; + this.arLabel10.ProgressFont = new System.Drawing.Font("Consolas", 10F); + this.arLabel10.ProgressForeColor = System.Drawing.Color.Black; + this.arLabel10.ProgressMax = 100F; + this.arLabel10.ProgressMin = 0F; + this.arLabel10.ProgressPadding = new System.Windows.Forms.Padding(0); + this.arLabel10.ProgressValue = 0F; + this.arLabel10.ShadowColor = System.Drawing.Color.WhiteSmoke; + this.arLabel10.Sign = ""; + this.arLabel10.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.arLabel10.SignColor = System.Drawing.Color.Yellow; + this.arLabel10.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.arLabel10.Size = new System.Drawing.Size(477, 23); + this.arLabel10.TabIndex = 86; + this.arLabel10.Text = "개선 배경"; + this.arLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.arLabel10.TextShadow = true; + this.arLabel10.TextVisible = true; + // + // panel6 + // + this.panel6.BackColor = System.Drawing.Color.Gainsboro; + this.panel6.Controls.Add(this.rtAft); + this.panel6.Controls.Add(this.arLabel9); + this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel6.Location = new System.Drawing.Point(488, 257); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(479, 362); + this.panel6.TabIndex = 90; + // + // rtAft + // + this.rtAft.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtAft.Location = new System.Drawing.Point(0, 23); + this.rtAft.Name = "rtAft"; + this.rtAft.ReadOnly = true; + this.rtAft.Size = new System.Drawing.Size(479, 339); + this.rtAft.TabIndex = 87; + this.rtAft.Text = ""; + this.rtAft.Click += new System.EventHandler(this.rtBack_Click); + this.rtAft.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick); + // + // arLabel9 + // + this.arLabel9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231))))); + this.arLabel9.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209))))); + this.arLabel9.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.arLabel9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel9.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel9.BorderSize = new System.Windows.Forms.Padding(1); + this.arLabel9.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.arLabel9.Cursor = System.Windows.Forms.Cursors.Arrow; + this.arLabel9.Dock = System.Windows.Forms.DockStyle.Top; + this.arLabel9.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.arLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel9.GradientEnable = true; + this.arLabel9.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + this.arLabel9.GradientRepeatBG = false; + this.arLabel9.isButton = false; + this.arLabel9.Location = new System.Drawing.Point(0, 0); + this.arLabel9.MouseDownColor = System.Drawing.Color.Yellow; + this.arLabel9.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.arLabel9.msg = null; + this.arLabel9.Name = "arLabel9"; + this.arLabel9.ProgressBorderColor = System.Drawing.Color.Black; + this.arLabel9.ProgressColor1 = System.Drawing.Color.LightSkyBlue; + this.arLabel9.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; + this.arLabel9.ProgressEnable = false; + this.arLabel9.ProgressFont = new System.Drawing.Font("Consolas", 10F); + this.arLabel9.ProgressForeColor = System.Drawing.Color.Black; + this.arLabel9.ProgressMax = 100F; + this.arLabel9.ProgressMin = 0F; + this.arLabel9.ProgressPadding = new System.Windows.Forms.Padding(0); + this.arLabel9.ProgressValue = 0F; + this.arLabel9.ShadowColor = System.Drawing.Color.WhiteSmoke; + this.arLabel9.Sign = ""; + this.arLabel9.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.arLabel9.SignColor = System.Drawing.Color.Yellow; + this.arLabel9.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.arLabel9.Size = new System.Drawing.Size(479, 23); + this.arLabel9.TabIndex = 86; + this.arLabel9.Text = "개선 후"; + this.arLabel9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.arLabel9.TextShadow = true; + this.arLabel9.TextVisible = true; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(984, 686); + this.tabControl1.TabIndex = 93; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.panel1); + this.tabPage1.Controls.Add(this.arPanel2); + this.tabPage1.Controls.Add(this.panel7); + this.tabPage1.Controls.Add(this.arPanel1); + this.tabPage1.Controls.Add(this.panel5); + this.tabPage1.Controls.Add(this.panel3); + this.tabPage1.Controls.Add(this.panel2); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(976, 660); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "일반사항"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.tableLayoutPanel1); + this.tabPage2.Controls.Add(this.arLabel12); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(976, 660); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "완료내역"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // arLabel12 + // + this.arLabel12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231))))); + this.arLabel12.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209))))); + this.arLabel12.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.arLabel12.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel12.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel12.BorderSize = new System.Windows.Forms.Padding(1); + this.arLabel12.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.arLabel12.Cursor = System.Windows.Forms.Cursors.Arrow; + this.arLabel12.Dock = System.Windows.Forms.DockStyle.Top; + this.arLabel12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.arLabel12.ForeColor = System.Drawing.Color.Blue; + this.arLabel12.GradientEnable = true; + this.arLabel12.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + this.arLabel12.GradientRepeatBG = false; + this.arLabel12.isButton = false; + this.arLabel12.Location = new System.Drawing.Point(3, 3); + this.arLabel12.MouseDownColor = System.Drawing.Color.Yellow; + this.arLabel12.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.arLabel12.msg = null; + this.arLabel12.Name = "arLabel12"; + this.arLabel12.ProgressBorderColor = System.Drawing.Color.Black; + this.arLabel12.ProgressColor1 = System.Drawing.Color.LightSkyBlue; + this.arLabel12.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; + this.arLabel12.ProgressEnable = false; + this.arLabel12.ProgressFont = new System.Drawing.Font("Consolas", 10F); + this.arLabel12.ProgressForeColor = System.Drawing.Color.Black; + this.arLabel12.ProgressMax = 100F; + this.arLabel12.ProgressMin = 0F; + this.arLabel12.ProgressPadding = new System.Windows.Forms.Padding(0); + this.arLabel12.ProgressValue = 0F; + this.arLabel12.ShadowColor = System.Drawing.Color.WhiteSmoke; + this.arLabel12.Sign = ""; + this.arLabel12.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.arLabel12.SignColor = System.Drawing.Color.Yellow; + this.arLabel12.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.arLabel12.Size = new System.Drawing.Size(970, 32); + this.arLabel12.TabIndex = 92; + this.arLabel12.Text = "내역을 편집하려면 각 창을 \"더블클릭\" 하세요."; + this.arLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.arLabel12.TextShadow = true; + this.arLabel12.TextVisible = true; + // // fProjectData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1008, 542); - this.Controls.Add(this.arPanel2); - this.Controls.Add(this.arPanel1); - this.Controls.Add(this.panel3); - this.Controls.Add(this.panel2); - this.Controls.Add(this.panel1); - this.Controls.Add(this.panel5); - this.Controls.Add(this.panel7); + this.ClientSize = new System.Drawing.Size(984, 711); + this.Controls.Add(this.tabControl1); this.Controls.Add(this.bn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; @@ -1544,6 +1977,14 @@ this.bindingNavigator1.ResumeLayout(false); this.bindingNavigator1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).EndInit(); + this.panel4.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.panel8.ResumeLayout(false); + this.arPanel3.ResumeLayout(false); + this.panel6.ResumeLayout(false); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1637,5 +2078,23 @@ private System.Windows.Forms.LinkLabel linkLabel5; private System.Windows.Forms.LinkLabel linkLabel4; private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.Panel panel4; + private arCtl.arLabel arLabel8; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Panel panel6; + private arCtl.arLabel arLabel9; + private arCtl.arPanel arPanel3; + private arCtl.arLabel arLabel10; + private System.Windows.Forms.Panel panel8; + private arCtl.arLabel arLabel11; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.RichTextBox rtBef; + private System.Windows.Forms.RichTextBox rtDesc; + private System.Windows.Forms.RichTextBox rtBack; + private System.Windows.Forms.RichTextBox rtAft; + private arCtl.arLabel arLabel12; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 0de6476..83654b4 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -56,6 +56,10 @@ namespace FPJ0000 this.cmbPart.DataSource = dt_part; this.bs.DataSource = dr; + if (string.IsNullOrEmpty(dr.CMP_After) == false) rtAft.Rtf = dr.CMP_After; + if (string.IsNullOrEmpty(dr.CMP_Before) == false) rtBef.Rtf = dr.CMP_Before; + if (string.IsNullOrEmpty(dr.CMP_Description) == false) rtDesc.Rtf = dr.CMP_Description; + if (string.IsNullOrEmpty(dr.CMP_Background) == false) rtBack.Rtf = dr.CMP_Background; //주간일지내역을 업데이트 refresh_History(); @@ -64,9 +68,14 @@ namespace FPJ0000 { if (dr.idx >= 0) this.taSchedule.Fill(this.dsPRJ.ProjectsSchedule, this.dr.idx); + + + } catch (System.Exception ex) { + rtBack.Text = rtDesc.Text = rtAft.Text = rtBef.Text = ""; + System.Windows.Forms.MessageBox.Show(ex.Message); } this.cmbProcess.Text = dr.process; @@ -105,6 +114,10 @@ namespace FPJ0000 this.dr.status = cmbState.Text; this.dr.part = cmbPart.Text; this.dr.category = cmbCate.Text; + this.dr.CMP_After = rtAft.Rtf; + this.dr.CMP_Before = rtBef.Rtf; + this.dr.CMP_Description = rtDesc.Rtf; + this.dr.CMP_Background = rtBack.Rtf; this.Validate(); this.bs.EndEdit(); @@ -220,12 +233,12 @@ namespace FPJ0000 { if (tbPath.Text == "") tbPath.Text = "/" + tbIdx.Text; - if(tbPath.Text.StartsWith("\\")==false) + if (tbPath.Text.StartsWith("\\") == false) { if (tbPath.Text.StartsWith("/")) tbPath.Text = tbPath.Text.Replace("/", "\\"); else tbPath.Text = "\\" + tbPath.Text; } - + var serverpath = @"\\10.131.36.57\Data\Project"; if (System.IO.Directory.Exists(serverpath) == false) { @@ -241,7 +254,7 @@ namespace FPJ0000 { System.IO.Directory.CreateDirectory(path); - string[] subdir = new string[] { "Source", "Document", "Draw","Estimate" }; + string[] subdir = new string[] { "Source", "Document", "Draw", "Estimate" }; foreach (var dir in subdir) System.IO.Directory.CreateDirectory(path + "\\" + dir); @@ -297,6 +310,22 @@ namespace FPJ0000 SelectDate(textBox1); } + private void bs_CurrentChanged(object sender, EventArgs e) + { + } + + private void rtBack_Click(object sender, EventArgs e) + { + + } + + private void rtBack_DoubleClick(object sender, EventArgs e) + { + var rt = sender as System.Windows.Forms.RichTextBox; + var f = new Note.fTextEditor(rt.Rtf); + if (f.ShowDialog() == DialogResult.OK) + rt.Rtf = f.richTextBoxEx1.Rtf; + } } } diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index 8b7ee7f..abbad07 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -177,6 +177,12 @@ 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 @@ -317,6 +323,12 @@ 449, 17 + + 449, 17 + + + 773, 17 + 773, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index a6267a1..d5d9973 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,24 +30,25 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.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(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = 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 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.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -68,6 +69,7 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tbFind = new System.Windows.Forms.ToolStripTextBox(); @@ -83,8 +85,9 @@ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.partListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.scheduleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.iOMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.공유폴더ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.scheduleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.메일발송주소관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -97,30 +100,18 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.cmbDateType = new System.Windows.Forms.ToolStripComboBox(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.cmbYearE = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); this.cmbCate = new System.Windows.Forms.ToolStripComboBox(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.chk검토 = new System.Windows.Forms.ToolStripButton(); - this.chk대기 = new System.Windows.Forms.ToolStripButton(); - this.chk진행 = new System.Windows.Forms.ToolStripButton(); - this.chk보류 = new System.Windows.Forms.ToolStripButton(); - this.chk취소 = new System.Windows.Forms.ToolStripButton(); - this.chk완료 = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); - this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); - this.btSearch = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.btViewDel = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); this.cmbProcess = new System.Windows.Forms.ToolStripComboBox(); - this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); - this.cmbSort = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); this.label1 = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel4 = new System.Windows.Forms.Panel(); @@ -149,8 +140,23 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); - this.공유폴더ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStrip2 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.chk검토 = new System.Windows.Forms.ToolStripButton(); + this.chk대기 = new System.Windows.Forms.ToolStripButton(); + this.chk진행 = new System.Windows.Forms.ToolStripButton(); + this.chk보류 = new System.Windows.Forms.ToolStripButton(); + this.chk취소 = new System.Windows.Forms.ToolStripButton(); + this.chk완료 = new System.Windows.Forms.ToolStripButton(); + this.chk완료보고 = new System.Windows.Forms.ToolStripButton(); + this.btViewDel = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btSearch = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.cmbSort = new System.Windows.Forms.ToolStripComboBox(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -164,6 +170,8 @@ ((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit(); this.tableLayoutPanel2.SuspendLayout(); this.panel3.SuspendLayout(); + this.toolStrip2.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // bn @@ -198,14 +206,14 @@ this.btFind, this.toolStripSeparator6, this.sbCount}); - this.bn.Location = new System.Drawing.Point(0, 528); + this.bn.Location = new System.Drawing.Point(0, 613); 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(1384, 25); + this.bn.Size = new System.Drawing.Size(1084, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -353,6 +361,15 @@ this.toolStripButton3.Text = "I/O맵"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // + // toolStripButton4 + // + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(75, 22); + this.toolStripButton4.Text = "공유폴더"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; @@ -475,6 +492,20 @@ this.partListToolStripMenuItem.Text = "파트리스트"; this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click); // + // iOMapToolStripMenuItem + // + this.iOMapToolStripMenuItem.Name = "iOMapToolStripMenuItem"; + this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.iOMapToolStripMenuItem.Text = "I/O 맵"; + this.iOMapToolStripMenuItem.Click += new System.EventHandler(this.iOMapToolStripMenuItem_Click); + // + // 공유폴더ToolStripMenuItem + // + this.공유폴더ToolStripMenuItem.Name = "공유폴더ToolStripMenuItem"; + this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.공유폴더ToolStripMenuItem.Text = "공유 폴더"; + this.공유폴더ToolStripMenuItem.Click += new System.EventHandler(this.공유폴더ToolStripMenuItem_Click); + // // scheduleToolStripMenuItem // this.scheduleToolStripMenuItem.ForeColor = System.Drawing.Color.Silver; @@ -483,13 +514,6 @@ this.scheduleToolStripMenuItem.Text = "스케쥴 관리(개발중)"; this.scheduleToolStripMenuItem.Click += new System.EventHandler(this.scheduleToolStripMenuItem_Click); // - // iOMapToolStripMenuItem - // - this.iOMapToolStripMenuItem.Name = "iOMapToolStripMenuItem"; - this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(304, 36); - this.iOMapToolStripMenuItem.Text = "I/O 맵"; - this.iOMapToolStripMenuItem.Click += new System.EventHandler(this.iOMapToolStripMenuItem_Click); - // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; @@ -541,6 +565,7 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_NoteTableAdapter = null; this.tam.JobReportTableAdapter = null; this.tam.ProjectsHistoryTableAdapter = null; this.tam.ProjectsIOMapTableAdapter = null; @@ -560,11 +585,11 @@ this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.fpSpread1.Location = new System.Drawing.Point(0, 27); + this.fpSpread1.Location = new System.Drawing.Point(0, 55); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1384, 260); + this.fpSpread1.Size = new System.Drawing.Size(1084, 317); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -574,7 +599,7 @@ 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 = 18; + this.fpSpread1_Sheet1.ColumnCount = 19; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -584,150 +609,156 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "분류"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "협업"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "전장"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType21.DecimalPlaces = 0; - numberCellType21.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType21.MaximumValue = 2147483647D; - numberCellType21.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType21; + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType53; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType54; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "category"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType55; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType56; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "category"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType57; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType58; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType59; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType60; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "userhw2"; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "전장"; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType61; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "전장"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType62; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType63; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; - numberCellType22.DecimalPlaces = 0; - numberCellType22.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType22.MaximumValue = 2147483647D; - numberCellType22.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType22; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 59F; - numberCellType23.MaximumValue = 999999999999999D; - numberCellType23.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType23; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 78F; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType24.MaximumValue = 999999999999999D; - numberCellType24.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType24; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 59F; + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; 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(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType25.MaximumValue = 999999999999999D; - numberCellType25.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType25; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + numberCellType9.MaximumValue = 999999999999999D; + numberCellType9.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; 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(16).CellType = textCellType64; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType10.MaximumValue = 999999999999999D; + numberCellType10.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType65; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -735,55 +766,48 @@ // // toolStrip1 // + this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripLabel2, + this.cmbDateType, this.cmbYearS, this.toolStripLabel4, this.cmbYearE, this.toolStripLabel6, this.cmbCate, this.toolStripSeparator2, - this.chk검토, - this.chk대기, - this.chk진행, - this.chk보류, - this.chk취소, - this.chk완료, - this.toolStripSeparator3, - this.toolStripLabel3, - this.tbRequest, - this.btSearch, - this.toolStripButton2, - this.btViewDel, - this.toolStripSeparator4, this.toolStripLabel7, this.cmbProcess, - this.toolStripLabel5, - this.cmbSort}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStripSeparator4, + this.toolStripLabel3, + this.tbRequest}); + this.toolStrip1.Location = new System.Drawing.Point(5, 5); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1384, 27); + this.toolStrip1.Size = new System.Drawing.Size(854, 25); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // - // toolStripLabel2 + // cmbDateType // - this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(43, 24); - this.toolStripLabel2.Text = "시작일"; + this.cmbDateType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbDateType.Items.AddRange(new object[] { + "시작일기준", + "완료일기준", + "출고일기준"}); + this.cmbDateType.Name = "cmbDateType"; + this.cmbDateType.Size = new System.Drawing.Size(121, 25); // // cmbYearS // this.cmbYearS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbYearS.DropDownWidth = 70; this.cmbYearS.Name = "cmbYearS"; - this.cmbYearS.Size = new System.Drawing.Size(75, 27); + this.cmbYearS.Size = new System.Drawing.Size(100, 25); // // toolStripLabel4 // this.toolStripLabel4.Name = "toolStripLabel4"; - this.toolStripLabel4.Size = new System.Drawing.Size(15, 24); + this.toolStripLabel4.Size = new System.Drawing.Size(15, 22); this.toolStripLabel4.Text = "~"; // // cmbYearE @@ -791,12 +815,12 @@ this.cmbYearE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbYearE.DropDownWidth = 70; this.cmbYearE.Name = "cmbYearE"; - this.cmbYearE.Size = new System.Drawing.Size(75, 27); + this.cmbYearE.Size = new System.Drawing.Size(100, 25); // // toolStripLabel6 // this.toolStripLabel6.Name = "toolStripLabel6"; - this.toolStripLabel6.Size = new System.Drawing.Size(31, 24); + this.toolStripLabel6.Size = new System.Drawing.Size(31, 22); this.toolStripLabel6.Text = "분류"; // // cmbCate @@ -813,12 +837,433 @@ "Requestor", "Process"}); this.cmbCate.Name = "cmbCate"; - this.cmbCate.Size = new System.Drawing.Size(100, 27); + this.cmbCate.Size = new System.Drawing.Size(100, 25); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 27); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel7.Text = "공정"; + // + // cmbProcess + // + this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbProcess.Items.AddRange(new object[] { + "---", + "Origin Cost", + "Input Cost", + "Effect Cost", + "Asset No", + "Project", + "Champion", + "Requestor", + "Process"}); + this.cmbProcess.Name = "cmbProcess"; + this.cmbProcess.Size = new System.Drawing.Size(100, 25); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel3 + // + this.toolStripLabel3.Name = "toolStripLabel3"; + this.toolStripLabel3.Size = new System.Drawing.Size(43, 22); + this.toolStripLabel3.Text = "담당자"; + this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); + // + // tbRequest + // + this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Name = "tbRequest"; + this.tbRequest.Size = new System.Drawing.Size(120, 25); + this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); + // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(0, 372); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1084, 23); + this.label1.TabIndex = 5; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.panel4, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.richTextBox1, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.richTextBox2, 1, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 47); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1084, 171); + this.tableLayoutPanel1.TabIndex = 11; + // + // panel4 + // + this.panel4.Controls.Add(this.label11); + this.panel4.Controls.Add(this.label4); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(542, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(542, 25); + this.panel4.TabIndex = 0; + // + // label11 + // + this.label11.Dock = System.Windows.Forms.DockStyle.Fill; + this.label11.Location = new System.Drawing.Point(0, 0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(442, 25); + this.label11.TabIndex = 14; + this.label11.Text = "주간 진행 내용"; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label4 + // + this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); + this.label4.Dock = System.Windows.Forms.DockStyle.Right; + this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.Location = new System.Drawing.Point(442, 0); + this.label4.Margin = new System.Windows.Forms.Padding(0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(100, 25); + this.label4.TabIndex = 12; + this.label4.Text = "--"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // bsHist + // + this.bsHist.DataMember = "ProjectsHistory"; + this.bsHist.DataSource = this.dsMSSQL; + this.bsHist.Sort = "pdate desc"; + // + // label2 + // + this.label2.Dock = System.Windows.Forms.DockStyle.Fill; + this.label2.Font = new System.Drawing.Font("굴림", 9F); + this.label2.Location = new System.Drawing.Point(0, 0); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(542, 25); + this.label2.TabIndex = 0; + this.label2.Text = "요청 사항"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true)); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(3, 28); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(536, 140); + this.richTextBox1.TabIndex = 1; + this.richTextBox1.Text = ""; + // + // richTextBox2 + // + this.richTextBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true)); + this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox2.Location = new System.Drawing.Point(545, 28); + this.richTextBox2.Name = "richTextBox2"; + this.richTextBox2.ReadOnly = true; + this.richTextBox2.Size = new System.Drawing.Size(536, 140); + this.richTextBox2.TabIndex = 1; + this.richTextBox2.Text = ""; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; + this.tableLayoutPanel2.ColumnCount = 8; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.81203F)); + this.tableLayoutPanel2.Controls.Add(this.label6, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.label5, 6, 0); + this.tableLayoutPanel2.Controls.Add(this.label9, 2, 0); + this.tableLayoutPanel2.Controls.Add(this.label3, 4, 0); + this.tableLayoutPanel2.Controls.Add(this.label7, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.label8, 3, 0); + this.tableLayoutPanel2.Controls.Add(this.label10, 5, 0); + this.tableLayoutPanel2.Controls.Add(this.label12, 7, 0); + this.tableLayoutPanel2.Controls.Add(this.label13, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.label14, 2, 1); + this.tableLayoutPanel2.Controls.Add(this.label15, 4, 1); + this.tableLayoutPanel2.Controls.Add(this.label16, 6, 1); + this.tableLayoutPanel2.Controls.Add(this.sbSumO, 3, 1); + this.tableLayoutPanel2.Controls.Add(this.sbSumI, 5, 1); + this.tableLayoutPanel2.Controls.Add(this.sbSumE, 7, 1); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Top; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 2; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1084, 47); + this.tableLayoutPanel2.TabIndex = 12; + // + // label6 + // + this.label6.Dock = System.Windows.Forms.DockStyle.Fill; + this.label6.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(4, 1); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(74, 24); + this.label6.TabIndex = 0; + this.label6.Text = "Start"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label6, "시작일"); + // + // label5 + // + this.label5.Dock = System.Windows.Forms.DockStyle.Fill; + this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.Location = new System.Drawing.Point(817, 1); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(74, 24); + this.label5.TabIndex = 0; + this.label5.Text = "End"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label5, "완료일"); + // + // label9 + // + this.label9.Dock = System.Windows.Forms.DockStyle.Fill; + this.label9.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label9.Location = new System.Drawing.Point(275, 1); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(74, 24); + this.label9.TabIndex = 0; + this.label9.Text = "Due"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label9, "예상완료일"); + // + // label3 + // + this.label3.Dock = System.Windows.Forms.DockStyle.Fill; + this.label3.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.label3.Location = new System.Drawing.Point(546, 1); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(74, 24); + this.label3.TabIndex = 0; + this.label3.Text = "Out"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label3, "출고일(프로그램의 경우 설치일)"); + // + // label7 + // + this.label7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); + this.label7.Dock = System.Windows.Forms.DockStyle.Fill; + this.label7.Location = new System.Drawing.Point(85, 1); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(183, 24); + this.label7.TabIndex = 1; + this.label7.Text = "--"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label8 + // + this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); + this.label8.Dock = System.Windows.Forms.DockStyle.Fill; + this.label8.Location = new System.Drawing.Point(356, 1); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(183, 24); + this.label8.TabIndex = 1; + this.label8.Text = "--"; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label10 + // + this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); + this.label10.Dock = System.Windows.Forms.DockStyle.Fill; + this.label10.Location = new System.Drawing.Point(627, 1); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(183, 24); + this.label10.TabIndex = 1; + this.label10.Text = "--"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label12 + // + this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); + this.label12.Dock = System.Windows.Forms.DockStyle.Fill; + this.label12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label12.Location = new System.Drawing.Point(898, 1); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(182, 24); + this.label12.TabIndex = 1; + this.label12.Text = "--"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label13 + // + this.label13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.tableLayoutPanel2.SetColumnSpan(this.label13, 2); + this.label13.Dock = System.Windows.Forms.DockStyle.Fill; + this.label13.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label13.Location = new System.Drawing.Point(1, 26); + this.label13.Margin = new System.Windows.Forms.Padding(0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(270, 20); + this.label13.TabIndex = 0; + this.label13.Text = "Cost Summary"; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label14 + // + this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.label14.Dock = System.Windows.Forms.DockStyle.Fill; + this.label14.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label14.Location = new System.Drawing.Point(272, 26); + this.label14.Margin = new System.Windows.Forms.Padding(0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(80, 20); + this.label14.TabIndex = 0; + this.label14.Text = "Origin"; + this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label15 + // + this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.label15.Dock = System.Windows.Forms.DockStyle.Fill; + this.label15.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label15.Location = new System.Drawing.Point(543, 26); + this.label15.Margin = new System.Windows.Forms.Padding(0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(80, 20); + this.label15.TabIndex = 0; + this.label15.Text = "Input"; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label16 + // + this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.label16.Dock = System.Windows.Forms.DockStyle.Fill; + this.label16.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label16.Location = new System.Drawing.Point(814, 26); + this.label16.Margin = new System.Windows.Forms.Padding(0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(80, 20); + this.label16.TabIndex = 0; + this.label16.Text = "Effect"; + this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // sbSumO + // + this.sbSumO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.sbSumO.Dock = System.Windows.Forms.DockStyle.Fill; + this.sbSumO.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); + this.sbSumO.Location = new System.Drawing.Point(353, 26); + this.sbSumO.Margin = new System.Windows.Forms.Padding(0); + this.sbSumO.Name = "sbSumO"; + this.sbSumO.Size = new System.Drawing.Size(189, 20); + this.sbSumO.TabIndex = 1; + this.sbSumO.Text = "--"; + this.sbSumO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // sbSumI + // + this.sbSumI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.sbSumI.Dock = System.Windows.Forms.DockStyle.Fill; + this.sbSumI.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); + this.sbSumI.Location = new System.Drawing.Point(624, 26); + this.sbSumI.Margin = new System.Windows.Forms.Padding(0); + this.sbSumI.Name = "sbSumI"; + this.sbSumI.Size = new System.Drawing.Size(189, 20); + this.sbSumI.TabIndex = 1; + this.sbSumI.Text = "--"; + this.sbSumI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // sbSumE + // + this.sbSumE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.sbSumE.Dock = System.Windows.Forms.DockStyle.Fill; + this.sbSumE.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.sbSumE.Location = new System.Drawing.Point(895, 26); + this.sbSumE.Margin = new System.Windows.Forms.Padding(0); + this.sbSumE.Name = "sbSumE"; + this.sbSumE.Size = new System.Drawing.Size(188, 20); + this.sbSumE.TabIndex = 1; + this.sbSumE.Text = "--"; + this.sbSumE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // taHist + // + this.taHist.ClearBeforeFill = true; + // + // panel3 + // + this.panel3.Controls.Add(this.tableLayoutPanel1); + this.panel3.Controls.Add(this.tableLayoutPanel2); + this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel3.Location = new System.Drawing.Point(0, 395); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1084, 218); + this.panel3.TabIndex = 7; + // + // toolStrip2 + // + this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip2.ImageScalingSize = new System.Drawing.Size(20, 20); + this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel8, + this.toolStripSeparator8, + this.chk검토, + this.chk대기, + this.chk진행, + this.chk보류, + this.chk취소, + this.chk완료, + this.chk완료보고, + this.btViewDel, + this.toolStripSeparator3, + this.toolStripLabel2, + this.cmbSort}); + this.toolStrip2.Location = new System.Drawing.Point(5, 30); + this.toolStrip2.Name = "toolStrip2"; + this.toolStrip2.Size = new System.Drawing.Size(854, 27); + this.toolStrip2.TabIndex = 8; + this.toolStrip2.Text = "toolStrip2"; + // + // toolStripLabel8 + // + this.toolStripLabel8.Name = "toolStripLabel8"; + this.toolStripLabel8.Size = new System.Drawing.Size(83, 24); + this.toolStripLabel8.Text = "표시항목 선택"; + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(6, 27); // // chk검토 // @@ -882,87 +1327,78 @@ this.chk완료.Size = new System.Drawing.Size(55, 24); this.chk완료.Text = "완료"; // - // toolStripSeparator3 + // chk완료보고 // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27); - // - // toolStripLabel3 - // - this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(43, 24); - this.toolStripLabel3.Text = "담당자"; - this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); - // - // tbRequest - // - this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbRequest.Name = "tbRequest"; - this.tbRequest.Size = new System.Drawing.Size(60, 27); - this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); - // - // btSearch - // - this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); - this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btSearch.Name = "btSearch"; - this.btSearch.Size = new System.Drawing.Size(70, 24); - this.btSearch.Text = "갱신(&R)"; - this.btSearch.Click += new System.EventHandler(this.btSearch_Click); - // - // 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(55, 24); - this.toolStripButton2.Text = "닫기"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + this.chk완료보고.CheckOnClick = true; + this.chk완료보고.ForeColor = System.Drawing.Color.Green; + this.chk완료보고.Image = ((System.Drawing.Image)(resources.GetObject("chk완료보고.Image"))); + this.chk완료보고.ImageTransparentColor = System.Drawing.Color.Magenta; + this.chk완료보고.Name = "chk완료보고"; + this.chk완료보고.Size = new System.Drawing.Size(87, 24); + this.chk완료보고.Text = "완료(보고)"; // // btViewDel // - this.btViewDel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.btViewDel.CheckOnClick = true; this.btViewDel.Image = ((System.Drawing.Image)(resources.GetObject("btViewDel.Image"))); this.btViewDel.ImageTransparentColor = System.Drawing.Color.Magenta; this.btViewDel.Name = "btViewDel"; this.btViewDel.Size = new System.Drawing.Size(79, 24); - this.btViewDel.Text = "삭제표시"; + this.btViewDel.Text = "삭제자료"; // - // toolStripSeparator4 + // toolStripSeparator3 // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27); + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27); // - // toolStripLabel7 + // panel1 // - this.toolStripLabel7.Name = "toolStripLabel7"; - this.toolStripLabel7.Size = new System.Drawing.Size(31, 24); - this.toolStripLabel7.Text = "공정"; + this.panel1.Controls.Add(this.toolStrip2); + this.panel1.Controls.Add(this.toolStrip1); + this.panel1.Controls.Add(this.btSearch); + this.panel1.Controls.Add(this.button1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Padding = new System.Windows.Forms.Padding(5); + this.panel1.Size = new System.Drawing.Size(1084, 55); + this.panel1.TabIndex = 9; // - // cmbProcess + // btSearch // - this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbProcess.Items.AddRange(new object[] { - "---", - "Origin Cost", - "Input Cost", - "Effect Cost", - "Asset No", - "Project", - "Champion", - "Requestor", - "Process"}); - this.cmbProcess.Name = "cmbProcess"; - this.cmbProcess.Size = new System.Drawing.Size(80, 27); + this.btSearch.Dock = System.Windows.Forms.DockStyle.Right; + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.btSearch.Location = new System.Drawing.Point(859, 5); + this.btSearch.Name = "btSearch"; + this.btSearch.Padding = new System.Windows.Forms.Padding(5, 0, 3, 0); + this.btSearch.Size = new System.Drawing.Size(122, 45); + this.btSearch.TabIndex = 9; + this.btSearch.Text = "새로고침(&R)"; + this.btSearch.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.btSearch.UseVisualStyleBackColor = true; + this.btSearch.Click += new System.EventHandler(this.button2_Click); // - // toolStripLabel5 + // button1 // - this.toolStripLabel5.Name = "toolStripLabel5"; - this.toolStripLabel5.Size = new System.Drawing.Size(31, 24); - this.toolStripLabel5.Text = "정렬"; + this.button1.Dock = System.Windows.Forms.DockStyle.Right; + this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image"))); + this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button1.Location = new System.Drawing.Point(981, 5); + this.button1.Name = "button1"; + this.button1.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.button1.Size = new System.Drawing.Size(98, 45); + this.button1.TabIndex = 0; + this.button1.Text = "닫기"; + this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click_1); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(55, 24); + this.toolStripLabel2.Text = "정렬방식"; // // cmbSort // @@ -978,376 +1414,17 @@ "Requestor", "Process"}); this.cmbSort.Name = "cmbSort"; - this.cmbSort.Size = new System.Drawing.Size(80, 27); + this.cmbSort.Size = new System.Drawing.Size(100, 27); this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged); // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 287); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1384, 23); - this.label1.TabIndex = 5; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Controls.Add(this.panel4, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.richTextBox1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.richTextBox2, 1, 1); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 47); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1384, 171); - this.tableLayoutPanel1.TabIndex = 11; - // - // panel4 - // - this.panel4.Controls.Add(this.label11); - this.panel4.Controls.Add(this.label4); - this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(692, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(692, 25); - this.panel4.TabIndex = 0; - // - // label11 - // - this.label11.Dock = System.Windows.Forms.DockStyle.Fill; - this.label11.Location = new System.Drawing.Point(0, 0); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(592, 25); - this.label11.TabIndex = 14; - this.label11.Text = "주간 진행 내용"; - this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label4 - // - this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); - this.label4.Dock = System.Windows.Forms.DockStyle.Right; - this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(592, 0); - this.label4.Margin = new System.Windows.Forms.Padding(0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 25); - this.label4.TabIndex = 12; - this.label4.Text = "--"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // bsHist - // - this.bsHist.DataMember = "ProjectsHistory"; - this.bsHist.DataSource = this.dsMSSQL; - this.bsHist.Sort = "pdate desc"; - // - // label2 - // - this.label2.Dock = System.Windows.Forms.DockStyle.Fill; - this.label2.Font = new System.Drawing.Font("굴림", 9F); - this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Margin = new System.Windows.Forms.Padding(0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(692, 25); - this.label2.TabIndex = 0; - this.label2.Text = "요청 사항"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // richTextBox1 - // - this.richTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true)); - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Location = new System.Drawing.Point(3, 28); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(686, 140); - this.richTextBox1.TabIndex = 1; - this.richTextBox1.Text = ""; - // - // richTextBox2 - // - this.richTextBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true)); - this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox2.Location = new System.Drawing.Point(695, 28); - this.richTextBox2.Name = "richTextBox2"; - this.richTextBox2.ReadOnly = true; - this.richTextBox2.Size = new System.Drawing.Size(686, 140); - this.richTextBox2.TabIndex = 1; - this.richTextBox2.Text = ""; - // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; - this.tableLayoutPanel2.ColumnCount = 8; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.81203F)); - this.tableLayoutPanel2.Controls.Add(this.label6, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.label5, 6, 0); - this.tableLayoutPanel2.Controls.Add(this.label9, 2, 0); - this.tableLayoutPanel2.Controls.Add(this.label3, 4, 0); - this.tableLayoutPanel2.Controls.Add(this.label7, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.label8, 3, 0); - this.tableLayoutPanel2.Controls.Add(this.label10, 5, 0); - this.tableLayoutPanel2.Controls.Add(this.label12, 7, 0); - this.tableLayoutPanel2.Controls.Add(this.label13, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.label14, 2, 1); - this.tableLayoutPanel2.Controls.Add(this.label15, 4, 1); - this.tableLayoutPanel2.Controls.Add(this.label16, 6, 1); - this.tableLayoutPanel2.Controls.Add(this.sbSumO, 3, 1); - this.tableLayoutPanel2.Controls.Add(this.sbSumI, 5, 1); - this.tableLayoutPanel2.Controls.Add(this.sbSumE, 7, 1); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Top; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1384, 47); - this.tableLayoutPanel2.TabIndex = 12; - // - // label6 - // - this.label6.Dock = System.Windows.Forms.DockStyle.Fill; - this.label6.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(4, 1); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(74, 24); - this.label6.TabIndex = 0; - this.label6.Text = "Start"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label6, "시작일"); - // - // label5 - // - this.label5.Dock = System.Windows.Forms.DockStyle.Fill; - this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(1042, 1); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 24); - this.label5.TabIndex = 0; - this.label5.Text = "End"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label5, "완료일"); - // - // label9 - // - this.label9.Dock = System.Windows.Forms.DockStyle.Fill; - this.label9.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label9.Location = new System.Drawing.Point(350, 1); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(74, 24); - this.label9.TabIndex = 0; - this.label9.Text = "Due"; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label9, "예상완료일"); - // - // label3 - // - this.label3.Dock = System.Windows.Forms.DockStyle.Fill; - this.label3.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label3.Location = new System.Drawing.Point(696, 1); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 24); - this.label3.TabIndex = 0; - this.label3.Text = "Out"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label3, "출고일(프로그램의 경우 설치일)"); - // - // label7 - // - this.label7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); - this.label7.Dock = System.Windows.Forms.DockStyle.Fill; - this.label7.Location = new System.Drawing.Point(85, 1); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(258, 24); - this.label7.TabIndex = 1; - this.label7.Text = "--"; - this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label8 - // - this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); - this.label8.Dock = System.Windows.Forms.DockStyle.Fill; - this.label8.Location = new System.Drawing.Point(431, 1); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(258, 24); - this.label8.TabIndex = 1; - this.label8.Text = "--"; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label10 - // - this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); - this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(777, 1); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(258, 24); - this.label10.TabIndex = 1; - this.label10.Text = "--"; - this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label12 - // - this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); - this.label12.Dock = System.Windows.Forms.DockStyle.Fill; - this.label12.Location = new System.Drawing.Point(1123, 1); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(257, 24); - this.label12.TabIndex = 1; - this.label12.Text = "--"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label13 - // - this.label13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.tableLayoutPanel2.SetColumnSpan(this.label13, 2); - this.label13.Dock = System.Windows.Forms.DockStyle.Fill; - this.label13.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(1, 26); - this.label13.Margin = new System.Windows.Forms.Padding(0); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(345, 20); - this.label13.TabIndex = 0; - this.label13.Text = "Cost Summary"; - this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label14 - // - this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.label14.Dock = System.Windows.Forms.DockStyle.Fill; - this.label14.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(347, 26); - this.label14.Margin = new System.Windows.Forms.Padding(0); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(80, 20); - this.label14.TabIndex = 0; - this.label14.Text = "Origin"; - this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label15 - // - this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.label15.Dock = System.Windows.Forms.DockStyle.Fill; - this.label15.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(693, 26); - this.label15.Margin = new System.Windows.Forms.Padding(0); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(80, 20); - this.label15.TabIndex = 0; - this.label15.Text = "Input"; - this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label16 - // - this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.label16.Dock = System.Windows.Forms.DockStyle.Fill; - this.label16.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(1039, 26); - this.label16.Margin = new System.Windows.Forms.Padding(0); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(80, 20); - this.label16.TabIndex = 0; - this.label16.Text = "Effect"; - this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // sbSumO - // - this.sbSumO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.sbSumO.Dock = System.Windows.Forms.DockStyle.Fill; - this.sbSumO.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumO.Location = new System.Drawing.Point(428, 26); - this.sbSumO.Margin = new System.Windows.Forms.Padding(0); - this.sbSumO.Name = "sbSumO"; - this.sbSumO.Size = new System.Drawing.Size(264, 20); - this.sbSumO.TabIndex = 1; - this.sbSumO.Text = "--"; - this.sbSumO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // sbSumI - // - this.sbSumI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.sbSumI.Dock = System.Windows.Forms.DockStyle.Fill; - this.sbSumI.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumI.Location = new System.Drawing.Point(774, 26); - this.sbSumI.Margin = new System.Windows.Forms.Padding(0); - this.sbSumI.Name = "sbSumI"; - this.sbSumI.Size = new System.Drawing.Size(264, 20); - this.sbSumI.TabIndex = 1; - this.sbSumI.Text = "--"; - this.sbSumI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // sbSumE - // - this.sbSumE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.sbSumE.Dock = System.Windows.Forms.DockStyle.Fill; - this.sbSumE.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sbSumE.Location = new System.Drawing.Point(1120, 26); - this.sbSumE.Margin = new System.Windows.Forms.Padding(0); - this.sbSumE.Name = "sbSumE"; - this.sbSumE.Size = new System.Drawing.Size(263, 20); - this.sbSumE.TabIndex = 1; - this.sbSumE.Text = "--"; - this.sbSumE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // taHist - // - this.taHist.ClearBeforeFill = true; - // - // panel3 - // - this.panel3.Controls.Add(this.tableLayoutPanel1); - this.panel3.Controls.Add(this.tableLayoutPanel2); - this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 310); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1384, 218); - this.panel3.TabIndex = 7; - // - // 공유폴더ToolStripMenuItem - // - this.공유폴더ToolStripMenuItem.Name = "공유폴더ToolStripMenuItem"; - this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); - this.공유폴더ToolStripMenuItem.Text = "공유 폴더"; - this.공유폴더ToolStripMenuItem.Click += new System.EventHandler(this.공유폴더ToolStripMenuItem_Click); - // - // toolStripButton4 - // - this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(75, 22); - this.toolStripButton4.Text = "공유폴더"; - this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); - // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1384, 553); + this.ClientSize = new System.Drawing.Size(1084, 638); this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.panel1); this.Controls.Add(this.label1); this.Controls.Add(this.panel3); - this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fProjectList"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -1368,6 +1445,10 @@ ((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit(); this.tableLayoutPanel2.ResumeLayout(false); this.panel3.ResumeLayout(false); + this.toolStrip2.ResumeLayout(false); + this.toolStrip2.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1403,27 +1484,18 @@ private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripLabel toolStripLabel3; private System.Windows.Forms.ToolStripTextBox tbRequest; - private System.Windows.Forms.ToolStripButton btSearch; private System.Windows.Forms.ToolStripMenuItem scheduleToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem makeRepeatToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem iOMapToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; private System.Windows.Forms.Label label1; - private System.Windows.Forms.ToolStripButton chk검토; - private System.Windows.Forms.ToolStripButton chk진행; - private System.Windows.Forms.ToolStripButton chk보류; - private System.Windows.Forms.ToolStripButton chk취소; - private System.Windows.Forms.ToolStripButton chk완료; private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.ToolStripTextBox tbFind; private System.Windows.Forms.ToolStripButton btFind; - private System.Windows.Forms.ToolStripButton chk대기; private System.Windows.Forms.Label label2; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.ToolStripLabel toolStripLabel2; private System.Windows.Forms.ToolStripComboBox cmbYearS; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem 엑셀파일로저장ToolStripMenuItem; @@ -1439,7 +1511,6 @@ private System.Windows.Forms.ToolStripButton btEdit; private System.Windows.Forms.Label label3; private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.ToolStripButton btViewDel; private System.Windows.Forms.Label label11; private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem; private System.Windows.Forms.Panel panel4; @@ -1458,15 +1529,11 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel4; private System.Windows.Forms.ToolStripComboBox cmbYearE; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripLabel toolStripLabel5; - private System.Windows.Forms.ToolStripComboBox cmbSort; private System.Windows.Forms.ToolStripButton btCopy; private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; - private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.ToolStripLabel toolStripLabel6; private System.Windows.Forms.ToolStripComboBox cmbCate; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripLabel toolStripLabel7; private System.Windows.Forms.ToolStripComboBox cmbProcess; private System.Windows.Forms.ToolStripButton toolStripButton1; @@ -1478,5 +1545,24 @@ private System.Windows.Forms.RichTextBox richTextBox2; private System.Windows.Forms.ToolStripMenuItem 공유폴더ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton4; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStrip toolStrip2; + private System.Windows.Forms.ToolStripButton chk검토; + private System.Windows.Forms.ToolStripButton chk대기; + private System.Windows.Forms.ToolStripButton chk진행; + private System.Windows.Forms.ToolStripButton chk보류; + private System.Windows.Forms.ToolStripButton chk취소; + private System.Windows.Forms.ToolStripButton chk완료; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button btSearch; + private System.Windows.Forms.ToolStripButton btViewDel; + private System.Windows.Forms.ToolStripLabel toolStripLabel8; + private System.Windows.Forms.ToolStripComboBox cmbDateType; + private System.Windows.Forms.ToolStripButton chk완료보고; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripComboBox cmbSort; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 2d17046..ff3623e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -31,6 +31,7 @@ namespace FPJ0000 { //프로젝트 목록을 처리함 //this.tbRequest.Text = FCOMMON.info.Login.nameK; + cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다 //분류 - 190905 var dt_cate = FCOMMON.DBM.getCodeTable("20"); @@ -126,6 +127,11 @@ namespace FPJ0000 if (state.EndsWith("(") == false) state += ","; state += "'완료'"; } + if(chk완료보고.Checked) + { + if (state.EndsWith("(") == false) state += ","; + state += "'완료(보고)'"; + } state += ")"; } @@ -143,21 +149,28 @@ namespace FPJ0000 string State_Select = " SELECT *, dbo.getLastHistory(idx) AS lasthistory FROM Projects"; string State_where = " WHERE gcode=@gcode and "; - if (btViewDel.Checked==false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 - State_where += " pdate between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text +"-12-31' AND (ISNULL(userManager, '') LIKE @username OR " + + if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 + + var dateField = "pdate"; + if (cmbDateType.SelectedIndex == 1) dateField = "edate"; + else if (cmbDateType.SelectedIndex == 2) dateField = "odate"; + + State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " + "ISNULL(usermain, '') LIKE @username OR " + "ISNULL(reqstaff, '') LIKE @username OR " + "ISNULL(usersub, '') LIKE @username) "; + if (state != "") State_where += " AND " + state; if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'"; if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(userprocess,'') = '" + cmbProcess.Text.Trim() + "'"; string State_order = " ORDER BY (CASE " + - " WHEN ([status] = '진행') THEN '0' " + + " WHEN ([status] = '진행') THEN '0' " + " WHEN ([status] = '검토') THEN '1' " + - " WHEN ([status] = '대기') THEN '2' " + + " WHEN ([status] = '대기') THEN '2' " + " WHEN ([status] = '완료') THEN '3' " + - " WHEN ([status] = '보류') THEN '4' " + - " WHEN ([status] = '취소') THEN '9' " + + " WHEN ([status] = '완료(보고)') THEN '4' " + + " WHEN ([status] = '보류') THEN '5' " + + " WHEN ([status] = '취소') THEN '9' " + " ELSE '5' END),userManager,sdate"; string request = "%"; @@ -166,7 +179,7 @@ namespace FPJ0000 System.Data.SqlClient.SqlCommand selCmd = new System.Data.SqlClient.SqlCommand(); selCmd.Connection = ta.Connection; selCmd.CommandText = State_Select + State_where + State_order; - selCmd.Parameters.Add("gcode", SqlDbType.VarChar).Value= FCOMMON.info.Login.gcode; + selCmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode; selCmd.Parameters.Add("username", SqlDbType.VarChar); selCmd.Parameters["username"].Value = request; @@ -216,9 +229,12 @@ namespace FPJ0000 case "보류": this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Tomato; break; - case "완료": + case "완료(보고)": this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray; break; + case "완료": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Magenta; + break; default: this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black; break; @@ -234,7 +250,7 @@ namespace FPJ0000 this.Validate(); this.bs.EndEdit(); - if(pmt) + if (pmt) { var dlg = FCOMMON.Util.MsgQ("변경 사항을 저장하시겠습니까?"); if (dlg != System.Windows.Forms.DialogResult.Yes) return; @@ -314,7 +330,7 @@ namespace FPJ0000 private void btSearch_Click(object sender, EventArgs e) { - refreshData(); + } private void toolStripLabel3_Click(object sender, EventArgs e) @@ -325,7 +341,7 @@ namespace FPJ0000 tbRequest.Text = string.Empty; } else tbRequest.Text = FCOMMON.info.Login.nameK; - + refreshData(); } @@ -407,7 +423,7 @@ namespace FPJ0000 { try { - var cols = new string[] { + var cols = new string[] { "name","process","reqstaff","usermain", "orderno","usersub","userManager", "remark_req"}; @@ -482,14 +498,14 @@ namespace FPJ0000 return; } var dr = drv.Row as dsPRJ.ProjectsRow; - this.label1.Text = string.Format("[{0}] {1}",dr.name,dr.memo); - + this.label1.Text = string.Format("[{0}] {1}", dr.name, dr.memo); + try { taHist.Fill(this.dsMSSQL.ProjectsHistory, dr.idx); } - catch + catch { } @@ -535,7 +551,7 @@ namespace FPJ0000 { FCOMMON.Util.MsgE("Save Error\n" + ex.Message); } - + } else newdr.Delete(); } @@ -582,7 +598,7 @@ namespace FPJ0000 //Champion //Requestor //Process - switch(cmbSort.SelectedIndex) + switch (cmbSort.SelectedIndex) { case 1: if (this.bs.Sort == "costo") this.bs.Sort = "costo desc"; @@ -629,7 +645,7 @@ namespace FPJ0000 private void toolStripButton2_Click(object sender, EventArgs e) { - this.Close(); + } private void toolStripButton1_Click(object sender, EventArgs e) @@ -701,5 +717,15 @@ namespace FPJ0000 { showfolder(); } + + private void button1_Click_1(object sender, EventArgs e) + { + this.Close(); + } + + private void button2_Click(object sender, EventArgs e) + { + refreshData(); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 0d9a477..bee6d09 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -215,49 +215,49 @@ 5jGrg80jFvmZB8/1Mveb4Wru1e9gDtWGAEXH013r98dzxCPj+TBsD8b2IFxvz+HUYe0K1YYAeQeSXQuP hXAWH0tvAuHCQylNufuSmjJ3xTWlbIlpSlgX0RSzIqgpbJFfk890twV+093qPCY61EG1MzBk70lwTduU xlV4LG1R3oFU08wdCVap22LtUzZGOMWtDnaLXOrvFbzQ18d/pluAU6dNlUevo5dTu/U8qHYGhvStMa4x - O2O4cw8kLc7YHm1bdCz1Rt7R9JsFB5Nv5eyOv52xM/pOyoawu7Hrwu5GLgp4GrzI507ALLfXPlPdTrtP + O2O4cw8kLc7YHm1bdCz1Rt7R9JsFB5Nv5eyOv52xM/pOyoawu7Hrwu5GLgx4GrzI507ALLfXPlPdTrtP cDzNkLA2wjVpgx9v1u74xalbolyA3viftjW6KnljRFf82rBpsatClkUtD9wUutB3T8AM14t+U12POXc7 3Hfrs98IDJP/DDHLAl2jF3vwpW6NWpywJswr/2DK/9TNEXMS1oevjFkZsi1qWeCBkIXexwNne5zxmuh8 273f7oJju+Ujx3arzdYNpv8ZQub5uvrPtxdIWBe6JHxJQBAwTP4nbQjfEbcy5BDQ/6dCFvhc8Jvpcdl7 kuM113bbB/btllct600fWdYabTStMPjP4DvdzdVzgpNr+GLfHb5TXGvTtsX8j1oRdC1sod8tv5nud32n uz5w7Qdq7LJ5aNds/tC6xvS6aYXeQ5NyvfX6hVr/oUHJwBA032ue7wz3oMT14f/Dl/qeD5kHtHWG61X3 - iY7XnLtsb9i1mN+wrDW+Zlyme1U3X/WBXp7Gaq0sVYQBQJvmAeN3XvTywP++sz0fu09yeeLUZw/0q+Uj + iY7XnLtsb9i1mN+wrDW+Zlyme1U3X/WBXp7Gaq0sVYQBQJvmAeN3XvTywP++sz0fu01yeeLYZw/0q+Uj m0azh6blug+MSnUfaGdr3tfMULqnmaG8TDVFEWEADITM9/nvN8N9s9ckh02uXTYbgTavt6o3Xmdarr/a oEBrhXau2lL1NJVFKsnyCxXjZTENAKa0/54THf87d9n8t2u2+A909n+Tcv3/IP9qZ6v9V09T/q+cpPBf - IU72v1y0FKYBdAYMDACYr05nDLds3wAAAABJRU5ErkJggg== + IU72v1y0FKYBdAYMDACTvk5keWFIqgAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/TxJxHMbvP2prU1c612iLylIJXKgt2myz - 2ZqrqWtnARJTc6xaXzRBdJdJ6YiIxipLCHGoaaSR66t9wb7AEQhEULbu6e64KUf+VK/t2W33fp5n7332 - Jv4bg+MjOm8Gobe+h3Z4ESeH3oCkXj0SxiIGx2PqAc/y0sDDKMyuCIwPIiBSmV/IV1NfgBEyIih37Hu+ - lzjt00HvVUPrIXHC1cL/bDQ9g5AR0e/+ys+HFvpABS7DPHcRBPLgDA098+sWmMYi/DwXwuINI1ec4eAF - v6ig1iJTVFG7UdErhdIoE/kJ62RI6MoSSWSgOjuzWlBrKVfIjWVM21grOsbbUHluJx/kGJ4IZQvs02HY - p0Jwzobw9ksS1V1TfIFysFwh69nBkHebsNdUidJTRZC2b8WILwwrp0n67w1ef0qgqt0HBbWrpuKSlGlx - NkKiL2ZKNAXbDbeWkEivwDZN8147++UL+C3YDWys6q0HIO8vQ921fTjqOIwtuk3MZs3GbdxGHbYPiKdW - 4JihcXs2K2L0CY1keu1lVVdqoHWTOGKvR6mmiClszYY5dCPvsPztJ+74sxvcn2MPyfmYRq6UvXJIOotR - oi1A4fENq2EO9fVFvmCUDXJhvuAG+xC5vAjGoTL41r0D8upLxNgC19MI73UH2AIukK/qLs9vISOimXqO - aPIH6HgGn6NpBOkUiD16L/Ilab5nFzIijpkXJhq6A6lD3fOoO+/H/jNr9/KPEMQfqHUtYwtqArUAAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGiVpa5NWhotMFCK + kEIlZm3ThpqM7EVWuqbczJWy1lqMynJLJ1NTl7akV3uZvWx3bW5rbWV0T/d+d9Hd5U/1gcOF+5xzePjy + UP+NwfER7bcC0FvfQze4iFMDb6CmXz0WxiL6x6KavtHlpb5HEZhdYfQ8DINKpn8hV/XGWVbIiKDd0e+5 + XuqMtwV6jwa6UTVOuhrJzzrTMwgZEb3ur2Q+sHAFtP8yzHNdoJADbzh8aX7dAtNImMyzoSyeELLFGw5d + 9IkKqiwyRQW9G2XdUih7ZCI/ZZ0ICl0ZwvE0VJ3TqwVVllKFvKuEbR5pQttYM8rP7SRBnsHxYKbAPhWC + fTII50wQb78ksK9jkhQo+0sVsvM7WPW9euw1laP4dAGkrVsx5A3BymuC+XuD15/iqGj1QkHvqizrlLKN + zjpItIVskTZvu+H2EuKpFdimGOK1c19SQLbgNrBxqrEehLy3BNXX9+OY4wi2aDexm7Ubt/Ebtdk+IJZc + gWOawZ2ZjKjhJwwSqbWXVV2thM6txlF7DYq1BWx+UybM0zL0DsvffuKuL7PBgznukJyzDLKl7JZD0l6I + Il0e8k9sWA3zaG4skoJhLsiHScFN7iGyeRGIQWXwrnsH6msvEeUKXE/DxOv2cwV8IFfyDvdvISOigX6O + SOIHmFganyMpBJgkqD16D3IlabhvFzIijpsXxmuN/mStcR7VF3w4cHbtXv4RivoDQ7YtM+s88H0AAAAA SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZBJTBNhHMV78M7NuwdPoAeg9eDBg4nRm4mJ - 4YIkGi/gwUBCjAeUGJBIJGERDRJUxLIKQoHQEkJKoLQgi7TCdLUblVZgykxn7XSeX8soeDBxeZmX+Wby - /d5/0f23qPGi9ZC1VA7PlR3zDdk7ed7ve3/2pH+gKO8XTxflzc5eOKHhOp17zCCqagaASp6sD89pIYGo - rVyKLJaLPxxbuSdEHVUharTwuoaTgBF9UlUEiNEmcIFmcMFX4ENDUNM0yUpBVVjig8Pv9D45S5J72ODS - cJ3O069nMvIBgduQ8rWC+VyLvaVyJJbvgHbWgd54CHr9PvbXqokrSWdxeIaLWQ0nAYN6Oc3vgHa1YX+1 - AXFrFfi4g1RitOrZd/JnB9nx3IN6QcNJgPGcnJs/IxLzgMLlQIWnIMaeweXqh8lmR9dMEL3z27CsheE0 - XhI1nAS8NkiqwkNh7EjTZsi7Q5B2OiFEGuHceIvxlTi8Xzl82RXh8DOYWv+GMZNR0XCyxA6DmJEZyHsm - SPGeXFUhXAc+UI0BWwybURZLQR62AIcFYmdMRN9cEBpOAlqLBVWmCfwG4nYzhFAtgSvBeW7l2vYlRNj8 - Kcz7UpihWKyERfRYo8cCnhbGpKQ3yfp6MylvF1hPO1iqCexWPfrIzJvbHKyeQzjrjxERHZPuowCqPv8u - 1VBg3HpckNhqOCMc98RIr+LwMVgl0GJQwDKpbvrE4kX3qGquuVimRfxeLebgqQ5L8MEg2UX/QgwvLYFM - e/eE6pzqhL2tlHlXkV+iXf1zfai5ctv+/CYdMLdg8tFlTvv9d+quOF0y3XiNtzy5erSLf5NO9x1jfCdF - 5VlLZAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVHcaXbkwcaV1 + ZeJjAy5MTVi4QIkBUROUh5rUBkWQVxHUIqFFghhoeVheLXXoy7aUSiswZabz6HQ6x9syCi5MfJzck5k7 + ud/5//8O9d/y9JfMhYfOyZH353dYL/sGjgb8rw7sDnSXFPzioZKCkZFjuzScolw9OklVswBUsnLees+I + CUQ/lKWXHZelH445DWLYYQjTbw6d1XCKcveVJlVFhBStAx+sBx96BiHcAzXDkKwUVIUj3tzaZzYgCVya + 7tW5NZyivO0H2ay8SeAmpPyNYBersD5VhsT0VTCuajALt8DM3cDGbAWxgXQWh7f3MKfhJMBcKmeEVTDu + JmzM1CI+eh1CfJJUZbXquWfyZwe58VzmYlHDcx0ckfPzZyViAVD4PKgINKTYI7jdXbDYJ9A8HELH2Aps + sxE4W49LGk4CjLq0qghQ2AlkGCvktR6kV00Ql+/DtdCKfmccvq88vqxJmAywGJz7hreW54qGk79g1ElZ + mYW8bkE63pavKkaqIQQr0G2PwRPlMBUSYA/yGCd2xSR0fgxBw0nAg2JRlRkCt0BaqYcYriKwAbz3Ur5t + f0KCPZDCmD+FYZqDMyKhbTS6HbB0tygmJBeT656ObMrXDM77GBxdB+5zDTrJzJ4VHqPeLTjnT8sSjANL + 2wF0TeE1unZ/u/vOvsR8bZG40+/6WpRJP4sZAjlCIqZJdcs8hwaTWbVWnrygRfxeDdbQHqMtdNNM7qJr + PIanNjr70NSnugZNmGjUsy/LC/Xa0T/X68pTVxxPLjJBawMGbp/gtc9/pxfle/WD1acF270z23fxb6Ko + 710hJfIYihq0AAAAAElFTkSuQmCC @@ -312,11 +312,26 @@ 248, 17 - 828, 17 + 17, 56 455, 17 + + 561, 17 + + + 731, 17 + + + 731, 17 + + + 647, 17 + + + 169, 56 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -425,25 +440,22 @@ AABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPtZPPasJAEMbzPn0FwWA92JtP4NGKB1/DP7ei - QSsovkChh7ZBrCfpyR4sikopUgq9StFzM/UbZ5asSS4FfzAkO7vft5udiZMEnSBpk5dhFJmncjdHxXaG - A+9K4SbFT1luEwQBbXavVO5d0nI3ovnW5yeiMriiu+kt5asXbABEdgRigAUQDr+aHLU3lxoLl/yPJhvF - GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG - cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E - dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR - DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il - zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij - KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY - UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPbS5NxHMbfv6DrubX3LQ0vMi+KUVQK6UWE + SLgGHtI0c5mHtr07qCltE4bNtEgD52FJimiWpVY7OJOpczadU8rEZVNCzN10oNowOtjT+45JGhUEPfDw + +158P8/vTPx3ZU8lRJ0aP6xOdxz0JZn2BpJMsQGhLcYntO5Wp1h2RYXbfq8cV7wo1bHfr3JkoMNrQO9i + Z8jt8w0osqUgsZvyH+kmReH2rcpxHhIJRwTBuhktrMt9aH1+HbqZspDZ2rzci9qJC9hn4AcP3OBtDTk5 + FhcpsgtWWZhtrPBIUOougmKiACrGJYzLJ4thenkXl52l2GPgrMYayMgwThAZdoGGHk4LzczCLEi7zkI6 + ngep8wzkzjzYVyzQuGQwMyHZt48h+tp2TRgnCOGjWF+7twFGbz1KJwsheyxmwFzIxhg7cjHyygZW/uAK + mp/WonWmFlQ1xxfGCeKoKXrt/tItVHoUULrymZX0Y/7dLOjRPAyvDITgb+tf0fzkCjSjhej1toPUblsL + 4wSReI9a61vsgtZNo9KtxIfP70PQ20+vQyMLG6arIbdlQm0/hz5vG8iKzQFdlO/mbD1a5q5CNSaGfrIc + wS8fQ/D693UYpi5BYk2Dgglo9FShxaUHpdq0hbgOUiPuT4Zp6Q7KR8WQ23NQNV6ChTdzaJ6uwXlLKqTm + dKisWTC96MJxYwLIMu7PQxS0kpHs1egdCjzwdaNs6DSUg1mgBzIgM7Nm4Uw8XOiEdqAQJM1ZJelN18gq + po4n2qHlBXV2CcxMSJNHD/VQPi4OitHEbMHEwGprPvgF3CAp/+UhbWhnDU9EaSP8J9oS0eLWo+eZET2z + RhhcOiQ3xiOiOMJPSv8Ab4iv40eRGq6aquD4SCU3QNLcACVhapqr5kv4f/9M/y6C+AFrq7EfCv24YgAA + AABJRU5ErkJggg== @@ -456,19 +468,48 @@ 4DSAGEBVAzBigRgAMwCGyTIAHTAwMDAAABYIANCNo26UAAAAAElFTkSuQmCC - - 561, 17 - - - 561, 17 - - - 731, 17 - - - 647, 17 - - - 731, 17 - + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAABEpJREFUSEut + V+tPW2UYb7xE/wQvMZmZbs7v6hK/+M24EKfMpoiWy+hYUTZxso3aoWepwfXCoKYNqw500hVQ0Mgc98Kq + bSllA3YxM2SUgq7MGwV0fpv1/R19Tt8eXuua8uHXnvPcfue9PM/7vJpnawpyglb72Z3PH/rqgV31g08V + 1g89vdM8+NAz0thdIttsEArV0EkjW8obI/bqlov+N9uuLtR555elnsRfR3sSqUOfXvuz2DK6Q+SXDUIh + oUga21ThnOwwnY79ZutLpuz9K+vw3pc/pV6xjBSI/LNBKARKbeHa2lOzP9r7xYQENXGZPeSvOfldXI0S + W3DxpXcGdpJdBhmANdztiHik7sRNngAjNncsrO7zXA5XuWY6Kp3nP9rjnGitdEZ7tZL/SfKvPnFpkPcD + TL74Db0jpOd5lAcCSBt6f7lFTra+ldTh9mvXdx+PenQNI1vU9mqsJ06myhzjvWq7jBdMLz9S69nl1F7X + hYDeHniYt8sG0Yjf7b5+s9Qa2s/bKQ/YSP+saZrU0Bz94rl9fffwDv8HIjZ3xpPHvl5WyGs/mV3kB6A4 + MJJO2kiYXqN76lyupACI5TW1BiuMrukwESOmoXmynezkn1cto1uRMmSENc1lennoraFzenuoCM8vWgLb + EIvimryxG8WWoUehk43L7WE75Sn+K5omTlCgXPFCXf8m/p3NZFs6JZMpFCLIZSUqEn2V2Te/tuvfr9oI + IBNYzFWK/3rLzBDkct6iDJJiv+dySO2cL6o9VyIUH1yo7ZoC85kHTb7YCimq3FOdIud8YPxguovim3zz + KzhkNIXS8PajPUtKwTA0TXpEzvnA4Jz0UHwcLoXm4e0aHG/sJU3MjETO+WBPc/RDhbg7cauwvv8Jear5 + xd/rvrDxU+2e/pzi13ljyzsOnr1PU1l5/u7MzXUlInLOB9WeS8rmOtD2/Tw2tKx4reXiCCnMvvjqRqbT + y9LYY+auhTWKz7iGIZeV7ERy8EmOpOed1UUhFxiOT5zki1OpI2SFXFZqj4xurWuf+5m+CmVO2/DN49Ch + /KEMUqBcgJbpcPvckhLXG/tV+/7AI9ApRhXN0Q4UcjJi+RwqPhYoYZshgcJPdrcLViTurXJNhdIx2Uw2 + Rb2kVwx1Nv/mg6dmfyBiHGlsvZN4zpUYpKze9+JopXhvfTy7WMQ6UrLJcCizBo1Sz9LvZEzIhRjTa3RN + BXlSlrt/lDi+fYO3y3ACyhvHz6Q32u0T6yzD29goW7Gm/JKhjSprDK877TJeSmwBnck7l+BJAZ4YjR0a + PDR6BtbwGd0zXUwfOdIZX6PdS8BIQYq85XkA5QGtJ1pQUWuKlpXs0MqipeUJ1iOZqmVrqrcHa8hPDaEw + G7IRY8RIGZYhp/mNJIJQmA24ruDagusLThrU3gOtV+OofuWOcavO4t8s8lNDKMwGHOK4qOHCJl/c3h64 + X5KkO0S2/40Czd+YEQefvqIj4QAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAN + 1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAMZSURBVEhLzVdd + TxNBFF3/hi8+GH0xJmriq5HdzralCMKDGl/LxwMphCe+QqKBmCBB3oDAzyD8A4F+AfJATFRMoAhtUVrY + CqXajvcss2Ep07KlEDzJSSY7d+7p3Llz51b57zHvcj0M6vpgxOuNhD2eGI2NIGMGxmF8Y+ztHGMPhHl1 + 4IpyI6hpr0K6vhn1+fbX2tpyPwcGeHpoiGeGh01ijG/fW1uPyMYIu92xBZfrBdYKN5UhpGl3aVeflxoa + jGRfHz8cG3PEBNliTdDtXp1T1dvCnTOEVFWlXRqxjo68zLkTrgcCefig3T8VbsuDQltDCw4q2WUpYvfw + RTt/ItzLEa6puRdiLIMzkzm6COGLwr5PiXhHyJwGkoEydHWzq+vC4S3FWGfn34jHsyJNOLour1eamgzZ + wsvgp8ZGY0HXXwq5Y+CXhOgaJPv7pYvA3MwMz05MSOfA7OSkaSObA3HedNXWheQx5jTtcbSubl+2AMzN + znJeKPBCMmkKFM/jW2Fnx7SBbfG8RWgsqOojIUvXR9ffozjIjMHs+DjPx+McKOzu8uzU1MkcjfENgM0h + 2drX2rnW0nJESfZOyFI2e73L5cJsUiJeiSiIKxqprY0KWRJ2u7dR+mTGp2gXT6dNAk5EwdTgIKebsyVk + KdSMZTMjI1LjM4Q4nbUFnLsTURAa0BKylQlnp6d5IZUSsiRMY/uZl+MZYQr1lpNQ20XziYRJoDjhSjFF + GqT1Q8gqCr2xyzvnJNcp0e3t4/Ai7DQGTHGyka21eCa58MB/bW4+khmDUlFr3i6OsJcR/+b3H9LVfSNk + qYBQ54BHXGYMXlYBod1mqDTfF7K2klnmKbySkgnMa9rzpfp64+DDB+nCagifiz5fhsrlMyF3AutZXK+i + 6yjFjfb20s8iQJ3CLaql6XhPj9TBRRjv7uZ0jL8+MnZTyMhxLa2PBbPZY2xvIxAoecXOIzV7eIn2HDd7 + Fq6lvbWAZLAaetxBKjK5RG+vWfp+j46axIuDnPji9+dgQ1emuoa+GLa/MIt4RoMu1x8Q46jXG73UvzBX + B0X5B56Fg+LhPgWxAAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 1a0281c..3c535d0 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -645,6 +645,18 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnuserprocess; + private global::System.Data.DataColumn columnCMP_Background; + + private global::System.Data.DataColumn columnCMP_Description; + + private global::System.Data.DataColumn columnCMP_Before; + + private global::System.Data.DataColumn columnCMP_After; + + private global::System.Data.DataColumn columnbCost; + + private global::System.Data.DataColumn columnbFanOut; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public ProjectsDataTable() : @@ -983,6 +995,54 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn CMP_BackgroundColumn { + get { + return this.columnCMP_Background; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn CMP_DescriptionColumn { + get { + return this.columnCMP_Description; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn CMP_BeforeColumn { + get { + return this.columnCMP_Before; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn CMP_AfterColumn { + get { + return this.columnCMP_After; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn bCostColumn { + get { + return this.columnbCost; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn bFanOutColumn { + get { + return this.columnbFanOut; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1056,7 +1116,13 @@ namespace FPJ0000 { string lasthistory, string gcode, string category, - string userprocess) { + string userprocess, + string CMP_Background, + string CMP_Description, + string CMP_Before, + string CMP_After, + bool bCost, + bool bFanOut) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1095,7 +1161,13 @@ namespace FPJ0000 { lasthistory, gcode, category, - userprocess}; + userprocess, + CMP_Background, + CMP_Description, + CMP_Before, + CMP_After, + bCost, + bFanOut}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1138,7 +1210,13 @@ namespace FPJ0000 { string lasthistory, string gcode, string category, - string userprocess) { + string userprocess, + string CMP_Background, + string CMP_Description, + string CMP_Before, + string CMP_After, + bool bCost, + bool bFanOut) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1177,7 +1255,13 @@ namespace FPJ0000 { lasthistory, gcode, category, - userprocess}; + userprocess, + CMP_Background, + CMP_Description, + CMP_Before, + CMP_After, + bCost, + bFanOut}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1244,6 +1328,12 @@ namespace FPJ0000 { this.columngcode = base.Columns["gcode"]; this.columncategory = base.Columns["category"]; this.columnuserprocess = base.Columns["userprocess"]; + this.columnCMP_Background = base.Columns["CMP_Background"]; + this.columnCMP_Description = base.Columns["CMP_Description"]; + this.columnCMP_Before = base.Columns["CMP_Before"]; + this.columnCMP_After = base.Columns["CMP_After"]; + this.columnbCost = base.Columns["bCost"]; + this.columnbFanOut = base.Columns["bFanOut"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1323,6 +1413,18 @@ namespace FPJ0000 { base.Columns.Add(this.columncategory); this.columnuserprocess = new global::System.Data.DataColumn("userprocess", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuserprocess); + this.columnCMP_Background = new global::System.Data.DataColumn("CMP_Background", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCMP_Background); + this.columnCMP_Description = new global::System.Data.DataColumn("CMP_Description", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCMP_Description); + this.columnCMP_Before = new global::System.Data.DataColumn("CMP_Before", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCMP_Before); + this.columnCMP_After = new global::System.Data.DataColumn("CMP_After", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCMP_After); + this.columnbCost = new global::System.Data.DataColumn("bCost", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbCost); + this.columnbFanOut = new global::System.Data.DataColumn("bFanOut", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbFanOut); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1361,6 +1463,10 @@ namespace FPJ0000 { this.columngcode.MaxLength = 10; this.columncategory.MaxLength = 50; this.columnuserprocess.MaxLength = 100; + this.columnCMP_Background.MaxLength = 2147483647; + this.columnCMP_Description.MaxLength = 2147483647; + this.columnCMP_Before.MaxLength = 2147483647; + this.columnCMP_After.MaxLength = 2147483647; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5811,6 +5917,102 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string CMP_Background { + get { + if (this.IsCMP_BackgroundNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.CMP_BackgroundColumn])); + } + } + set { + this[this.tableProjects.CMP_BackgroundColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string CMP_Description { + get { + if (this.IsCMP_DescriptionNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.CMP_DescriptionColumn])); + } + } + set { + this[this.tableProjects.CMP_DescriptionColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string CMP_Before { + get { + if (this.IsCMP_BeforeNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.CMP_BeforeColumn])); + } + } + set { + this[this.tableProjects.CMP_BeforeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string CMP_After { + get { + if (this.IsCMP_AfterNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.CMP_AfterColumn])); + } + } + set { + this[this.tableProjects.CMP_AfterColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool bCost { + get { + if (this.IsbCostNull()) { + return false; + } + else { + return ((bool)(this[this.tableProjects.bCostColumn])); + } + } + set { + this[this.tableProjects.bCostColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool bFanOut { + get { + if (this.IsbFanOutNull()) { + return false; + } + else { + return ((bool)(this[this.tableProjects.bFanOutColumn])); + } + } + set { + this[this.tableProjects.bFanOutColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsnameNull() { @@ -6206,6 +6408,78 @@ namespace FPJ0000 { public void SetuserprocessNull() { this[this.tableProjects.userprocessColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsCMP_BackgroundNull() { + return this.IsNull(this.tableProjects.CMP_BackgroundColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetCMP_BackgroundNull() { + this[this.tableProjects.CMP_BackgroundColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsCMP_DescriptionNull() { + return this.IsNull(this.tableProjects.CMP_DescriptionColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetCMP_DescriptionNull() { + this[this.tableProjects.CMP_DescriptionColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsCMP_BeforeNull() { + return this.IsNull(this.tableProjects.CMP_BeforeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetCMP_BeforeNull() { + this[this.tableProjects.CMP_BeforeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsCMP_AfterNull() { + return this.IsNull(this.tableProjects.CMP_AfterColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetCMP_AfterNull() { + this[this.tableProjects.CMP_AfterColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsbCostNull() { + return this.IsNull(this.tableProjects.bCostColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetbCostNull() { + this[this.tableProjects.bCostColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsbFanOutNull() { + return this.IsNull(this.tableProjects.bFanOutColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetbFanOutNull() { + this[this.tableProjects.bFanOutColumn] = global::System.Convert.DBNull; + } } /// @@ -9562,6 +9836,12 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("gcode", "gcode"); tableMapping.ColumnMappings.Add("category", "category"); tableMapping.ColumnMappings.Add("userprocess", "userprocess"); + tableMapping.ColumnMappings.Add("CMP_Background", "CMP_Background"); + tableMapping.ColumnMappings.Add("CMP_Description", "CMP_Description"); + tableMapping.ColumnMappings.Add("CMP_Before", "CMP_Before"); + tableMapping.ColumnMappings.Add("CMP_After", "CMP_After"); + tableMapping.ColumnMappings.Add("bCost", "bCost"); + tableMapping.ColumnMappings.Add("bFanOut", "bFanOut"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -9572,8 +9852,8 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO Projects (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess) -VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess); + progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut) +VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9610,14 +9890,21 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat 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("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", 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 Projects SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, - orderno = @orderno, category = @category, userprocess = @userprocess -WHERE (idx = @Original_idx); + orderno = @orderno, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before, + CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut +WHERE (idx = @Original_idx); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9653,6 +9940,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -9671,7 +9964,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, + bCost, bFanOut FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -9690,7 +9984,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, - userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess + userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, + bCost, bFanOut FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -9698,7 +9993,8 @@ WHERE (idx = @idx)"; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, + bCost, bFanOut FROM Projects WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)"; @@ -9930,7 +10226,13 @@ WHERE (ISNULL(name, N'') LIKE @search OR string orderno, string gcode, string category, - string userprocess) { + string userprocess, + string CMP_Background, + string CMP_Description, + string CMP_Before, + string CMP_After, + global::System.Nullable bCost, + global::System.Nullable bFanOut) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -10130,6 +10432,42 @@ WHERE (ISNULL(name, N'') LIKE @search OR else { this.Adapter.InsertCommand.Parameters[33].Value = ((string)(userprocess)); } + if ((CMP_Background == null)) { + this.Adapter.InsertCommand.Parameters[34].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[34].Value = ((string)(CMP_Background)); + } + if ((CMP_Description == null)) { + this.Adapter.InsertCommand.Parameters[35].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[35].Value = ((string)(CMP_Description)); + } + if ((CMP_Before == null)) { + this.Adapter.InsertCommand.Parameters[36].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[36].Value = ((string)(CMP_Before)); + } + if ((CMP_After == null)) { + this.Adapter.InsertCommand.Parameters[37].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[37].Value = ((string)(CMP_After)); + } + if ((bCost.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[38].Value = ((bool)(bCost.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[38].Value = global::System.DBNull.Value; + } + if ((bFanOut.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[39].Value = ((bool)(bFanOut.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[39].Value = global::System.DBNull.Value; + } 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)) { @@ -10184,6 +10522,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR string orderno, string category, string userprocess, + string CMP_Background, + string CMP_Description, + string CMP_Before, + string CMP_After, + global::System.Nullable bCost, + global::System.Nullable bFanOut, int Original_idx, int idx) { if ((status == null)) { @@ -10379,8 +10723,44 @@ WHERE (ISNULL(name, N'') LIKE @search OR else { this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(userprocess)); } - this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(idx)); + if ((CMP_Background == null)) { + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(CMP_Background)); + } + if ((CMP_Description == null)) { + this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(CMP_Description)); + } + if ((CMP_Before == null)) { + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(CMP_Before)); + } + if ((CMP_After == null)) { + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(CMP_After)); + } + if ((bCost.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[37].Value = ((bool)(bCost.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + } + if ((bFanOut.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[38].Value = ((bool)(bFanOut.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[39].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[40].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)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index fd16b1d..3faba0a 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -24,8 +24,8 @@ WHERE (idx = @Original_idx) INSERT INTO Projects (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess) -VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess); + progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut) +VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -62,13 +62,20 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + + + SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, + bCost, bFanOut FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -88,8 +95,9 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, - orderno = @orderno, category = @category, userprocess = @userprocess -WHERE (idx = @Original_idx); + orderno = @orderno, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before, + CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut +WHERE (idx = @Original_idx); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -125,6 +133,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + + + @@ -169,6 +183,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + + + @@ -192,7 +212,8 @@ WHERE (import = 1) AND (gcode = @gcode) SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, - userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess + userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, + bCost, bFanOut FROM Projects WHERE (idx = @idx) @@ -205,7 +226,8 @@ WHERE (idx = @idx) SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, + bCost, bFanOut FROM Projects WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) @@ -1476,6 +1498,36 @@ SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FRO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +