diff --git a/Project/History.txt b/Project/History.txt index c8e34b9..95230e9 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,5 @@ -190208 chi AD계정 path 수정 (office 그룹이 추가됨) +190303 chi 프로젝트관리 추가 - 화면 정리 작업 +190208 chi AD계정 path 수정 (office 그룹이 추가됨) 190131 chi 클립보드 복사 메세지 제거 190125 chi 프로젝트 메일 관련 기능 준비중 190115 chi 프로젝트 목록 색상 및 정렬 방식 변경 - 필터 적용 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index ffb46a7..c2f3a77 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("19.02.12.1300")] -[assembly: AssemblyFileVersion("19.02.12.1300")] +[assembly: AssemblyVersion("19.03.03.0057")] +[assembly: AssemblyFileVersion("19.03.03.0057")] diff --git a/SubProject/FCOMMON/Auth.cs b/SubProject/FCOMMON/Auth.cs index 2b7f657..ae5b491 100644 --- a/SubProject/FCOMMON/Auth.cs +++ b/SubProject/FCOMMON/Auth.cs @@ -12,7 +12,8 @@ namespace FCOMMON public enum eAutoType { purchase, - holyday + holyday, + project } public static int getAuth(eAutoType type, string uid) { diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 13f1b06..cfd49a9 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -100,6 +100,7 @@ namespace FEQ0000 } else { + btSave.Visible = false; btViewDel.Visible = false; fpSpread1.EditMode = false; fpSpread1.Sheets[0].SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row; diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 2b74baa..2c13364 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -68,11 +68,28 @@ + + True + True + dsMail.xsd + True True dsPRJ.xsd + + Form + + + fHistAdd.cs + + + Form + + + fMailSend.cs + Form @@ -143,6 +160,12 @@ + + fHistAdd.cs + + + fMailSend.cs + fMailList.cs @@ -189,6 +212,17 @@ + + dsMail.xsd + + + Designer + MSDataSetGenerator + dsMail.Designer.cs + + + dsMail.xsd + dsPRJ.xsd diff --git a/SubProject/FPJ0000/Import.Designer.cs b/SubProject/FPJ0000/Import.Designer.cs index 48f383b..9784e3e 100644 --- a/SubProject/FPJ0000/Import.Designer.cs +++ b/SubProject/FPJ0000/Import.Designer.cs @@ -49,6 +49,8 @@ this.label2 = new System.Windows.Forms.Label(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPRJ = new FPJ0000.dsPRJ(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -60,9 +62,9 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.progressBar1 = new System.Windows.Forms.ToolStripProgressBar(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsPRJ = new FPJ0000.dsPRJ(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); + this.nudSheet = new System.Windows.Forms.NumericUpDown(); + this.label1 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); @@ -74,6 +76,7 @@ this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudSheet)).BeginInit(); this.SuspendLayout(); // // textBox1 @@ -128,6 +131,8 @@ // // panel1 // + this.panel1.Controls.Add(this.nudSheet); + this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.checkBox1); this.panel1.Controls.Add(this.numericUpDown2); this.panel1.Controls.Add(this.label6); @@ -335,6 +340,16 @@ this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); this.bindingNavigatorAddNewItem.Text = "새로 추가"; // + // bs + // + this.bs.DataMember = "Projects"; + this.bs.DataSource = this.dsPRJ; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; @@ -417,20 +432,37 @@ this.progressBar1.Name = "progressBar1"; this.progressBar1.Size = new System.Drawing.Size(200, 22); // - // bs - // - this.bs.DataMember = "Projects"; - this.bs.DataSource = this.dsPRJ; - // - // dsPRJ - // - this.dsPRJ.DataSetName = "dsPRJ"; - this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // ta // this.ta.ClearBeforeFill = true; // + // nudSheet + // + this.nudSheet.Location = new System.Drawing.Point(88, 37); + this.nudSheet.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudSheet.Name = "nudSheet"; + this.nudSheet.Size = new System.Drawing.Size(45, 21); + this.nudSheet.TabIndex = 21; + this.nudSheet.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudSheet.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(46, 42); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(36, 12); + this.label1.TabIndex = 20; + this.label1.Text = "sheet"; + // // Import // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -455,6 +487,7 @@ this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudSheet)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -495,5 +528,7 @@ private System.Windows.Forms.CheckBox checkBox1; private dsPRJ dsPRJ; private dsPRJTableAdapters.ProjectsTableAdapter ta; + private System.Windows.Forms.NumericUpDown nudSheet; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Import.cs b/SubProject/FPJ0000/Import.cs index 8610edc..9048ee9 100644 --- a/SubProject/FPJ0000/Import.cs +++ b/SubProject/FPJ0000/Import.cs @@ -73,7 +73,7 @@ namespace FPJ0000 return; } - var sheet = book.getSheet(0); + var sheet = book.getSheet((int)nudSheet.Value-1); var MaxRow = sheet.lastRow(); var MinRow = sheet.firstRow(); @@ -226,34 +226,38 @@ namespace FPJ0000 if (dr[0] == DBNull.Value) continue; //nullerror newdr["level"] = 1; - newdr["status"] = dr[1].ToString(); - newdr["part"] = dr[2].ToString(); - newdr["process"] = dr[3].ToString(); - newdr["request"] = dr[4].ToString(); - newdr["usermanager"] = dr[5].ToString(); + newdr["status"] = dr[0].ToString(); + newdr["part"] = dr[1].ToString(); + newdr["process"] = dr[2].ToString(); + newdr["reqstaff"] = dr[3].ToString(); + newdr["usermanager"] = dr[4].ToString(); + newdr["usermain"] = dr[5].ToString(); newdr["usermain"] = dr[6].ToString(); - newdr["usermain"] = dr[7].ToString(); - newdr["name"] = dr[8].ToString(); + newdr["memo"] = dr[7].ToString(); //CR / Order / PO No. + newdr["asset"] = dr[8].ToString(); + newdr["name"] = dr[9].ToString(); - if (dr[8].ToString() == "") continue; //이름없는것은 처리 안함 + if (newdr["name"].ToString() == "") continue; //이름없는것은 처리 안함 - newdr["remark_req"] = dr[9].ToString(); - newdr["remark_ans"] = dr[10].ToString(); - newdr["ddate"] = dr[11].ToString(); - - float value_progress = 0; - if (Single.TryParse(dr[12].ToString(), out value_progress)) - newdr["progress"] = value_progress; + newdr["remark_req"] = dr[10].ToString(); + newdr["remark_ans"] = dr[11].ToString(); + //12=request date newdr["sdate"] = dr[13].ToString(); - newdr["edate"] = dr[16].ToString(); + newdr["ddate"] = dr[14].ToString(); + newdr["edate"] = dr[15].ToString(); - string 대수 =dr[17].ToString().Replace("대","").Replace("수",""); + //float value_progress = 0; + //if (Single.TryParse(dr[12-1].ToString(), out value_progress)) + // newdr["progress"] = value_progress; + + + string 대수 =dr[16].ToString().Replace("대","").Replace("수",""); if (대수 == "") 대수 = "0"; newdr["cnt"] = int.Parse(대수); - string sCostO = dr[18].ToString(); - string sCostN = dr[19].ToString(); + string sCostO = dr[17].ToString(); + string sCostN = dr[18].ToString(); if (sCostO == "") sCostO = "0"; if (sCostN == "") sCostN = "0"; diff --git a/SubProject/FPJ0000/Import.resx b/SubProject/FPJ0000/Import.resx index 7ff8d35..81a691e 100644 --- a/SubProject/FPJ0000/Import.resx +++ b/SubProject/FPJ0000/Import.resx @@ -191,9 +191,6 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - 147, 17 - 230, 17 diff --git a/SubProject/FPJ0000/Properties/licenses.licx b/SubProject/FPJ0000/Properties/licenses.licx index 43d4733..9ec7918 100644 --- a/SubProject/FPJ0000/Properties/licenses.licx +++ b/SubProject/FPJ0000/Properties/licenses.licx @@ -1 +1,2 @@ +FarPoint.Win.Chart.FpChart, FarPoint.Win.Chart, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457 FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457 diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index ba9c953..29a7a3a 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -559,6 +559,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnasset; + private global::System.Data.DataColumn columnisdel; + + private global::System.Data.DataColumn columnpath; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsDataTable() : @@ -833,6 +837,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn isdelColumn { + get { + return this.columnisdel; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn pathColumn { + get { + return this.columnpath; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -898,7 +918,9 @@ namespace FPJ0000 { string ddate, int progress, bool import, - string asset) { + string asset, + bool isdel, + string path) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -929,7 +951,9 @@ namespace FPJ0000 { ddate, progress, import, - asset}; + asset, + isdel, + path}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -964,7 +988,9 @@ namespace FPJ0000 { string ddate, int progress, bool import, - string asset) { + string asset, + bool isdel, + string path) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -995,7 +1021,9 @@ namespace FPJ0000 { ddate, progress, import, - asset}; + asset, + isdel, + path}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1054,6 +1082,8 @@ namespace FPJ0000 { this.columnprogress = base.Columns["progress"]; this.columnimport = base.Columns["import"]; this.columnasset = base.Columns["asset"]; + this.columnisdel = base.Columns["isdel"]; + this.columnpath = base.Columns["path"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1117,6 +1147,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnimport); this.columnasset = new global::System.Data.DataColumn("asset", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnasset); + this.columnisdel = new global::System.Data.DataColumn("isdel", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisdel); + this.columnpath = new global::System.Data.DataColumn("path", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpath); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1146,6 +1180,7 @@ namespace FPJ0000 { this.columnremark_ans.MaxLength = 2147483647; this.columnddate.MaxLength = 50; this.columnasset.MaxLength = 100; + this.columnpath.MaxLength = 300; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2987,6 +3022,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columndiv; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsMailListDataTable() { @@ -3084,6 +3121,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn divColumn { + get { + return this.columndiv; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3121,7 +3166,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ProjectsMailListRow AddProjectsMailListRow(int Project, bool enable, string name, string address, string memo, string wuid, System.DateTime wdate) { + public ProjectsMailListRow AddProjectsMailListRow(int Project, bool enable, string name, string address, string memo, string wuid, System.DateTime wdate, string div) { ProjectsMailListRow rowProjectsMailListRow = ((ProjectsMailListRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3131,7 +3176,8 @@ namespace FPJ0000 { address, memo, wuid, - wdate}; + wdate, + div}; rowProjectsMailListRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsMailListRow); return rowProjectsMailListRow; @@ -3169,6 +3215,7 @@ namespace FPJ0000 { this.columnmemo = base.Columns["memo"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columndiv = base.Columns["div"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3190,6 +3237,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnwuid); this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwdate); + this.columndiv = new global::System.Data.DataColumn("div", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndiv); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -3205,6 +3254,7 @@ namespace FPJ0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columndiv.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4161,6 +4211,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool isdel { + get { + try { + return ((bool)(this[this.tableProjects.isdelColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'isdel\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjects.isdelColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string path { + get { + try { + return ((string)(this[this.tableProjects.pathColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'path\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjects.pathColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -4472,6 +4554,30 @@ namespace FPJ0000 { public void SetassetNull() { this[this.tableProjects.assetColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsisdelNull() { + return this.IsNull(this.tableProjects.isdelColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetisdelNull() { + this[this.tableProjects.isdelColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IspathNull() { + return this.IsNull(this.tableProjects.pathColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetpathNull() { + this[this.tableProjects.pathColumn] = global::System.Convert.DBNull; + } } /// @@ -5773,6 +5879,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string div { + get { + try { + return ((string)(this[this.tableProjectsMailList.divColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'ProjectsMailList\' 테이블의 \'div\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjectsMailList.divColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsProjectNull() { @@ -5832,6 +5954,18 @@ namespace FPJ0000 { public void SetmemoNull() { this[this.tableProjectsMailList.memoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsdivNull() { + return this.IsNull(this.tableProjectsMailList.divColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetdivNull() { + this[this.tableProjectsMailList.divColumn] = global::System.Convert.DBNull; + } } /// @@ -6396,6 +6530,8 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("progress", "progress"); tableMapping.ColumnMappings.Add("import", "import"); tableMapping.ColumnMappings.Add("asset", "asset"); + tableMapping.ColumnMappings.Add("isdel", "isdel"); + tableMapping.ColumnMappings.Add("path", "path"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -6423,7 +6559,9 @@ namespace FPJ0000.dsPRJTableAdapters { "al_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @" + "Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] " + "= @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = " + - "@Original_asset)))"; + "@Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Or" + + "iginal_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original" + + "_path)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -6474,10 +6612,14 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_asset", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [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]) 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); -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 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.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]) 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); +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 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, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6506,6 +6648,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", 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, [user" + @@ -6514,37 +6658,39 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat " @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 WHERE (([i" + - "dx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status]" + - " = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] =" + - " @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Orig" + - "inal_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = " + - "@Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([users" + - "ub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR " + - "([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) " + - "OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR " + - "([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([o" + - "date] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] " + - "= @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)" + - " AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsN" + - "ull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_use" + - "rManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManage" + - "r)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level))" + - " AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((" + - "@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) A" + - "ND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND " + - "((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@" + - "IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddat" + - "e = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progres" + - "s = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNul" + - "l_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNu" + - "ll_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)));\r\nSELECT idx," + - " status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wu" + - "id, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, rema" + - "rk_req, remark_ans, ddate, progress, import, asset FROM Projects WHERE (idx = @i" + - "dx) 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)"; + " @ddate, [progress] = @progress, [import] = @import, [asset] = @asset, [isdel] =" + + " @isdel, [path] = @path WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 " + + "AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 " + + "AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND " + + "[name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [us" + + "ermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1" + + " AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqsta" + + "ff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNu" + + "ll_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_" + + "edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_oda" + + "te = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo =" + + " 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wui" + + "d) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR (" + + "[rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = " + + "@Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([u" + + "serManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NUL" + + "L) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR" + + " ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR " + + "([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR" + + " ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([" + + "costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = " + + "@Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Orig" + + "inal_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] =" + + " @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import" + + "] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] " + + "= @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @" + + "Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Origin" + + "al_path)));\r\nSELECT 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, isde" + + "l, path FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THE" + + "N \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([sta" + + "tus] = \'완료\') 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, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6573,6 +6719,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -6622,6 +6770,10 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_asset", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -6639,11 +6791,11 @@ 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 + progress, import, asset, isdel, path FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR - ISNULL(usersub, '') LIKE @username) + ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) 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._commandCollection[0].CommandType = global::System.Data.CommandType.Text; @@ -6655,10 +6807,10 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; 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, level, memo, name, od" + - "ate, part, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev" + - ", sdate, status, userManager, usermain, usersub, wdate, wuid FROM Projects WHERE" + - " (idx = @idx)"; + this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, + userManager, usermain, usersub, wdate, wuid +FROM Projects +WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -6796,7 +6948,9 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN string Original_ddate, global::System.Nullable Original_progress, global::System.Nullable Original_import, - string Original_asset) { + string Original_asset, + global::System.Nullable Original_isdel, + string Original_path) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_status == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -6989,6 +7143,22 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[48].Value = ((string)(Original_asset)); } + if ((Original_isdel.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[50].Value = ((bool)(Original_isdel.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[50].Value = global::System.DBNull.Value; + } + if ((Original_path == null)) { + this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[52].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[52].Value = ((string)(Original_path)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -7036,7 +7206,9 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN string ddate, global::System.Nullable progress, global::System.Nullable import, - string asset) { + string asset, + global::System.Nullable isdel, + string path) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -7194,6 +7366,18 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN else { this.Adapter.InsertCommand.Parameters[26].Value = ((string)(asset)); } + if ((isdel.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[27].Value = ((bool)(isdel.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[27].Value = global::System.DBNull.Value; + } + if ((path == null)) { + this.Adapter.InsertCommand.Parameters[28].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[28].Value = ((string)(path)); + } 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)) { @@ -7242,6 +7426,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN global::System.Nullable progress, global::System.Nullable import, string asset, + global::System.Nullable isdel, + string path, int Original_idx, string Original_status, string Original_pdate, @@ -7268,6 +7454,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN global::System.Nullable Original_progress, global::System.Nullable Original_import, string Original_asset, + global::System.Nullable Original_isdel, + string Original_path, int idx) { if ((status == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -7426,199 +7614,227 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN else { this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(asset)); } - this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_idx)); - if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; + if ((isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[27].Value = ((bool)(isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_status)); + this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; } - if ((Original_pdate == null)) { + if ((path == null)) { + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(path)); + } + this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_idx)); + if ((Original_status == null)) { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_status)); } - if ((Original_name == null)) { + if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_pdate)); } - if ((Original_usermain == null)) { + if ((Original_name == null)) { this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_usermain)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_name)); } - if ((Original_usersub == null)) { + if ((Original_usermain == null)) { this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_usersub)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_usermain)); } - if ((Original_reqstaff == null)) { + if ((Original_usersub == null)) { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_reqstaff)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_usersub)); } - if ((Original_sdate == null)) { + if ((Original_reqstaff == null)) { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_sdate)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_reqstaff)); } - if ((Original_edate == null)) { + if ((Original_sdate == null)) { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_sdate)); } - if ((Original_odate == null)) { + if ((Original_edate == null)) { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_odate)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_edate)); } - if ((Original_memo == null)) { + if ((Original_odate == null)) { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_odate)); + } + if ((Original_memo == null)) { + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[49].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((System.DateTime)(Original_wdate)); if ((Original_rev.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((int)(Original_rev.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; - } - if ((Original_pidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_pidx.Value)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_rev.Value)); } else { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } - if ((Original_userManager == null)) { + if ((Original_pidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_pidx.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_userManager)); - } - if ((Original_level.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_level.Value)); - } - else { + if ((Original_userManager == null)) { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } - if ((Original_part == null)) { + else { + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_userManager)); + } + if ((Original_level.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_level.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_part)); - } - if ((Original_process == null)) { + if ((Original_part == null)) { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_part)); } - if ((Original_costo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((double)(Original_costo.Value)); - } - else { + if ((Original_process == null)) { this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } - if ((Original_costn.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_process)); + } + if ((Original_costo.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((double)(Original_costn.Value)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((double)(Original_costo.Value)); } else { this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } - if ((Original_cnt.HasValue == true)) { + if ((Original_costn.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_cnt.Value)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((double)(Original_costn.Value)); } else { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } - if ((Original_ddate == null)) { + if ((Original_cnt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(Original_cnt.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_ddate)); - } - if ((Original_progress.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((int)(Original_progress.Value)); - } - else { + if ((Original_ddate == null)) { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } - if ((Original_import.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_ddate)); + } + if ((Original_progress.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_progress.Value)); } else { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } - if ((Original_asset == null)) { + if ((Original_import.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((bool)(Original_import.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_asset)); + if ((Original_asset == null)) { + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[76].Value = ((int)(idx)); + else { + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_asset)); + } + if ((Original_isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((bool)(Original_isdel.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; + } + if ((Original_path == null)) { + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_path)); + } + this.Adapter.UpdateCommand.Parameters[82].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)) { @@ -7667,6 +7883,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN global::System.Nullable progress, global::System.Nullable import, string asset, + global::System.Nullable isdel, + string path, int Original_idx, string Original_status, string Original_pdate, @@ -7692,8 +7910,10 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN string Original_ddate, global::System.Nullable Original_progress, global::System.Nullable Original_import, - string Original_asset) { - return this.Update(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, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_rev, Original_pidx, Original_userManager, Original_level, Original_part, Original_process, Original_costo, Original_costn, Original_cnt, Original_ddate, Original_progress, Original_import, Original_asset, Original_idx); + string Original_asset, + global::System.Nullable Original_isdel, + string Original_path) { + return this.Update(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, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_rev, Original_pidx, Original_userManager, Original_level, Original_part, Original_process, Original_costo, Original_costn, Original_cnt, Original_ddate, Original_progress, Original_import, Original_asset, Original_isdel, Original_path, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10561,10 +10781,11 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM tableMapping.ColumnMappings.Add("memo", "memo"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("div", "div"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ProjectsMailList] WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ProjectsMailList] WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -10579,10 +10800,12 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_div", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [ProjectsMailList] ([Project], [enable], [name], [address], [memo], [wuid], [wdate]) VALUES (@Project, @enable, @name, @address, @memo, @wuid, @wdate); -SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailList WHERE (idx = SCOPE_IDENTITY()) ORDER BY name, address"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ProjectsMailList] ([Project], [enable], [name], [address], [memo], [wuid], [wdate], [div]) VALUES (@Project, @enable, @name, @address, @memo, @wuid, @wdate, @div); +SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM ProjectsMailList WHERE (idx = SCOPE_IDENTITY()) ORDER BY div, name, address"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "enable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10591,10 +10814,11 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", 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 [ProjectsMailList] SET [Project] = @Project, [enable] = @enable, [name] = @name, [address] = @address, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailList WHERE (idx = @idx) ORDER BY name, address"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [ProjectsMailList] SET [Project] = @Project, [enable] = @enable, [name] = @name, [address] = @address, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [div] = @div WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div))); +SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM ProjectsMailList WHERE (idx = @idx) ORDER BY div, name, address"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "enable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10603,6 +10827,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -10616,6 +10841,8 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_div", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -10632,8 +10859,8 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, Project, enable, name, address, memo, wuid, wdate\r\nFROM Projects" + - "MailList\r\nWHERE (Project = @project)\r\nORDER BY name, address"; + this._commandCollection[0].CommandText = "SELECT idx, Project, enable, name, address, memo, wuid, wdate, div\r\nFROM Pro" + + "jectsMailList\r\nWHERE (Project = @project)\r\nORDER BY div, name, address"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -10707,7 +10934,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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_Project, global::System.Nullable Original_enable, string Original_name, string Original_address, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { + public virtual int Delete(int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_enable, string Original_name, string Original_address, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_div) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_Project.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); @@ -10756,6 +10983,14 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this.Adapter.DeleteCommand.Parameters[11].Value = ((string)(Original_wuid)); } this.Adapter.DeleteCommand.Parameters[12].Value = ((System.DateTime)(Original_wdate)); + if ((Original_div == null)) { + this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_div)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -10776,7 +11011,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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 Project, global::System.Nullable enable, string name, string address, string memo, string wuid, System.DateTime wdate) { + public virtual int Insert(global::System.Nullable Project, global::System.Nullable enable, string name, string address, string memo, string wuid, System.DateTime wdate, string div) { if ((Project.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(Project.Value)); } @@ -10814,6 +11049,12 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this.Adapter.InsertCommand.Parameters[5].Value = ((string)(wuid)); } this.Adapter.InsertCommand.Parameters[6].Value = ((System.DateTime)(wdate)); + if ((div == null)) { + this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[7].Value = ((string)(div)); + } 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)) { @@ -10842,6 +11083,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL string memo, string wuid, System.DateTime wdate, + string div, int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_enable, @@ -10850,6 +11092,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL string Original_memo, string Original_wuid, System.DateTime Original_wdate, + string Original_div, int idx) { if ((Project.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(Project.Value)); @@ -10888,55 +11131,69 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(wuid)); } this.Adapter.UpdateCommand.Parameters[6].Value = ((System.DateTime)(wdate)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_idx)); - if ((Original_Project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_Project.Value)); + if ((div == null)) { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(div)); + } + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx)); + if ((Original_Project.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_Project.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } if ((Original_enable.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[11].Value = ((bool)(Original_enable.Value)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((bool)(Original_enable.Value)); } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_name)); } if ((Original_address == null)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_address)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_address)); } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[19].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate)); + if ((Original_div == null)) { + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_div)); + } + this.Adapter.UpdateCommand.Parameters[23].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)) { @@ -10957,8 +11214,25 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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(global::System.Nullable Project, global::System.Nullable enable, string name, string address, string memo, string wuid, System.DateTime wdate, int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_enable, string Original_name, string Original_address, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { - return this.Update(Project, enable, name, address, memo, wuid, wdate, Original_idx, Original_Project, Original_enable, Original_name, Original_address, Original_memo, Original_wuid, Original_wdate, Original_idx); + public virtual int Update( + global::System.Nullable Project, + global::System.Nullable enable, + string name, + string address, + string memo, + string wuid, + System.DateTime wdate, + string div, + int Original_idx, + global::System.Nullable Original_Project, + global::System.Nullable Original_enable, + string Original_name, + string Original_address, + string Original_memo, + string Original_wuid, + System.DateTime Original_wdate, + string Original_div) { + return this.Update(Project, enable, name, address, memo, wuid, wdate, div, Original_idx, Original_Project, Original_enable, Original_name, Original_address, Original_memo, Original_wuid, Original_wdate, Original_div, Original_idx); } } diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index e60d96d..b8a7d40 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -12,7 +12,7 @@ - DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset))) + DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path))) @@ -63,13 +63,17 @@ + + + + - 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]) 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); -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 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) + 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]) 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); +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 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) @@ -98,17 +102,19 @@ 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 + progress, import, asset, isdel, path FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR - ISNULL(usersub, '') LIKE @username) + ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) 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) @@ -119,8 +125,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN - 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 WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset))); -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 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) + 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 WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path))); +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 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) @@ -149,6 +155,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + @@ -198,6 +206,10 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + @@ -233,6 +245,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + @@ -246,7 +260,10 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat - SELECT asset, cnt, costn, costo, ddate, edate, idx, import, level, memo, name, odate, part, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, usermain, usersub, wdate, wuid FROM Projects WHERE (idx = @idx) + SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, + userManager, usermain, usersub, wdate, wuid +FROM Projects +WHERE (idx = @idx) @@ -728,7 +745,7 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM - DELETE FROM [ProjectsMailList] WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [ProjectsMailList] WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div))) @@ -743,13 +760,15 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM + + - INSERT INTO [ProjectsMailList] ([Project], [enable], [name], [address], [memo], [wuid], [wdate]) VALUES (@Project, @enable, @name, @address, @memo, @wuid, @wdate); -SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailList WHERE (idx = SCOPE_IDENTITY()) ORDER BY name, address + INSERT INTO [ProjectsMailList] ([Project], [enable], [name], [address], [memo], [wuid], [wdate], [div]) VALUES (@Project, @enable, @name, @address, @memo, @wuid, @wdate, @div); +SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM ProjectsMailList WHERE (idx = SCOPE_IDENTITY()) ORDER BY div, name, address @@ -758,15 +777,16 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + - - SELECT idx, Project, enable, name, address, memo, wuid, wdate + + SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM ProjectsMailList WHERE (Project = @project) -ORDER BY name, address +ORDER BY div, name, address @@ -774,8 +794,8 @@ ORDER BY name, address - UPDATE [ProjectsMailList] SET [Project] = @Project, [enable] = @enable, [name] = @name, [address] = @address, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailList WHERE (idx = @idx) ORDER BY name, address + UPDATE [ProjectsMailList] SET [Project] = @Project, [enable] = @enable, [name] = @name, [address] = @address, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [div] = @div WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div))); +SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM ProjectsMailList WHERE (idx = @idx) ORDER BY div, name, address @@ -784,6 +804,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + @@ -797,6 +818,8 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + + @@ -812,6 +835,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + @@ -1062,6 +1086,14 @@ SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory + + + + + + + + @@ -1315,6 +1347,13 @@ SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory + + + + + + + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index fb0a0cb..dc95ee7 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,15 +4,15 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - - + + + diff --git a/SubProject/FPJ0000/fMailList.Designer.cs b/SubProject/FPJ0000/fMailList.Designer.cs index 01d832a..e38ec30 100644 --- a/SubProject/FPJ0000/fMailList.Designer.cs +++ b/SubProject/FPJ0000/fMailList.Designer.cs @@ -40,10 +40,11 @@ FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.ComboBoxCellType comboBoxCellType1 = new FarPoint.Win.Spread.CellType.ComboBoxCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.idxTextBox = new System.Windows.Forms.TextBox(); @@ -189,7 +190,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(595, 124); + this.panel1.Size = new System.Drawing.Size(681, 124); this.panel1.TabIndex = 0; // // idxTextBox @@ -390,14 +391,14 @@ this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 569); + this.bn.Location = new System.Drawing.Point(0, 639); 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(595, 25); + this.bn.Size = new System.Drawing.Size(681, 25); this.bn.TabIndex = 3; this.bn.Text = "bindingNavigator1"; // @@ -408,6 +409,7 @@ this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(67, 22); this.bindingNavigatorAddNewItem.Text = "추가(&A)"; + this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // // bindingNavigatorCountItem // @@ -507,6 +509,7 @@ // this.tam.BackupDataSetBeforeUpdate = false; this.tam.JobReportTableAdapter = null; + this.tam.ProjectsHistoryTableAdapter = null; this.tam.ProjectsIOMapTableAdapter = null; this.tam.ProjectsMailListTableAdapter = this.ta; this.tam.ProjectsPartTableAdapter = null; @@ -525,6 +528,8 @@ // fpSpread1 // this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.AutoFitColumnOptions = FarPoint.Win.Spread.PreferredSizeColumnOptions.IncludeAll; + this.fpSpread1.AutoFitRowOptions = FarPoint.Win.Spread.PreferredSizeRowOptions.IncludeAll; this.fpSpread1.ContextMenuStrip = this.cm1; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; @@ -538,7 +543,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(595, 445); + this.fpSpread1.Size = new System.Drawing.Size(681, 515); this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013; this.fpSpread1.TabIndex = 4; this.fpSpread1.TitleInfo.Text = "PartList"; @@ -555,7 +560,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 = 4; + this.fpSpread1_Sheet1.ColumnCount = 5; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -565,29 +570,50 @@ this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.Parent = "CornerFooterFlat"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "메일주소"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "이름"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "사용"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "사용"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "구분"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "메일주소"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "이름"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "address"; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "메일주소"; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "이름"; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 128F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "enable"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "사용"; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "enable"; + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "사용"; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + comboBoxCellType1.AllowEditorVerticalAlign = true; + comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right; + comboBoxCellType1.ItemData = new string[] { + "TO", + "CC", + "BCC"}; + comboBoxCellType1.Items = new string[] { + "TO", + "CC", + "BCC"}; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = comboBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "div"; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "구분"; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 101F; + this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "address"; + this.fpSpread1_Sheet1.Columns.Get(2).InputScope = FarPoint.Win.InputScopeNameValue.EmailSmtpAddress; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "메일주소"; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "이름"; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 128F; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty; @@ -619,12 +645,16 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(595, 594); + this.ClientSize = new System.Drawing.Size(681, 664); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "fMailList"; this.Text = "프로젝트 메일발송 대상"; + this.UseFormSetting = false; this.Load += new System.EventHandler(this.fPartList_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); diff --git a/SubProject/FPJ0000/fMailList.cs b/SubProject/FPJ0000/fMailList.cs index 90f13a2..bdbe00b 100644 --- a/SubProject/FPJ0000/fMailList.cs +++ b/SubProject/FPJ0000/fMailList.cs @@ -33,6 +33,7 @@ namespace FPJ0000 e.Row["wdate"] = DateTime.Now; e.Row["Project"] = this.ProjectIndex; e.Row["enable"] = true; + e.Row["div"] = "TO"; } void fPartList_KeyDown(object sender, KeyEventArgs e) @@ -155,5 +156,10 @@ namespace FPJ0000 FCOMMON.Util.MsgE("Save error\n\n" +ex.Message); } } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index 2a2db9c..0ac1d60 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -30,18 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.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 textCellType20 = 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(); @@ -56,6 +59,7 @@ this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btAdd = new System.Windows.Forms.ToolStripButton(); this.btDel = new System.Windows.Forms.ToolStripButton(); + this.btEdit = new System.Windows.Forms.ToolStripButton(); this.btSave = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); @@ -94,6 +98,7 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); + this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.label1 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); @@ -103,22 +108,24 @@ this.bsHist = new System.Windows.Forms.BindingSource(this.components); this.panel2 = new System.Windows.Forms.Panel(); this.textBox4 = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); + this.label11 = new System.Windows.Forms.Label(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.textBox7 = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); this.textBox8 = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox9 = new System.Windows.Forms.TextBox(); this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); - this.btEdit = new System.Windows.Forms.ToolStripButton(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -166,7 +173,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(775, 25); + this.bn.Size = new System.Drawing.Size(1052, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -267,6 +274,14 @@ this.btDel.Text = "삭제(&D)"; this.btDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); // + // btEdit + // + this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image"))); + this.btEdit.Name = "btEdit"; + this.btEdit.Size = new System.Drawing.Size(65, 22); + this.btEdit.Text = "편집(&E)"; + this.btEdit.Click += new System.EventHandler(this.btEdit_Click); + // // btSave // this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); @@ -448,7 +463,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(343, 480); + this.fpSpread1.Size = new System.Drawing.Size(620, 480); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -458,115 +473,137 @@ 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 = 12; + this.fpSpread1_Sheet1.ColumnCount = 15; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Status"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Process"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Status"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Requestor"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Part"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Project\r\nChampion"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).ColumnSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Co Workers"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Project"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Process"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Requestor"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "Project\r\nChampion"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Co Workers"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Asset No."; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Project"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "대수"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Remark"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Asset No."; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType25; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + 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).Tag = "state"; + 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(0).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType26; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType11; + 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 = textCellType27; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "reqstaff"; - 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(2).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType28; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType29; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "H/W"; 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(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType30; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "S/W"; 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).CellType = textCellType31; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "H/W"; 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).CellType = textCellType32; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; - numberCellType13.DecimalPlaces = 0; - numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType13.MaximumValue = 2147483647D; - numberCellType13.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType13; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 59F; - numberCellType14.MaximumValue = 999999999999999D; - numberCellType14.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType14; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType15.MaximumValue = 999999999999999D; - numberCellType15.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType15; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType16.MaximumValue = 999999999999999D; - numberCellType16.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType16; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 59F; + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType9.MaximumValue = 999999999999999D; + numberCellType9.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).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(13).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -587,10 +624,11 @@ this.toolStripSeparator3, this.toolStripLabel3, this.tbRequest, - this.btSearch}); + this.btSearch, + this.btViewDel}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(775, 25); + this.toolStrip1.Size = new System.Drawing.Size(1052, 25); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -697,6 +735,16 @@ this.btSearch.Text = "새로고침(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // + // 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(99, 22); + this.btViewDel.Text = "삭제자료표시"; + // // label1 // this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); @@ -705,7 +753,7 @@ this.label1.Location = new System.Drawing.Point(0, 505); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(775, 23); + this.label1.Size = new System.Drawing.Size(1052, 23); this.label1.TabIndex = 5; this.label1.Text = "--"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -715,7 +763,7 @@ this.panel1.Controls.Add(this.tableLayoutPanel1); this.panel1.Controls.Add(this.tableLayoutPanel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(343, 25); + this.panel1.Location = new System.Drawing.Point(620, 25); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(432, 480); this.panel1.TabIndex = 6; @@ -729,16 +777,16 @@ this.tableLayoutPanel1.Controls.Add(this.textBox3, 0, 1); this.tableLayoutPanel1.Controls.Add(this.label4, 1, 2); this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.button1, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.label11, 0, 2); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 45); + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 74); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 4; 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.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(432, 435); + this.tableLayoutPanel1.Size = new System.Drawing.Size(432, 406); this.tableLayoutPanel1.TabIndex = 11; // // label2 @@ -765,7 +813,7 @@ this.textBox3.Multiline = true; this.textBox3.Name = "textBox3"; this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox3.Size = new System.Drawing.Size(432, 192); + this.textBox3.Size = new System.Drawing.Size(432, 178); this.textBox3.TabIndex = 8; // // label4 @@ -774,7 +822,7 @@ this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); this.label4.Dock = System.Windows.Forms.DockStyle.Fill; 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(332, 217); + this.label4.Location = new System.Drawing.Point(332, 203); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 25); @@ -793,10 +841,10 @@ this.tableLayoutPanel1.SetColumnSpan(this.panel2, 2); this.panel2.Controls.Add(this.textBox4); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(0, 242); + this.panel2.Location = new System.Drawing.Point(0, 228); this.panel2.Margin = new System.Windows.Forms.Padding(0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(432, 193); + this.panel2.Size = new System.Drawing.Size(432, 178); this.panel2.TabIndex = 13; // // textBox4 @@ -808,19 +856,18 @@ this.textBox4.Name = "textBox4"; this.textBox4.ReadOnly = true; this.textBox4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox4.Size = new System.Drawing.Size(432, 193); + this.textBox4.Size = new System.Drawing.Size(432, 178); this.textBox4.TabIndex = 10; // - // button1 + // label11 // - this.button1.Dock = System.Windows.Forms.DockStyle.Fill; - this.button1.Location = new System.Drawing.Point(3, 220); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(326, 19); - this.button1.TabIndex = 14; - this.button1.Text = "Weekly 진행 사항"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); + this.label11.Dock = System.Windows.Forms.DockStyle.Fill; + this.label11.Location = new System.Drawing.Point(3, 203); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(326, 25); + this.label11.TabIndex = 14; + this.label11.Text = "Weekly History"; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // tableLayoutPanel2 // @@ -833,24 +880,27 @@ 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, 33.33333F)); this.tableLayoutPanel2.Controls.Add(this.label6, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.label7, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.label5, 2, 0); - this.tableLayoutPanel2.Controls.Add(this.label8, 2, 1); - this.tableLayoutPanel2.Controls.Add(this.label9, 4, 0); - this.tableLayoutPanel2.Controls.Add(this.label10, 4, 1); this.tableLayoutPanel2.Controls.Add(this.textBox1, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.textBox2, 3, 0); - this.tableLayoutPanel2.Controls.Add(this.textBox5, 5, 0); - this.tableLayoutPanel2.Controls.Add(this.textBox6, 5, 1); - this.tableLayoutPanel2.Controls.Add(this.textBox7, 3, 1); - this.tableLayoutPanel2.Controls.Add(this.textBox8, 1, 1); + this.tableLayoutPanel2.Controls.Add(this.label7, 0, 2); + this.tableLayoutPanel2.Controls.Add(this.textBox8, 1, 2); + this.tableLayoutPanel2.Controls.Add(this.label8, 2, 2); + this.tableLayoutPanel2.Controls.Add(this.textBox7, 3, 2); + this.tableLayoutPanel2.Controls.Add(this.label10, 4, 2); + this.tableLayoutPanel2.Controls.Add(this.textBox6, 5, 2); + this.tableLayoutPanel2.Controls.Add(this.textBox5, 4, 0); + this.tableLayoutPanel2.Controls.Add(this.label9, 3, 0); + this.tableLayoutPanel2.Controls.Add(this.label5, 3, 1); + this.tableLayoutPanel2.Controls.Add(this.textBox2, 4, 1); + this.tableLayoutPanel2.Controls.Add(this.label3, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.textBox9, 1, 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.RowCount = 3; 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.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(432, 45); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(432, 74); this.tableLayoutPanel2.TabIndex = 12; // // label6 @@ -859,157 +909,184 @@ 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, 21); + this.label6.Size = new System.Drawing.Size(74, 25); this.label6.TabIndex = 0; this.label6.Text = "Start"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label7 - // - this.label7.Dock = System.Windows.Forms.DockStyle.Fill; - this.label7.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(4, 23); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(74, 21); - this.label7.TabIndex = 0; - this.label7.Text = "Origin($K)"; - this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // 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(147, 1); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 21); - this.label5.TabIndex = 0; - this.label5.Text = "End"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label8 - // - this.label8.Dock = System.Windows.Forms.DockStyle.Fill; - this.label8.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(147, 23); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(74, 21); - this.label8.TabIndex = 0; - this.label8.Text = "Input($K)"; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // 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.Location = new System.Drawing.Point(290, 1); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(74, 21); - this.label9.TabIndex = 0; - this.label9.Text = "Due"; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label10 - // - this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(290, 23); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(74, 21); - this.label10.TabIndex = 0; - this.label10.Text = "Effect($K)"; - this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label6, "시작일"); // // textBox1 // - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tableLayoutPanel2.SetColumnSpan(this.textBox1, 2); this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox1.Location = new System.Drawing.Point(82, 1); this.textBox1.Margin = new System.Windows.Forms.Padding(0); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(61, 21); + this.textBox1.Size = new System.Drawing.Size(142, 21); this.textBox1.TabIndex = 1; - this.textBox1.Text = "19-01-01"; + this.textBox1.Text = "--"; this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.toolTip1.SetToolTip(this.textBox1, "시작일"); // - // textBox2 + // label7 // - this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); - this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox2.Location = new System.Drawing.Point(225, 1); - this.textBox2.Margin = new System.Windows.Forms.Padding(0); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(61, 21); - this.textBox2.TabIndex = 1; - this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.label7.Dock = System.Windows.Forms.DockStyle.Fill; + this.label7.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label7.Location = new System.Drawing.Point(4, 53); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(74, 20); + this.label7.TabIndex = 0; + this.label7.Text = "Origin($K)"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // textBox5 + // textBox8 // - this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); - this.textBox5.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox5.Location = new System.Drawing.Point(368, 1); - this.textBox5.Margin = new System.Windows.Forms.Padding(0); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(63, 21); - this.textBox5.TabIndex = 1; - this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costo", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2")); + this.textBox8.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox8.Location = new System.Drawing.Point(82, 53); + this.textBox8.Margin = new System.Windows.Forms.Padding(0); + this.textBox8.Name = "textBox8"; + this.textBox8.Size = new System.Drawing.Size(61, 21); + this.textBox8.TabIndex = 1; + this.textBox8.Text = "--"; + this.textBox8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label8 + // + this.label8.Dock = System.Windows.Forms.DockStyle.Fill; + this.label8.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label8.Location = new System.Drawing.Point(147, 53); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(74, 20); + this.label8.TabIndex = 0; + this.label8.Text = "Input($K)"; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // textBox7 + // + this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costn", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2")); + this.textBox7.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox7.Location = new System.Drawing.Point(225, 53); + this.textBox7.Margin = new System.Windows.Forms.Padding(0); + this.textBox7.Name = "textBox7"; + this.textBox7.Size = new System.Drawing.Size(61, 21); + this.textBox7.TabIndex = 1; + this.textBox7.Text = "--"; + this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label10 + // + this.label10.Dock = System.Windows.Forms.DockStyle.Fill; + this.label10.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label10.Location = new System.Drawing.Point(290, 53); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(74, 20); + this.label10.TabIndex = 0; + this.label10.Text = "Effect($K)"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // textBox6 // - this.textBox6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.textBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "coste", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2")); this.textBox6.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox6.Location = new System.Drawing.Point(368, 23); + this.textBox6.Location = new System.Drawing.Point(368, 53); this.textBox6.Margin = new System.Windows.Forms.Padding(0); this.textBox6.Name = "textBox6"; this.textBox6.ReadOnly = true; this.textBox6.Size = new System.Drawing.Size(63, 21); this.textBox6.TabIndex = 1; - this.textBox6.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.textBox6.Text = "--"; + this.textBox6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // textBox7 + // textBox5 // - this.textBox7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costn", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2")); - this.textBox7.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox7.Location = new System.Drawing.Point(225, 23); - this.textBox7.Margin = new System.Windows.Forms.Padding(0); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(61, 21); - this.textBox7.TabIndex = 1; - this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tableLayoutPanel2.SetColumnSpan(this.textBox5, 2); + this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); + this.textBox5.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox5.Location = new System.Drawing.Point(287, 1); + this.textBox5.Margin = new System.Windows.Forms.Padding(0); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(144, 21); + this.textBox5.TabIndex = 1; + this.textBox5.Text = "--"; + this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.toolTip1.SetToolTip(this.textBox5, "예상완료일"); // - // textBox8 + // label9 // - this.textBox8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costo", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2")); - this.textBox8.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox8.Location = new System.Drawing.Point(82, 23); - this.textBox8.Margin = new System.Windows.Forms.Padding(0); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(61, 21); - this.textBox8.TabIndex = 1; - this.textBox8.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + 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(228, 1); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(55, 25); + this.label9.TabIndex = 0; + this.label9.Text = "Due"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label9, "예상완료일"); + // + // 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(228, 27); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(55, 25); + this.label5.TabIndex = 0; + this.label5.Text = "End"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label5, "완료일"); + // + // textBox2 + // + this.tableLayoutPanel2.SetColumnSpan(this.textBox2, 2); + this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); + this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox2.Location = new System.Drawing.Point(287, 27); + this.textBox2.Margin = new System.Windows.Forms.Padding(0); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(144, 21); + this.textBox2.TabIndex = 1; + this.textBox2.Text = "--"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.toolTip1.SetToolTip(this.textBox2, "완료일"); + // + // 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(4, 27); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(74, 25); + this.label3.TabIndex = 0; + this.label3.Text = "Out"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label3, "출고일(프로그램의 경우 설치일)"); + // + // textBox9 + // + this.tableLayoutPanel2.SetColumnSpan(this.textBox9, 2); + this.textBox9.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); + this.textBox9.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox9.Location = new System.Drawing.Point(82, 27); + this.textBox9.Margin = new System.Windows.Forms.Padding(0); + this.textBox9.Name = "textBox9"; + this.textBox9.Size = new System.Drawing.Size(142, 21); + this.textBox9.TabIndex = 1; + this.textBox9.Text = "--"; + this.textBox9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.toolTip1.SetToolTip(this.textBox9, "출고일(프로그램의 경우 설치일)"); // // taHist // this.taHist.ClearBeforeFill = true; // - // btEdit - // - this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image"))); - this.btEdit.Name = "btEdit"; - this.btEdit.Size = new System.Drawing.Size(65, 22); - this.btEdit.Text = "편집(&E)"; - this.btEdit.Click += new System.EventHandler(this.btEdit_Click); - // // fProjectList // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(775, 553); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1052, 553); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.panel1); this.Controls.Add(this.label1); @@ -1118,8 +1195,12 @@ private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.TextBox textBox7; private System.Windows.Forms.TextBox textBox8; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; - private System.Windows.Forms.Button button1; private System.Windows.Forms.ToolStripButton btEdit; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox textBox9; + private System.Windows.Forms.ToolTip toolTip1; + private System.Windows.Forms.ToolStripButton btViewDel; + private System.Windows.Forms.Label label11; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.cs b/SubProject/FPJ0000/fProjectList.cs index 3180f3c..db5dcdd 100644 --- a/SubProject/FPJ0000/fProjectList.cs +++ b/SubProject/FPJ0000/fProjectList.cs @@ -19,6 +19,7 @@ namespace FPJ0000 fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.dsMSSQL.Projects.TableNewRow += Projects_TableNewRow; this.FormClosed += __Closed; + } void __Closed(object sender, FormClosedEventArgs e) @@ -44,7 +45,29 @@ namespace FPJ0000 for (int i = 2010; i <= DateTime.Now.Year; i++) cmbYear.Items.Add(i.ToString("0000")); this.cmbYear.Text = DateTime.Now.AddYears(-1).Year.ToString("0000"); - refreshData(); + refreshData(); + + + //일반사용자의경우에는 상태를 변경하지 못한다. + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); + if (curLevel >= 5) + { + btSave.Visible = true; + } + else + { + btSave.Visible = false; //목록에서 저장버튼은 제거한다. + btViewDel.Visible = false; + fpSpread1.EditMode = false; + fpSpread1.Sheets[0].SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row; + fpSpread1.EditModePermanent = false; + fpSpread1.EditModeReplace = false; + + foreach (FarPoint.Win.Spread.Column col in fpSpread1.ActiveSheet.Columns) + col.Locked = true; + } + + } void refreshData() @@ -55,7 +78,7 @@ namespace FPJ0000 { state = ""; } - else if (chk검토.Checked == false && chk진행.Checked == false && chk보류.Checked == false && chk완료.Checked == false && chk취소.Checked == false && chk대기.Checked==false) + else if (chk검토.Checked == false && chk진행.Checked == false && chk보류.Checked == false && chk완료.Checked == false && chk취소.Checked == false && chk대기.Checked == false) { chk진행.Checked = true; state = "[status] = '진행'"; //아무것도 선택안하면 진행을 선택해준다. @@ -105,13 +128,17 @@ namespace FPJ0000 // var orgQuery = this.ta.Adapter.SelectCommand.CommandText; string State_Select = " SELECT * FROM Projects"; - string State_where = " WHERE pdate >= '" + cmbYear.Text + "01-01' AND (ISNULL(userManager, '') LIKE @username OR " + + string State_where = " WHERE "; + + if (btViewDel.Checked) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 + State_where += " pdate >= '" + cmbYear.Text + "-01-01' 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; string State_order = "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)"; + "([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END),userManager,sdate"; string request = "%"; if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%"; @@ -134,12 +161,12 @@ namespace FPJ0000 this.dsMSSQL.Projects.AcceptChanges(); FormattingData(); - + } void FormattingData() { - + //삭제컬럼인덱스 this.fpSpread1.SuspendLayout(); var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index; @@ -183,14 +210,15 @@ namespace FPJ0000 this.bs.EndEdit(); var dlg = FCOMMON.Util.MsgQ("변경 사항을 저장하시겠습니까?"); - if(dlg == System.Windows.Forms.DialogResult.Yes) + if (dlg == System.Windows.Forms.DialogResult.Yes) { try { this.tam.UpdateAll(this.dsMSSQL); dsMSSQL.AcceptChanges(); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } catch ( Exception ex) + } + catch (Exception ex) { FCOMMON.Util.MsgE(ex.Message); } @@ -236,6 +264,7 @@ namespace FPJ0000 { foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) { + col.ResetVisible(); col.Width = 100; } } @@ -340,7 +369,7 @@ namespace FPJ0000 private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) { var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?"); - if(dlg == System.Windows.Forms.DialogResult.Yes) + if (dlg == System.Windows.Forms.DialogResult.Yes) { bs.RemoveCurrent(); } @@ -349,9 +378,9 @@ namespace FPJ0000 private void 엑셀파일로저장ToolStripMenuItem_Click(object sender, EventArgs e) { SaveFileDialog sd = new SaveFileDialog(); - sd.Filter=("excel|*.xls"); + sd.Filter = ("excel|*.xls"); var dlg = sd.ShowDialog(); - if(dlg == System.Windows.Forms.DialogResult.OK) + if (dlg == System.Windows.Forms.DialogResult.OK) { this.fpSpread1.SaveExcel(sd.FileName); FCOMMON.Util.MsgI("파일생성 완료\n\n" + sd.FileName); diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx index 2626146..0176bbd 100644 --- a/SubProject/FPJ0000/fProjectList.resx +++ b/SubProject/FPJ0000/fProjectList.resx @@ -268,109 +268,109 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKsSURBVDhPrZPbS5NxHMbfv6GrubX3LQ0vMi+KUVQK6UVE - SbgGHtI0c5mHtr07qCltM4bNtEgD52FJimiWpZabcyZT52w6p5SJy6aEmLvpQLVhdLCn9x2TNCoIeuDh - 9734fp7fmfjvypiMizg1dlCdYt/vPWba7T9qivYLrVFeoWWnOrFvR0So7ffKdMaKkux7fSp7Klo9BnQt - tAXdMleLfGsi4jso36EOUhRq36xMxwGRcFgQqJ7WwrLUjabnN6CbLg6arc1LXagav4A9Bn5g303e5pCT - ozHhIptghYXZxlK3BEWufCjGc6FiXMi4ZKIAppf3cMVRhF0Gzkq0gQwP4QSRahNo6KHk4MwszIK08yyk - Y9mQOs5A7siGbbkPGqcMZiYk484RRF7fqgnhBCF8FO1t8dTC6KlB0UQeZI/FDJgF2ShjexaGX1nByhdY - RsPTKjRNV4Gq4HhDOEEcNkWuPli8jTK3AkpnDrOSHsy9mwE9ko2h5f4g/G3tKxqeXIVmJA9dnhaQ2i2r - IZwg4u9Tq90L7dC6aJS5lPjw+X0QevvpdXBkYcNUBeTWNKht59DtaQZZujGgnfLemqlB4+w1qEbF0E+U - IPDlYxBe+74Gw+RlSCzJUDABde5yNDr1oFQbthDTSmrEPQkwLd5FyYgYclsmyscKMf9mFg1TlTjflwSp - OQUqSzpML9px3BgHspj78xAFTWQ4ezV6uwIPvR0oHjwN5UA66P5UyMysWTgNvfNt0PbngaQ5KyS94RpZ - RVXzRNsu8QI6mwRmJqTerYd6MAcXB8SoZ7ZgYmC1JQf8XG6AlP/ykNa1vZInorRhvhPN8Wh06dH5zIjO - GSMMTh0S6mIRVhDmI6V/gNfF1/EjSA1XTZVyvKSS6ydprp+SMDXNVfMl/L9/pn8XQfwAgLWxKqsRqNwA - AAAASUVORK5CYII= + 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== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKsSURBVDhPrZPbS5NxHMbfv6GrubX3LQ0vMi+KUVQK6UVE - SbgGHtI0c5mHtr07qCltM4bNtEgD52FJimiWpZabcyZT52w6p5SJy6aEmLvpQLVhdLCn9x2TNCoIeuDh - 9734fp7fmfjvypiMizg1dlCdYt/vPWba7T9qivYLrVFeoWWnOrFvR0So7ffKdMaKkux7fSp7Klo9BnQt - tAXdMleLfGsi4jso36EOUhRq36xMxwGRcFgQqJ7WwrLUjabnN6CbLg6arc1LXagav4A9Bn5g303e5pCT - ozHhIptghYXZxlK3BEWufCjGc6FiXMi4ZKIAppf3cMVRhF0Gzkq0gQwP4QSRahNo6KHk4MwszIK08yyk - Y9mQOs5A7siGbbkPGqcMZiYk484RRF7fqgnhBCF8FO1t8dTC6KlB0UQeZI/FDJgF2ShjexaGX1nByhdY - RsPTKjRNV4Gq4HhDOEEcNkWuPli8jTK3AkpnDrOSHsy9mwE9ko2h5f4g/G3tKxqeXIVmJA9dnhaQ2i2r - IZwg4u9Tq90L7dC6aJS5lPjw+X0QevvpdXBkYcNUBeTWNKht59DtaQZZujGgnfLemqlB4+w1qEbF0E+U - IPDlYxBe+74Gw+RlSCzJUDABde5yNDr1oFQbthDTSmrEPQkwLd5FyYgYclsmyscKMf9mFg1TlTjflwSp - OQUqSzpML9px3BgHspj78xAFTWQ4ezV6uwIPvR0oHjwN5UA66P5UyMysWTgNvfNt0PbngaQ5KyS94RpZ - RVXzRNsu8QI6mwRmJqTerYd6MAcXB8SoZ7ZgYmC1JQf8XG6AlP/ykNa1vZInorRhvhPN8Wh06dH5zIjO - GSMMTh0S6mIRVhDmI6V/gNfF1/EjSA1XTZVyvKSS6ydprp+SMDXNVfMl/L9/pn8XQfwAgLWxKqsRqNwA - AAAASUVORK5CYII= + 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== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKsSURBVDhPrZPbS5NxHMbfv6GrubX3LQ0vMi+KUVQK6UVE - SbgGHtI0c5mHtr07qCltM4bNtEgD52FJimiWpZabcyZT52w6p5SJy6aEmLvpQLVhdLCn9x2TNCoIeuDh - 9734fp7fmfjvypiMizg1dlCdYt/vPWba7T9qivYLrVFeoWWnOrFvR0So7ffKdMaKkux7fSp7Klo9BnQt - tAXdMleLfGsi4jso36EOUhRq36xMxwGRcFgQqJ7WwrLUjabnN6CbLg6arc1LXagav4A9Bn5g303e5pCT - ozHhIptghYXZxlK3BEWufCjGc6FiXMi4ZKIAppf3cMVRhF0Gzkq0gQwP4QSRahNo6KHk4MwszIK08yyk - Y9mQOs5A7siGbbkPGqcMZiYk484RRF7fqgnhBCF8FO1t8dTC6KlB0UQeZI/FDJgF2ShjexaGX1nByhdY - RsPTKjRNV4Gq4HhDOEEcNkWuPli8jTK3AkpnDrOSHsy9mwE9ko2h5f4g/G3tKxqeXIVmJA9dnhaQ2i2r - IZwg4u9Tq90L7dC6aJS5lPjw+X0QevvpdXBkYcNUBeTWNKht59DtaQZZujGgnfLemqlB4+w1qEbF0E+U - IPDlYxBe+74Gw+RlSCzJUDABde5yNDr1oFQbthDTSmrEPQkwLd5FyYgYclsmyscKMf9mFg1TlTjflwSp - OQUqSzpML9px3BgHspj78xAFTWQ4ezV6uwIPvR0oHjwN5UA66P5UyMysWTgNvfNt0PbngaQ5KyS94RpZ - RVXzRNsu8QI6mwRmJqTerYd6MAcXB8SoZ7ZgYmC1JQf8XG6AlP/ykNa1vZInorRhvhPN8Wh06dH5zIjO - GSMMTh0S6mIRVhDmI6V/gNfF1/EjSA1XTZVyvKSS6ydprp+SMDXNVfMl/L9/pn8XQfwAgLWxKqsRqNwA - AAAASUVORK5CYII= + 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== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKsSURBVDhPrZPbS5NxHMbfv6GrubX3LQ0vMi+KUVQK6UVE - SbgGHtI0c5mHtr07qCltM4bNtEgD52FJimiWpZabcyZT52w6p5SJy6aEmLvpQLVhdLCn9x2TNCoIeuDh - 9734fp7fmfjvypiMizg1dlCdYt/vPWba7T9qivYLrVFeoWWnOrFvR0So7ffKdMaKkux7fSp7Klo9BnQt - tAXdMleLfGsi4jso36EOUhRq36xMxwGRcFgQqJ7WwrLUjabnN6CbLg6arc1LXagav4A9Bn5g303e5pCT - ozHhIptghYXZxlK3BEWufCjGc6FiXMi4ZKIAppf3cMVRhF0Gzkq0gQwP4QSRahNo6KHk4MwszIK08yyk - Y9mQOs5A7siGbbkPGqcMZiYk484RRF7fqgnhBCF8FO1t8dTC6KlB0UQeZI/FDJgF2ShjexaGX1nByhdY - RsPTKjRNV4Gq4HhDOEEcNkWuPli8jTK3AkpnDrOSHsy9mwE9ko2h5f4g/G3tKxqeXIVmJA9dnhaQ2i2r - IZwg4u9Tq90L7dC6aJS5lPjw+X0QevvpdXBkYcNUBeTWNKht59DtaQZZujGgnfLemqlB4+w1qEbF0E+U - IPDlYxBe+74Gw+RlSCzJUDABde5yNDr1oFQbthDTSmrEPQkwLd5FyYgYclsmyscKMf9mFg1TlTjflwSp - OQUqSzpML9px3BgHspj78xAFTWQ4ezV6uwIPvR0oHjwN5UA66P5UyMysWTgNvfNt0PbngaQ5KyS94RpZ - RVXzRNsu8QI6mwRmJqTerYd6MAcXB8SoZ7ZgYmC1JQf8XG6AlP/ykNa1vZInorRhvhPN8Wh06dH5zIjO - GSMMTh0S6mIRVhDmI6V/gNfF1/EjSA1XTZVyvKSS6ydprp+SMDXNVfMl/L9/pn8XQfwAgLWxKqsRqNwA - AAAASUVORK5CYII= + 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== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKsSURBVDhPrZPbS5NxHMbfv6GrubX3LQ0vMi+KUVQK6UVE - SbgGHtI0c5mHtr07qCltM4bNtEgD52FJimiWpZabcyZT52w6p5SJy6aEmLvpQLVhdLCn9x2TNCoIeuDh - 9734fp7fmfjvypiMizg1dlCdYt/vPWba7T9qivYLrVFeoWWnOrFvR0So7ffKdMaKkux7fSp7Klo9BnQt - tAXdMleLfGsi4jso36EOUhRq36xMxwGRcFgQqJ7WwrLUjabnN6CbLg6arc1LXagav4A9Bn5g303e5pCT - ozHhIptghYXZxlK3BEWufCjGc6FiXMi4ZKIAppf3cMVRhF0Gzkq0gQwP4QSRahNo6KHk4MwszIK08yyk - Y9mQOs5A7siGbbkPGqcMZiYk484RRF7fqgnhBCF8FO1t8dTC6KlB0UQeZI/FDJgF2ShjexaGX1nByhdY - RsPTKjRNV4Gq4HhDOEEcNkWuPli8jTK3AkpnDrOSHsy9mwE9ko2h5f4g/G3tKxqeXIVmJA9dnhaQ2i2r - IZwg4u9Tq90L7dC6aJS5lPjw+X0QevvpdXBkYcNUBeTWNKht59DtaQZZujGgnfLemqlB4+w1qEbF0E+U - IPDlYxBe+74Gw+RlSCzJUDABde5yNDr1oFQbthDTSmrEPQkwLd5FyYgYclsmyscKMf9mFg1TlTjflwSp - OQUqSzpML9px3BgHspj78xAFTWQ4ezV6uwIPvR0oHjwN5UA66P5UyMysWTgNvfNt0PbngaQ5KyS94RpZ - RVXzRNsu8QI6mwRmJqTerYd6MAcXB8SoZ7ZgYmC1JQf8XG6AlP/ykNa1vZInorRhvhPN8Wh06dH5zIjO - GSMMTh0S6mIRVhDmI6V/gNfF1/EjSA1XTZVyvKSS6ydprp+SMDXNVfMl/L9/pn8XQfwAgLWxKqsRqNwA - AAAASUVORK5CYII= + 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== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKsSURBVDhPrZPbS5NxHMbfv6GrubX3LQ0vMi+KUVQK6UVE - SbgGHtI0c5mHtr07qCltM4bNtEgD52FJimiWpZabcyZT52w6p5SJy6aEmLvpQLVhdLCn9x2TNCoIeuDh - 9734fp7fmfjvypiMizg1dlCdYt/vPWba7T9qivYLrVFeoWWnOrFvR0So7ffKdMaKkux7fSp7Klo9BnQt - tAXdMleLfGsi4jso36EOUhRq36xMxwGRcFgQqJ7WwrLUjabnN6CbLg6arc1LXagav4A9Bn5g303e5pCT - ozHhIptghYXZxlK3BEWufCjGc6FiXMi4ZKIAppf3cMVRhF0Gzkq0gQwP4QSRahNo6KHk4MwszIK08yyk - Y9mQOs5A7siGbbkPGqcMZiYk484RRF7fqgnhBCF8FO1t8dTC6KlB0UQeZI/FDJgF2ShjexaGX1nByhdY - RsPTKjRNV4Gq4HhDOEEcNkWuPli8jTK3AkpnDrOSHsy9mwE9ko2h5f4g/G3tKxqeXIVmJA9dnhaQ2i2r - IZwg4u9Tq90L7dC6aJS5lPjw+X0QevvpdXBkYcNUBeTWNKht59DtaQZZujGgnfLemqlB4+w1qEbF0E+U - IPDlYxBe+74Gw+RlSCzJUDABde5yNDr1oFQbthDTSmrEPQkwLd5FyYgYclsmyscKMf9mFg1TlTjflwSp - OQUqSzpML9px3BgHspj78xAFTWQ4ezV6uwIPvR0oHjwN5UA66P5UyMysWTgNvfNt0PbngaQ5KyS94RpZ - RVXzRNsu8QI6mwRmJqTerYd6MAcXB8SoZ7ZgYmC1JQf8XG6AlP/ykNa1vZInorRhvhPN8Wh06dH5zIjO - GSMMTh0S6mIRVhDmI6V/gNfF1/EjSA1XTZVyvKSS6ydprp+SMDXNVfMl/L9/pn8XQfwAgLWxKqsRqNwA - AAAASUVORK5CYII= + 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== @@ -382,6 +382,16 @@ GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADuSURBVDhPY6AK+E8mgGqHGPB5/rz/X6ZP//+pq/P/5+pq + CM7N/f85Ofn/58jI/58DA/9HmknCMYYBIM1/X736//vBg/9/nj79//Py5f8/z50DGwzDJ4K8/28sc8Vu + AMhmkGawjbGxEFuhNoOxjw/cgARrGUwDQE4G2YqiOTQUxYDZriZ4DAD69+umTTg1EzYA5HSQX9E1YzEA + axiAnA4KSGwa0Q0IMZbAYgDQVlBAvgZ6BRfu1pfFbcBLU9P/95WV/9+Qlv5/ko8PjnewscExyOk4DSAG + 4DSAGEBVAzBigRgAMwCGyTIAHTAwMDAAABYIANCNo26UAAAAAElFTkSuQmCC @@ -390,7 +400,13 @@ 561, 17 + + 883, 17 + 647, 17 + + 883, 17 + \ No newline at end of file