From 97407e07b45ed9b0c8862988125d961d71715413 Mon Sep 17 00:00:00 2001 From: Chikyun Date: Sat, 2 Mar 2019 18:43:17 +0900 Subject: [PATCH] =?UTF-8?q?DB=EC=A0=91=EC=86=8D=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EC=8B=9C=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Dialog/fLogin.cs | 46 +- Project/History.txt | 4 +- Project/Properties/AssemblyInfo.cs | 4 +- Project/_Common/fADSUserList.cs | 192 ++- SubProject/FEQ0000/Purchase/fPurchase.cs | 3 +- SubProject/FPJ0000/FPJ0000.csproj | 18 + SubProject/FPJ0000/dsPRJ.Designer.cs | 1660 +++++++++++++++++-- SubProject/FPJ0000/dsPRJ.xsd | 175 +- SubProject/FPJ0000/dsPRJ.xss | 14 +- SubProject/FPJ0000/fProjectList.Designer.cs | 731 +++++--- SubProject/FPJ0000/fProjectList.cs | 64 +- SubProject/FPJ0000/fProjectList.resx | 224 +-- 12 files changed, 2500 insertions(+), 635 deletions(-) diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index c8c999f..4f1b6aa 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -50,28 +50,36 @@ namespace Project.Dialog var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); var ta = new dsMSSQLTableAdapters.UsersTableAdapter(); - var users = ta.GetIDPW(encpass, tbID.Text.Trim()); - if(users.Rows.Count < 1) + try { - Util.MsgE("No user"); - tbPW.SelectAll(); - tbPW.Focus(); - return; - } - else + var users = ta.GetIDPW(encpass, tbID.Text.Trim()); + if (users.Rows.Count < 1) + { + Util.MsgE("No user"); + tbPW.SelectAll(); + tbPW.Focus(); + return; + } + else + { + var userdr = users.Rows[0] as dsMSSQL.UsersRow; + FCOMMON.info.Login.no = userdr.id; + FCOMMON.info.Login.nameK = userdr.name; + FCOMMON.info.Login.dept = userdr.dept; + FCOMMON.info.Login.level = userdr.level; + FCOMMON.info.Login.email = userdr.email; + FCOMMON.info.Login.nameE = userdr.nameE; + FCOMMON.info.Login.hp = userdr.hp; + FCOMMON.info.Login.tel = userdr.tel; + FCOMMON.info.Login.title = userdr.ads_title; + } + DialogResult = DialogResult.OK; + }catch (Exception ex) { - var userdr = users.Rows[0] as dsMSSQL.UsersRow ; - FCOMMON.info.Login.no = userdr.id; - FCOMMON.info.Login.nameK = userdr.name; - FCOMMON.info.Login.dept = userdr.dept; - FCOMMON.info.Login.level = userdr.level; - FCOMMON.info.Login.email = userdr.email; - FCOMMON.info.Login.nameE = userdr.nameE; - FCOMMON.info.Login.hp = userdr.hp; - FCOMMON.info.Login.tel = userdr.tel; - FCOMMON.info.Login.title = userdr.ads_title; + Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n"+ ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요"); + DialogResult = System.Windows.Forms.DialogResult.Cancel; } - DialogResult = DialogResult.OK; + } diff --git a/Project/History.txt b/Project/History.txt index 43c961e..c8e34b9 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,6 @@ -190125 chi 프로젝트 메일 관련 기능 준비중 +190208 chi AD계정 path 수정 (office 그룹이 추가됨) +190131 chi 클립보드 복사 메세지 제거 +190125 chi 프로젝트 메일 관련 기능 준비중 190115 chi 프로젝트 목록 색상 및 정렬 방식 변경 - 필터 적용 190110 chi NR구매 화면 모델 -> 규격명칭 변경 장비기술 공정이 공용코드 09번에 연결됨 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index e9e7cfc..ffb46a7 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.01.25.1300")] -[assembly: AssemblyFileVersion("19.01.25.1300")] +[assembly: AssemblyVersion("19.02.12.1300")] +[assembly: AssemblyFileVersion("19.02.12.1300")] diff --git a/Project/_Common/fADSUserList.cs b/Project/_Common/fADSUserList.cs index 38ce762..2a227a4 100644 --- a/Project/_Common/fADSUserList.cs +++ b/Project/_Common/fADSUserList.cs @@ -24,6 +24,7 @@ namespace Project._Common { this.lbDomain.Text = this.DomainName(); this.btInsert.Visible = (FCOMMON.info.Login.level > 9); + this.tbEntry.Text = "LDAP://OU=Office,OU=Users,OU=People,OU=K4,DC=kr,DC=ds,DC=amkor,DC=com"; this.tbEntry.Enabled = this.btInsert.Visible; } public string DomainName() @@ -50,65 +51,144 @@ namespace Project._Common this.listView1.Visible = false; this.listView1.View = View.Details; + + string[] propliest = new string[] { "whenCreated", "telephonenumber", "title", "employeeNumber", "department", "displayName", "mail", "pager", "sn", "cn" }; + + Boolean skipuser = false; + string dept = string.Empty; + string whencre = string.Empty; + string empno = string.Empty; + string disp = string.Empty; + string cn = string.Empty; + string sn = string.Empty; + string mail = string.Empty; + string title = string.Empty; + string pager = string.Empty; + string tel = string.Empty; + var deParent = new DirectoryEntry(tbEntry.Text); - foreach (DirectoryEntry deChild in deParent.Children) + + string Nodename = ""; + try { - Boolean skipuser = false; - string dept = string.Empty; - string whencre = string.Empty; - string empno = string.Empty; - string disp = string.Empty; - string cn = string.Empty; - string sn = string.Empty; - string mail = string.Empty; - string title = string.Empty; - string pager = string.Empty; - string tel = string.Empty; - string[] propliest = new string[] { "whenCreated", "telephonenumber","title", "employeeNumber", "department", "displayName", "mail", "pager", "sn", "cn" }; - foreach (string listIter in propliest) - { - foreach (object Iter in deChild.Properties[listIter.ToString()]) - { - string strvalue = Iter.ToString(); - switch (listIter.ToString().ToLower()) - { - case "department": - dept = strvalue; - var search = toolStripTextBox1.Text.Trim(); - if(search != "") if (dept.IndexOf(search) == -1) skipuser = true; - break; - case "whencreated": whencre = strvalue; break; - case "title": title = strvalue; break; - case "telephonenumber": tel = strvalue; break; - case "employeenumber": empno = strvalue; break; - case "displayname": disp = strvalue; break; - case "mail": mail = strvalue; break; - case "pager": pager = strvalue; break; - case "sn": sn = strvalue; break; - case "cn": cn = strvalue; break; - } - if (skipuser) break; - } - if (skipuser) break; - } - - if (sn == "" || pager == "" || sn.ToUpper().StartsWith("k4") || sn.ToUpper().StartsWith("test")) skipuser = true; - if (skipuser) continue; - var lv = this.listView1.Items.Add(sn); - lv.Checked = true; - lv.SubItems.Add(cn); - lv.SubItems.Add(disp); - lv.SubItems.Add(dept); - lv.SubItems.Add(title); - lv.SubItems.Add(tel); - lv.SubItems.Add(mail); - lv.SubItems.Add(pager); - lv.SubItems.Add(empno); - lv.SubItems.Add(whencre); - - - if (listView1.Items.Count > 500) break; + Nodename = deParent.SchemaClassName; + } catch (Exception ex) + { + Util.MsgE(ex.Message + "\n" + tbEntry.Text); + Nodename = string.Empty; } + if (Nodename != "") + { + if (deParent.Name.StartsWith("CN")) + { + //특정사용자 조회 + + foreach (string listIter in propliest) + { + foreach (object Iter in deParent.Properties[listIter.ToString()]) + { + string strvalue = Iter.ToString(); + switch (listIter.ToString().ToLower()) + { + case "department": + dept = strvalue; + // var search = toolStripTextBox1.Text.Trim(); + // if (search != "") if (dept.IndexOf(search) == -1) skipuser = true; + break; + case "whencreated": whencre = strvalue; break; + case "title": title = strvalue; break; + case "telephonenumber": tel = strvalue; break; + case "employeenumber": empno = strvalue; break; + case "displayname": disp = strvalue; break; + case "mail": mail = strvalue; break; + case "pager": pager = strvalue; break; + case "sn": sn = strvalue; break; + case "cn": cn = strvalue; break; + } + // if (skipuser) break; + } + // if (skipuser) break; + } + + + var lv = this.listView1.Items.Add(sn); + lv.Checked = true; + lv.SubItems.Add(cn); + lv.SubItems.Add(disp); + lv.SubItems.Add(dept); + lv.SubItems.Add(title); + lv.SubItems.Add(tel); + lv.SubItems.Add(mail); + lv.SubItems.Add(pager); + lv.SubItems.Add(empno); + lv.SubItems.Add(whencre); + + + } + else + { + foreach (DirectoryEntry deChild in deParent.Children) + { + skipuser = false; + dept = string.Empty; + whencre = string.Empty; + empno = string.Empty; + disp = string.Empty; + cn = string.Empty; + sn = string.Empty; + mail = string.Empty; + title = string.Empty; + pager = string.Empty; + tel = string.Empty; + + foreach (string listIter in propliest) + { + foreach (object Iter in deChild.Properties[listIter.ToString()]) + { + string strvalue = Iter.ToString(); + switch (listIter.ToString().ToLower()) + { + case "department": + dept = strvalue; + var search = toolStripTextBox1.Text.Trim(); + if (search != "") if (dept.IndexOf(search) == -1) skipuser = true; + break; + case "whencreated": whencre = strvalue; break; + case "title": title = strvalue; break; + case "telephonenumber": tel = strvalue; break; + case "employeenumber": empno = strvalue; break; + case "displayname": disp = strvalue; break; + case "mail": mail = strvalue; break; + case "pager": pager = strvalue; break; + case "sn": sn = strvalue; break; + case "cn": cn = strvalue; break; + } + if (skipuser) break; + } + if (skipuser) break; + } + + if (sn == "" || pager == "" || sn.ToUpper().StartsWith("k4") || sn.ToUpper().StartsWith("test")) skipuser = true; + if (skipuser) continue; + var lv = this.listView1.Items.Add(sn); + lv.Checked = true; + lv.SubItems.Add(cn); + lv.SubItems.Add(disp); + lv.SubItems.Add(dept); + lv.SubItems.Add(title); + lv.SubItems.Add(tel); + lv.SubItems.Add(mail); + lv.SubItems.Add(pager); + lv.SubItems.Add(empno); + lv.SubItems.Add(whencre); + + + if (listView1.Items.Count > 500) break; + } + } + } + + FCOMMON.Util.MsgI("exit"); this.listView1.Visible = true; } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index b80fba5..13f1b06 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -122,6 +122,7 @@ namespace FEQ0000 private void refreshData() { + try { string state = "%"; @@ -708,7 +709,7 @@ namespace FEQ0000 var dr = drv.Row as dsPurchase.PurchaseRow; string buffer = string.Format("{0}_{1}_{2}_{3}_{4}", dr.pumname.Replace("_", "-"), dr.pumscale.Replace("_", "-"), dr.dept.Replace("_", "-"), dr.manuproc.Replace("_", "-"), dr.asset.Replace("_", "-")); Clipboard.SetText(buffer); - FCOMMON.Util.MsgI("다음 데이터가 클립보드에 저장됨\n\n" + buffer); + //FCOMMON.Util.MsgI("다음 데이터가 클립보드에 저장됨\n\n" + buffer); 190131 } private void fdsaToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 5c650d5..2b74baa 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -85,6 +85,18 @@ fPartList.cs + + Form + + + fProejctHistory.cs + + + Form + + + fProjectData.cs + Form @@ -137,6 +149,12 @@ fPartList.cs + + fProejctHistory.cs + + + fProjectData.cs + fProjectIOMap.cs diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 082db29..ba9c953 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -36,6 +36,8 @@ namespace FPJ0000 { private ProjectsMailListDataTable tableProjectsMailList; + private ProjectsHistoryDataTable tableProjectsHistory; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -47,6 +49,7 @@ namespace FPJ0000 { base.Tables.CollectionChanged += schemaChangedHandler; base.Relations.CollectionChanged += schemaChangedHandler; this.EndInit(); + this.InitExpressions(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -58,6 +61,9 @@ namespace FPJ0000 { global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); this.Tables.CollectionChanged += schemaChangedHandler1; this.Relations.CollectionChanged += schemaChangedHandler1; + if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.ExcludeSchema)) { + this.InitExpressions(); + } return; } string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string)))); @@ -82,6 +88,9 @@ namespace FPJ0000 { if ((ds.Tables["ProjectsMailList"] != null)) { base.Tables.Add(new ProjectsMailListDataTable(ds.Tables["ProjectsMailList"])); } + if ((ds.Tables["ProjectsHistory"] != null)) { + base.Tables.Add(new ProjectsHistoryDataTable(ds.Tables["ProjectsHistory"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -93,6 +102,7 @@ namespace FPJ0000 { } else { this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); + this.InitExpressions(); } this.GetSerializationData(info, context); global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); @@ -160,6 +170,16 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public ProjectsHistoryDataTable ProjectsHistory { + get { + return this.tableProjectsHistory; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -204,6 +224,7 @@ namespace FPJ0000 { public override global::System.Data.DataSet Clone() { dsPRJ cln = ((dsPRJ)(base.Clone())); cln.InitVars(); + cln.InitExpressions(); cln.SchemaSerializationMode = this.SchemaSerializationMode; return cln; } @@ -245,6 +266,9 @@ namespace FPJ0000 { if ((ds.Tables["ProjectsMailList"] != null)) { base.Tables.Add(new ProjectsMailListDataTable(ds.Tables["ProjectsMailList"])); } + if ((ds.Tables["ProjectsHistory"] != null)) { + base.Tables.Add(new ProjectsHistoryDataTable(ds.Tables["ProjectsHistory"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -314,6 +338,12 @@ namespace FPJ0000 { this.tableProjectsMailList.InitVars(); } } + this.tableProjectsHistory = ((ProjectsHistoryDataTable)(base.Tables["ProjectsHistory"])); + if ((initTable == true)) { + if ((this.tableProjectsHistory != null)) { + this.tableProjectsHistory.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -324,7 +354,7 @@ namespace FPJ0000 { this.Namespace = "http://tempuri.org/dsPRJ.xsd"; this.EnforceConstraints = true; this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; - this.tableProjects = new ProjectsDataTable(); + this.tableProjects = new ProjectsDataTable(false); base.Tables.Add(this.tableProjects); this.tableProjectsPart = new ProjectsPartDataTable(); base.Tables.Add(this.tableProjectsPart); @@ -336,6 +366,8 @@ namespace FPJ0000 { base.Tables.Add(this.tableProjectsIOMap); this.tableProjectsMailList = new ProjectsMailListDataTable(); base.Tables.Add(this.tableProjectsMailList); + this.tableProjectsHistory = new ProjectsHistoryDataTable(); + base.Tables.Add(this.tableProjectsHistory); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -374,6 +406,12 @@ namespace FPJ0000 { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private bool ShouldSerializeProjectsHistory() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -429,6 +467,12 @@ namespace FPJ0000 { return type; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitExpressions() { + this.Projects.costeColumn.Expression = "costo-costn"; + } + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public delegate void ProjectsRowChangeEventHandler(object sender, ProjectsRowChangeEvent e); @@ -447,6 +491,9 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public delegate void ProjectsMailListRowChangeEventHandler(object sender, ProjectsMailListRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public delegate void ProjectsHistoryRowChangeEventHandler(object sender, ProjectsHistoryRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -496,6 +543,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columncostn; + private global::System.Data.DataColumn columncoste; + private global::System.Data.DataColumn columncnt; private global::System.Data.DataColumn columnremark_req; @@ -508,12 +557,23 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnimport; + private global::System.Data.DataColumn columnasset; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ProjectsDataTable() { + public ProjectsDataTable() : + this(false) { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsDataTable(bool initExpressions) { this.TableName = "Projects"; this.BeginInit(); this.InitClass(); + if ((initExpressions == true)) { + this.InitExpressions(); + } this.EndInit(); } @@ -709,6 +769,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 costeColumn { + get { + return this.columncoste; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn cntColumn { @@ -757,6 +825,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 assetColumn { + get { + return this.columnasset; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -815,12 +891,14 @@ namespace FPJ0000 { string process, double costo, double costn, + double coste, int cnt, string remark_req, string remark_ans, string ddate, int progress, - bool import) { + bool import, + string asset) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -844,12 +922,80 @@ namespace FPJ0000 { process, costo, costn, + coste, cnt, remark_req, remark_ans, ddate, progress, - import}; + import, + asset}; + rowProjectsRow.ItemArray = columnValuesArray; + this.Rows.Add(rowProjectsRow); + return rowProjectsRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsRow AddProjectsRow( + string name, + string pdate, + string reqstaff, + string sdate, + string edate, + string odate, + string memo, + string wuid, + System.DateTime wdate, + string status, + string usermain, + string usersub, + int rev, + int pidx, + string userManager, + int level, + string part, + string process, + double costo, + double costn, + int cnt, + string remark_req, + string remark_ans, + string ddate, + int progress, + bool import, + string asset) { + ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + null, + name, + pdate, + reqstaff, + sdate, + edate, + odate, + memo, + wuid, + wdate, + status, + usermain, + usersub, + rev, + pidx, + userManager, + level, + part, + process, + costo, + costn, + null, + cnt, + remark_req, + remark_ans, + ddate, + progress, + import, + asset}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -900,12 +1046,14 @@ namespace FPJ0000 { this.columnprocess = base.Columns["process"]; this.columncosto = base.Columns["costo"]; this.columncostn = base.Columns["costn"]; + this.columncoste = base.Columns["coste"]; this.columncnt = base.Columns["cnt"]; this.columnremark_req = base.Columns["remark_req"]; this.columnremark_ans = base.Columns["remark_ans"]; this.columnddate = base.Columns["ddate"]; this.columnprogress = base.Columns["progress"]; this.columnimport = base.Columns["import"]; + this.columnasset = base.Columns["asset"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -953,6 +1101,8 @@ namespace FPJ0000 { base.Columns.Add(this.columncosto); this.columncostn = new global::System.Data.DataColumn("costn", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columncostn); + this.columncoste = new global::System.Data.DataColumn("coste", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columncoste); this.columncnt = new global::System.Data.DataColumn("cnt", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columncnt); this.columnremark_req = new global::System.Data.DataColumn("remark_req", typeof(string), null, global::System.Data.MappingType.Element); @@ -965,6 +1115,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnprogress); this.columnimport = new global::System.Data.DataColumn("import", typeof(bool), null, global::System.Data.MappingType.Element); 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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -989,9 +1141,11 @@ namespace FPJ0000 { this.columnuserManager.MaxLength = 50; this.columnpart.MaxLength = 50; this.columnprocess.MaxLength = 50; + this.columncoste.ReadOnly = true; this.columnremark_req.MaxLength = 2147483647; this.columnremark_ans.MaxLength = 2147483647; this.columnddate.MaxLength = 50; + this.columnasset.MaxLength = 100; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1012,6 +1166,12 @@ namespace FPJ0000 { return typeof(ProjectsRow); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitExpressions() { + this.costeColumn.Expression = "costo-costn"; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { @@ -3171,6 +3331,373 @@ namespace FPJ0000 { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class ProjectsHistoryDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnidx; + + private global::System.Data.DataColumn columnpidx; + + private global::System.Data.DataColumn columnpdate; + + private global::System.Data.DataColumn columndiv; + + private global::System.Data.DataColumn columnremark; + + private global::System.Data.DataColumn columnwuid; + + private global::System.Data.DataColumn columnwdate; + + private global::System.Data.DataColumn columnmailsend; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryDataTable() { + this.TableName = "ProjectsHistory"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal ProjectsHistoryDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected ProjectsHistoryDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn idxColumn { + get { + return this.columnidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn pidxColumn { + get { + return this.columnpidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn pdateColumn { + get { + return this.columnpdate; + } + } + + [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")] + public global::System.Data.DataColumn remarkColumn { + get { + return this.columnremark; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn wuidColumn { + get { + return this.columnwuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn wdateColumn { + get { + return this.columnwdate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn mailsendColumn { + get { + return this.columnmailsend; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryRow this[int index] { + get { + return ((ProjectsHistoryRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event ProjectsHistoryRowChangeEventHandler ProjectsHistoryRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event ProjectsHistoryRowChangeEventHandler ProjectsHistoryRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event ProjectsHistoryRowChangeEventHandler ProjectsHistoryRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event ProjectsHistoryRowChangeEventHandler ProjectsHistoryRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void AddProjectsHistoryRow(ProjectsHistoryRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryRow AddProjectsHistoryRow(int pidx, string pdate, string div, string remark, string wuid, System.DateTime wdate, bool mailsend) { + ProjectsHistoryRow rowProjectsHistoryRow = ((ProjectsHistoryRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + null, + pidx, + pdate, + div, + remark, + wuid, + wdate, + mailsend}; + rowProjectsHistoryRow.ItemArray = columnValuesArray; + this.Rows.Add(rowProjectsHistoryRow); + return rowProjectsHistoryRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryRow FindByidx(int idx) { + return ((ProjectsHistoryRow)(this.Rows.Find(new object[] { + idx}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public override global::System.Data.DataTable Clone() { + ProjectsHistoryDataTable cln = ((ProjectsHistoryDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new ProjectsHistoryDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal void InitVars() { + this.columnidx = base.Columns["idx"]; + this.columnpidx = base.Columns["pidx"]; + this.columnpdate = base.Columns["pdate"]; + this.columndiv = base.Columns["div"]; + this.columnremark = base.Columns["remark"]; + this.columnwuid = base.Columns["wuid"]; + this.columnwdate = base.Columns["wdate"]; + this.columnmailsend = base.Columns["mailsend"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitClass() { + this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidx); + this.columnpidx = new global::System.Data.DataColumn("pidx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpidx); + this.columnpdate = new global::System.Data.DataColumn("pdate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpdate); + this.columndiv = new global::System.Data.DataColumn("div", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndiv); + this.columnremark = new global::System.Data.DataColumn("remark", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnremark); + this.columnwuid = new global::System.Data.DataColumn("wuid", typeof(string), null, global::System.Data.MappingType.Element); + 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.columnmailsend = new global::System.Data.DataColumn("mailsend", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnmailsend); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnidx}, true)); + this.columnidx.AutoIncrement = true; + this.columnidx.AutoIncrementSeed = -1; + this.columnidx.AutoIncrementStep = -1; + this.columnidx.AllowDBNull = false; + this.columnidx.ReadOnly = true; + this.columnidx.Unique = true; + this.columnpidx.AllowDBNull = false; + this.columnpdate.MaxLength = 10; + this.columndiv.MaxLength = 10; + this.columnremark.MaxLength = 2147483647; + this.columnwuid.AllowDBNull = false; + this.columnwuid.MaxLength = 20; + this.columnwdate.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryRow NewProjectsHistoryRow() { + return ((ProjectsHistoryRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new ProjectsHistoryRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(ProjectsHistoryRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.ProjectsHistoryRowChanged != null)) { + this.ProjectsHistoryRowChanged(this, new ProjectsHistoryRowChangeEvent(((ProjectsHistoryRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.ProjectsHistoryRowChanging != null)) { + this.ProjectsHistoryRowChanging(this, new ProjectsHistoryRowChangeEvent(((ProjectsHistoryRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.ProjectsHistoryRowDeleted != null)) { + this.ProjectsHistoryRowDeleted(this, new ProjectsHistoryRowChangeEvent(((ProjectsHistoryRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.ProjectsHistoryRowDeleting != null)) { + this.ProjectsHistoryRowDeleting(this, new ProjectsHistoryRowChangeEvent(((ProjectsHistoryRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void RemoveProjectsHistoryRow(ProjectsHistoryRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsPRJ ds = new dsPRJ(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "ProjectsHistoryDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -3478,11 +4005,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public double costo { get { - try { - return ((double)(this[this.tableProjects.costoColumn])); + if (this.IscostoNull()) { + return 0D; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'costo\' 열의 값이 DBNull입니다.", e); + else { + return ((double)(this[this.tableProjects.costoColumn])); } } set { @@ -3494,11 +4021,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public double costn { get { - try { - return ((double)(this[this.tableProjects.costnColumn])); + if (this.IscostnNull()) { + return 0D; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'costn\' 열의 값이 DBNull입니다.", e); + else { + return ((double)(this[this.tableProjects.costnColumn])); } } set { @@ -3506,15 +4033,31 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double coste { + get { + if (this.IscosteNull()) { + return 0D; + } + else { + return ((double)(this[this.tableProjects.costeColumn])); + } + } + set { + this[this.tableProjects.costeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public int cnt { get { - try { - return ((int)(this[this.tableProjects.cntColumn])); + if (this.IscntNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'cnt\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableProjects.cntColumn])); } } set { @@ -3602,6 +4145,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string asset { + get { + if (this.IsassetNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.assetColumn])); + } + } + set { + this[this.tableProjects.assetColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -3818,6 +4377,18 @@ namespace FPJ0000 { this[this.tableProjects.costnColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IscosteNull() { + return this.IsNull(this.tableProjects.costeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetcosteNull() { + this[this.tableProjects.costeColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IscntNull() { @@ -3889,6 +4460,18 @@ namespace FPJ0000 { public void SetimportNull() { this[this.tableProjects.importColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsassetNull() { + return this.IsNull(this.tableProjects.assetColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetassetNull() { + this[this.tableProjects.assetColumn] = global::System.Convert.DBNull; + } } /// @@ -5251,6 +5834,177 @@ namespace FPJ0000 { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class ProjectsHistoryRow : global::System.Data.DataRow { + + private ProjectsHistoryDataTable tableProjectsHistory; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal ProjectsHistoryRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableProjectsHistory = ((ProjectsHistoryDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int idx { + get { + return ((int)(this[this.tableProjectsHistory.idxColumn])); + } + set { + this[this.tableProjectsHistory.idxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int pidx { + get { + return ((int)(this[this.tableProjectsHistory.pidxColumn])); + } + set { + this[this.tableProjectsHistory.pidxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string pdate { + get { + try { + return ((string)(this[this.tableProjectsHistory.pdateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'ProjectsHistory\' 테이블의 \'pdate\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjectsHistory.pdateColumn] = value; + } + } + + [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.tableProjectsHistory.divColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'ProjectsHistory\' 테이블의 \'div\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjectsHistory.divColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string remark { + get { + try { + return ((string)(this[this.tableProjectsHistory.remarkColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'ProjectsHistory\' 테이블의 \'remark\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjectsHistory.remarkColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string wuid { + get { + return ((string)(this[this.tableProjectsHistory.wuidColumn])); + } + set { + this[this.tableProjectsHistory.wuidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public System.DateTime wdate { + get { + return ((global::System.DateTime)(this[this.tableProjectsHistory.wdateColumn])); + } + set { + this[this.tableProjectsHistory.wdateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool mailsend { + get { + if (this.IsmailsendNull()) { + return false; + } + else { + return ((bool)(this[this.tableProjectsHistory.mailsendColumn])); + } + } + set { + this[this.tableProjectsHistory.mailsendColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IspdateNull() { + return this.IsNull(this.tableProjectsHistory.pdateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetpdateNull() { + this[this.tableProjectsHistory.pdateColumn] = 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.tableProjectsHistory.divColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetdivNull() { + this[this.tableProjectsHistory.divColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsremarkNull() { + return this.IsNull(this.tableProjectsHistory.remarkColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetremarkNull() { + this[this.tableProjectsHistory.remarkColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsmailsendNull() { + return this.IsNull(this.tableProjectsHistory.mailsendColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetmailsendNull() { + this[this.tableProjectsHistory.mailsendColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -5454,6 +6208,40 @@ namespace FPJ0000 { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public class ProjectsHistoryRowChangeEvent : global::System.EventArgs { + + private ProjectsHistoryRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryRowChangeEvent(ProjectsHistoryRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace FPJ0000.dsPRJTableAdapters { @@ -5607,6 +6395,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("ddate", "ddate"); tableMapping.ColumnMappings.Add("progress", "progress"); tableMapping.ColumnMappings.Add("import", "import"); + tableMapping.ColumnMappings.Add("asset", "asset"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -5633,7 +6422,8 @@ namespace FPJ0000.dsPRJTableAdapters { "riginal_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Origin" + "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)))"; + "= @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = " + + "@Original_asset)))"; 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, "", "", "")); @@ -5682,10 +6472,12 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); 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.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]) 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); -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 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]) 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.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, "", "", "")); @@ -5713,6 +6505,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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.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" + @@ -5721,36 +6514,37 @@ 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 WHERE (([idx] = @Original_id" + - "x) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_statu" + - "s)) 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_us" + - "ersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Ori" + - "ginal_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Ori" + - "ginal_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Origin" + - "al_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_par" + - "t = 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 [progres" + - "s] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [" + - "import] IS NULL) OR ([import] = @Original_import)));\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 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHE" + - "N [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 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)"; 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, "", "", "")); @@ -5778,6 +6572,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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("@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, "", "", "")); @@ -5825,6 +6620,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -5842,7 +6639,7 @@ 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 + progress, import, asset FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -5858,10 +6655,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 cnt, costn, costo, ddate, edate, idx, import, level, memo, name, odate, pa" + - "rt, 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, 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].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, "", "", "")); } @@ -5909,7 +6706,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(username)); } - dsPRJ.ProjectsDataTable dataTable = new dsPRJ.ProjectsDataTable(); + dsPRJ.ProjectsDataTable dataTable = new dsPRJ.ProjectsDataTable(true); this.Adapter.Fill(dataTable); return dataTable; } @@ -5935,7 +6732,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN public virtual dsPRJ.ProjectsDataTable GetbyIDX(int idx) { this.Adapter.SelectCommand = this.CommandCollection[2]; this.Adapter.SelectCommand.Parameters[0].Value = ((int)(idx)); - dsPRJ.ProjectsDataTable dataTable = new dsPRJ.ProjectsDataTable(); + dsPRJ.ProjectsDataTable dataTable = new dsPRJ.ProjectsDataTable(true); this.Adapter.Fill(dataTable); return dataTable; } @@ -5998,7 +6795,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN global::System.Nullable Original_cnt, string Original_ddate, global::System.Nullable Original_progress, - global::System.Nullable Original_import) { + global::System.Nullable Original_import, + string Original_asset) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_status == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -6183,6 +6981,14 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[46].Value = global::System.DBNull.Value; } + if ((Original_asset == null)) { + this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[48].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[48].Value = ((string)(Original_asset)); + } 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)) { @@ -6229,7 +7035,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN string remark_ans, string ddate, global::System.Nullable progress, - global::System.Nullable import) { + global::System.Nullable import, + string asset) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -6381,6 +7188,12 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN else { this.Adapter.InsertCommand.Parameters[25].Value = global::System.DBNull.Value; } + if ((asset == null)) { + this.Adapter.InsertCommand.Parameters[26].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[26].Value = ((string)(asset)); + } 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)) { @@ -6428,6 +7241,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN string ddate, global::System.Nullable progress, global::System.Nullable import, + string asset, int Original_idx, string Original_status, string Original_pdate, @@ -6453,6 +7267,7 @@ 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, int idx) { if ((status == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -6605,191 +7420,205 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN else { this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_idx)); - if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + if ((asset == null)) { + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_status)); + 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; + } + else { + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_status)); } if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_pdate)); } if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_name)); } if ((Original_usermain == null)) { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_usermain)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_usermain)); } if ((Original_usersub == null)) { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_usersub)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_usersub)); } if ((Original_reqstaff == null)) { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_reqstaff)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_reqstaff)); } if ((Original_sdate == null)) { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_sdate)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_sdate)); } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_edate)); } if ((Original_odate == null)) { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_odate)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_odate)); } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[48].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((System.DateTime)(Original_wdate)); if ((Original_rev.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[50].Value = ((int)(Original_rev.Value)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((int)(Original_rev.Value)); } else { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; + 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[51].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[52].Value = ((int)(Original_pidx.Value)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_pidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } if ((Original_userManager == null)) { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_userManager)); + 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[55].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_level.Value)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_level.Value)); } else { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } if ((Original_part == null)) { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_part)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_part)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_process)); } if ((Original_costo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[62].Value = ((double)(Original_costo.Value)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((double)(Original_costo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } if ((Original_costn.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[64].Value = ((double)(Original_costn.Value)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((double)(Original_costn.Value)); } else { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } if ((Original_cnt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[66].Value = ((int)(Original_cnt.Value)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_cnt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } if ((Original_ddate == null)) { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_ddate)); + 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[69].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[70].Value = ((int)(Original_progress.Value)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((int)(Original_progress.Value)); } else { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[72].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(idx)); + if ((Original_asset == null)) { + 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)); + } + this.Adapter.UpdateCommand.Parameters[76].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)) { @@ -6837,6 +7666,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN string ddate, global::System.Nullable progress, global::System.Nullable import, + string asset, int Original_idx, string Original_status, string Original_pdate, @@ -6861,8 +7691,9 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN global::System.Nullable Original_cnt, string Original_ddate, global::System.Nullable Original_progress, - global::System.Nullable Original_import) { - 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, 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_idx); + 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); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10131,6 +10962,464 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class ProjectsHistoryTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ProjectsHistoryTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "ProjectsHistory"; + tableMapping.ColumnMappings.Add("idx", "idx"); + tableMapping.ColumnMappings.Add("pidx", "pidx"); + tableMapping.ColumnMappings.Add("pdate", "pdate"); + tableMapping.ColumnMappings.Add("div", "div"); + tableMapping.ColumnMappings.Add("remark", "remark"); + tableMapping.ColumnMappings.Add("wuid", "wuid"); + tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("mailsend", "mailsend"); + 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 [ProjectsHistory] WHERE (([idx] = @Original_idx) AND ([pidx] = @Original_pidx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", 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.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_mailsend", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ProjectsHistory] ([pidx], [pdate], [div], [remark], [wuid], [wdate], [mailsend]) VALUES (@pidx, @pdate, @div, @remark, @wuid, @wdate, @mailsend); +SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", 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, "", "", "")); + 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", 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("@mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [ProjectsHistory] SET [pidx] = @pidx, [pdate] = @pdate, [div] = @div, [remark] = @remark, [wuid] = @wuid, [wdate] = @wdate, [mailsend] = @mailsend WHERE (([idx] = @Original_idx) AND ([pidx] = @Original_pidx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend))); +SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory WHERE (idx = @idx) ORDER BY pdate DESC"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", 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, "", "", "")); + 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("@remark", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", 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("@mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", 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("@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_mailsend", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FPJ0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitCommandCollection() { + 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, pidx, pdate, div, remark, wuid, wdate, mailsend\r\nFROM ProjectsHi" + + "story\r\nWHERE (pidx = @project)\r\nORDER BY pdate DESC"; + 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, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Fill, true)] + public virtual int Fill(dsPRJ.ProjectsHistoryDataTable dataTable, int project) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + this.Adapter.SelectCommand.Parameters[0].Value = ((int)(project)); + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Select, true)] + public virtual dsPRJ.ProjectsHistoryDataTable GetData(int project) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + this.Adapter.SelectCommand.Parameters[0].Value = ((int)(project)); + dsPRJ.ProjectsHistoryDataTable dataTable = new dsPRJ.ProjectsHistoryDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsPRJ.ProjectsHistoryDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsPRJ dataSet) { + return this.Adapter.Update(dataSet, "ProjectsHistory"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] + public virtual int Delete(int Original_idx, int Original_pidx, string Original_pdate, string Original_div, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_mailsend) { + this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); + this.Adapter.DeleteCommand.Parameters[1].Value = ((int)(Original_pidx)); + if ((Original_pdate == null)) { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_pdate)); + } + if ((Original_div == null)) { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_div)); + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_wuid)); + } + this.Adapter.DeleteCommand.Parameters[7].Value = ((System.DateTime)(Original_wdate)); + if ((Original_mailsend.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[9].Value = ((bool)(Original_mailsend.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[9].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; + if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + this.Adapter.DeleteCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.DeleteCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(int pidx, string pdate, string div, string remark, string wuid, System.DateTime wdate, global::System.Nullable mailsend) { + this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx)); + if ((pdate == null)) { + this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[1].Value = ((string)(pdate)); + } + if ((div == null)) { + this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(div)); + } + if ((remark == null)) { + this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[3].Value = ((string)(remark)); + } + if ((wuid == null)) { + throw new global::System.ArgumentNullException("wuid"); + } + else { + this.Adapter.InsertCommand.Parameters[4].Value = ((string)(wuid)); + } + this.Adapter.InsertCommand.Parameters[5].Value = ((System.DateTime)(wdate)); + if ((mailsend.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[6].Value = ((bool)(mailsend.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; + if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + this.Adapter.InsertCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.InsertCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(int pidx, string pdate, string div, string remark, string wuid, System.DateTime wdate, global::System.Nullable mailsend, int Original_idx, int Original_pidx, string Original_pdate, string Original_div, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_mailsend, int idx) { + this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(pidx)); + if ((pdate == null)) { + this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(pdate)); + } + if ((div == null)) { + this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(div)); + } + if ((remark == null)) { + this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(remark)); + } + if ((wuid == null)) { + throw new global::System.ArgumentNullException("wuid"); + } + else { + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(wuid)); + } + this.Adapter.UpdateCommand.Parameters[5].Value = ((System.DateTime)(wdate)); + if ((mailsend.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[6].Value = ((bool)(mailsend.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_pidx)); + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_pdate)); + } + if ((Original_div == null)) { + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_div)); + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_wuid)); + } + this.Adapter.UpdateCommand.Parameters[14].Value = ((System.DateTime)(Original_wdate)); + if ((Original_mailsend.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_mailsend.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[17].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)) { + this.Adapter.UpdateCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.UpdateCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(int pidx, string pdate, string div, string remark, string wuid, System.DateTime wdate, global::System.Nullable mailsend, int Original_idx, int Original_pidx, string Original_pdate, string Original_div, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_mailsend) { + return this.Update(pidx, pdate, div, remark, wuid, wdate, mailsend, Original_idx, Original_pidx, Original_pdate, Original_div, Original_wuid, Original_wdate, Original_mailsend, Original_idx); + } + } + /// ///Represents the connection and commands used to retrieve and save data. /// @@ -10227,6 +11516,8 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL private ProjectsMailListTableAdapter _projectsMailListTableAdapter; + private ProjectsHistoryTableAdapter _projectsHistoryTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -10326,6 +11617,20 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public ProjectsHistoryTableAdapter ProjectsHistoryTableAdapter { + get { + return this._projectsHistoryTableAdapter; + } + set { + this._projectsHistoryTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -10369,6 +11674,10 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL && (this._projectsMailListTableAdapter.Connection != null))) { return this._projectsMailListTableAdapter.Connection; } + if (((this._projectsHistoryTableAdapter != null) + && (this._projectsHistoryTableAdapter.Connection != null))) { + return this._projectsHistoryTableAdapter.Connection; + } return null; } set { @@ -10400,6 +11709,9 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL if ((this._projectsMailListTableAdapter != null)) { count = (count + 1); } + if ((this._projectsHistoryTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -10465,6 +11777,15 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL allChangedRows.AddRange(updatedRows); } } + if ((this._projectsHistoryTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.ProjectsHistory.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._projectsHistoryTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } return result; } @@ -10523,6 +11844,14 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL allAddedRows.AddRange(addedRows); } } + if ((this._projectsHistoryTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.ProjectsHistory.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._projectsHistoryTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } return result; } @@ -10533,6 +11862,14 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateDeletedRows(dsPRJ dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; + if ((this._projectsHistoryTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ProjectsHistory.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._projectsHistoryTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._projectsMailListTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.ProjectsMailList.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -10644,6 +11981,10 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL && (this.MatchTableAdapterConnection(this._projectsMailListTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); } + if (((this._projectsHistoryTableAdapter != null) + && (this.MatchTableAdapterConnection(this._projectsHistoryTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager에 연결 정보가 없습니다. 각 TableAdapterManager TableAdapter 속성을 올바른 Tabl" + @@ -10729,6 +12070,15 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL adaptersWithAcceptChangesDuringUpdate.Add(this._projectsMailListTableAdapter.Adapter); } } + if ((this._projectsHistoryTableAdapter != null)) { + revertConnections.Add(this._projectsHistoryTableAdapter, this._projectsHistoryTableAdapter.Connection); + this._projectsHistoryTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._projectsHistoryTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._projectsHistoryTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._projectsHistoryTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._projectsHistoryTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -10811,6 +12161,10 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL this._projectsMailListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._projectsMailListTableAdapter])); this._projectsMailListTableAdapter.Transaction = null; } + if ((this._projectsHistoryTableAdapter != null)) { + this._projectsHistoryTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._projectsHistoryTableAdapter])); + this._projectsHistoryTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 1c74ab8..e60d96d 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))) + 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))) @@ -61,13 +61,15 @@ + + - 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]) 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); -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 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]) 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) @@ -95,13 +97,14 @@ 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 + progress, import, asset FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -116,8 +119,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 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))); -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 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 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) @@ -145,6 +148,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -192,6 +196,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + @@ -226,6 +232,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -239,7 +246,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat - SELECT 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, 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) @@ -808,6 +815,92 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + + + + + + DELETE FROM [ProjectsHistory] WHERE (([idx] = @Original_idx) AND ([pidx] = @Original_pidx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend))) + + + + + + + + + + + + + + + + + INSERT INTO [ProjectsHistory] ([pidx], [pdate], [div], [remark], [wuid], [wdate], [mailsend]) VALUES (@pidx, @pdate, @div, @remark, @wuid, @wdate, @mailsend); +SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC + + + + + + + + + + + + + + SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend +FROM ProjectsHistory +WHERE (pidx = @project) +ORDER BY pdate DESC + + + + + + + + UPDATE [ProjectsHistory] SET [pidx] = @pidx, [pdate] = @pdate, [div] = @div, [remark] = @remark, [wuid] = @wuid, [wdate] = @wdate, [mailsend] = @mailsend WHERE (([idx] = @Original_idx) AND ([pidx] = @Original_pidx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend))); +SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory WHERE (idx = @idx) ORDER BY pdate DESC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -829,7 +922,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL - + @@ -935,9 +1028,10 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL - - - + + + + @@ -961,10 +1055,17 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + + + + + + + - + @@ -1028,7 +1129,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL - + @@ -1101,7 +1202,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL - + @@ -1135,7 +1236,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL - + @@ -1179,7 +1280,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL - + @@ -1217,6 +1318,44 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1243,5 +1382,9 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate FROM ProjectsMailL + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index ece89c6..fb0a0cb 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -6,12 +6,14 @@ --> - - - - - - + + + + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index 175474d..2a2db9c 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -29,24 +29,20 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.Label sdateLabel; - System.Windows.Forms.Label label3; - System.Windows.Forms.Label label4; - System.Windows.Forms.Label label5; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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(); 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.dsMSSQL = new FPJ0000.dsPRJ(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -58,8 +54,9 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); - this.projectsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.btAdd = new System.Windows.Forms.ToolStripButton(); + this.btDel = new System.Windows.Forms.ToolStripButton(); + this.btSave = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tbFind = new System.Windows.Forms.ToolStripTextBox(); @@ -99,19 +96,29 @@ this.btSearch = new System.Windows.Forms.ToolStripButton(); this.label1 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); - this.textBox6 = new System.Windows.Forms.TextBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.sdateTextBox = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); - sdateLabel = new System.Windows.Forms.Label(); - label3 = new System.Windows.Forms.Label(); - label4 = new System.Windows.Forms.Label(); - label5 = new System.Windows.Forms.Label(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + 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.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.textBox8 = new System.Windows.Forms.TextBox(); + this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); + this.btEdit = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -122,47 +129,14 @@ this.toolStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit(); + this.panel2.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // - // sdateLabel - // - sdateLabel.AutoSize = true; - sdateLabel.Location = new System.Drawing.Point(19, 68); - sdateLabel.Name = "sdateLabel"; - sdateLabel.Size = new System.Drawing.Size(29, 12); - sdateLabel.TabIndex = 1; - sdateLabel.Text = "시작"; - // - // label3 - // - label3.AutoSize = true; - label3.Location = new System.Drawing.Point(19, 95); - label3.Name = "label3"; - label3.Size = new System.Drawing.Size(29, 12); - label3.TabIndex = 3; - label3.Text = "출고"; - // - // label4 - // - label4.AutoSize = true; - label4.Location = new System.Drawing.Point(19, 122); - label4.Name = "label4"; - label4.Size = new System.Drawing.Size(29, 12); - label4.TabIndex = 5; - label4.Text = "완료"; - // - // label5 - // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(19, 41); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(29, 12); - label5.TabIndex = 12; - label5.Text = "기표"; - // // bn // - this.bn.AddNewItem = this.bindingNavigatorAddNewItem; + this.bn.AddNewItem = null; this.bn.BindingSource = this.bs; this.bn.CountItem = this.bindingNavigatorCountItem; this.bn.DeleteItem = null; @@ -177,36 +151,30 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, - this.bindingNavigatorAddNewItem, - this.bindingNavigatorDeleteItem, - this.projectsBindingNavigatorSaveItem, + this.btAdd, + this.btDel, + this.btEdit, + this.btSave, this.toolStripSeparator1, this.toolStripLabel1, this.tbFind, this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 451); + this.bn.Location = new System.Drawing.Point(0, 528); 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(1016, 25); + this.bn.Size = new System.Drawing.Size(775, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // - // bindingNavigatorAddNewItem - // - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(67, 22); - this.bindingNavigatorAddNewItem.Text = "추가(&A)"; - // // bs // this.bs.DataMember = "Projects"; this.bs.DataSource = this.dsMSSQL; + this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); // // dsMSSQL // @@ -280,22 +248,32 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // - // bindingNavigatorDeleteItem + // btAdd // - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(68, 22); - this.bindingNavigatorDeleteItem.Text = "삭제(&D)"; - this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); + this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image"))); + this.btAdd.Name = "btAdd"; + this.btAdd.RightToLeftAutoMirrorImage = true; + this.btAdd.Size = new System.Drawing.Size(67, 22); + this.btAdd.Text = "추가(&A)"; + this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // - // projectsBindingNavigatorSaveItem + // btDel // - this.projectsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("projectsBindingNavigatorSaveItem.Image"))); - this.projectsBindingNavigatorSaveItem.Name = "projectsBindingNavigatorSaveItem"; - this.projectsBindingNavigatorSaveItem.Size = new System.Drawing.Size(66, 22); - this.projectsBindingNavigatorSaveItem.Text = "저장(&S)"; - this.projectsBindingNavigatorSaveItem.Click += new System.EventHandler(this.projectsBindingNavigatorSaveItem_Click); + this.btDel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image"))); + this.btDel.Name = "btDel"; + this.btDel.RightToLeftAutoMirrorImage = true; + this.btDel.Size = new System.Drawing.Size(68, 22); + this.btDel.Text = "삭제(&D)"; + this.btDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); + // + // btSave + // + this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(66, 22); + this.btSave.Text = "저장(&S)"; + this.btSave.Click += new System.EventHandler(this.projectsBindingNavigatorSaveItem_Click); // // toolStripSeparator1 // @@ -451,6 +429,7 @@ // this.tam.BackupDataSetBeforeUpdate = false; this.tam.JobReportTableAdapter = null; + this.tam.ProjectsHistoryTableAdapter = null; this.tam.ProjectsIOMapTableAdapter = null; this.tam.ProjectsMailListTableAdapter = null; this.tam.ProjectsPartTableAdapter = null; @@ -469,7 +448,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(816, 403); + this.fpSpread1.Size = new System.Drawing.Size(343, 480); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -479,101 +458,115 @@ 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 = 11; + this.fpSpread1_Sheet1.ColumnCount = 12; + 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, 1).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "이름"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "VER"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "공정담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "만료일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Status"; + 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, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Requestor"; + 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, 8).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "대수"; + 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, 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, 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.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).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Tag = "state"; 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 = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 82F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "이름"; + 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 = 113F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "rev"; + 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(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "VER"; 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 = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "담당"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 70F; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "H/W"; + 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(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usersub"; + 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).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "공정"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "reqstaff"; + 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).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "공정담당"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "ddate"; + 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(9).Label = "만료일"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "cnt"; + 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(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량"; 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(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -597,7 +590,7 @@ this.btSearch}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1016, 25); + this.toolStrip1.Size = new System.Drawing.Size(775, 25); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -709,138 +702,314 @@ this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 428); + 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(1016, 23); + this.label1.Size = new System.Drawing.Size(775, 23); this.label1.TabIndex = 5; this.label1.Text = "--"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // panel1 // - this.panel1.Controls.Add(label5); - this.panel1.Controls.Add(this.textBox6); this.panel1.Controls.Add(this.tableLayoutPanel1); - this.panel1.Controls.Add(label4); - this.panel1.Controls.Add(this.textBox2); - this.panel1.Controls.Add(label3); - this.panel1.Controls.Add(this.textBox1); - this.panel1.Controls.Add(sdateLabel); - this.panel1.Controls.Add(this.sdateTextBox); - this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.tableLayoutPanel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(816, 25); + this.panel1.Location = new System.Drawing.Point(343, 25); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(200, 403); + this.panel1.Size = new System.Drawing.Size(432, 480); this.panel1.TabIndex = 6; // - // textBox6 - // - this.textBox6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.textBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "pdate", true)); - this.textBox6.Location = new System.Drawing.Point(60, 36); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(131, 21); - this.textBox6.TabIndex = 13; - this.textBox6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // tableLayoutPanel1 // - this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.textBox3, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.textBox4, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.textBox5, 0, 2); - this.tableLayoutPanel1.Location = new System.Drawing.Point(13, 144); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 100F)); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0); + 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.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 45); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(178, 251); + 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.TabIndex = 11; // - // textBox3 - // - this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true)); - this.textBox3.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox3.Location = new System.Drawing.Point(3, 3); - this.textBox3.Multiline = true; - this.textBox3.Name = "textBox3"; - this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox3.Size = new System.Drawing.Size(172, 77); - this.textBox3.TabIndex = 8; - // - // textBox4 - // - this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_ans", true)); - this.textBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox4.Location = new System.Drawing.Point(3, 86); - this.textBox4.Multiline = true; - this.textBox4.Name = "textBox4"; - this.textBox4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox4.Size = new System.Drawing.Size(172, 77); - this.textBox4.TabIndex = 10; - // - // textBox5 - // - this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.textBox5.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox5.Location = new System.Drawing.Point(3, 169); - this.textBox5.Multiline = true; - this.textBox5.Name = "textBox5"; - this.textBox5.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox5.Size = new System.Drawing.Size(172, 79); - this.textBox5.TabIndex = 10; - // - // textBox2 - // - this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); - this.textBox2.Location = new System.Drawing.Point(60, 117); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(131, 21); - this.textBox2.TabIndex = 6; - this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // textBox1 - // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); - this.textBox1.Location = new System.Drawing.Point(60, 90); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(131, 21); - this.textBox1.TabIndex = 4; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // sdateTextBox - // - this.sdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); - this.sdateTextBox.Location = new System.Drawing.Point(60, 63); - this.sdateTextBox.Name = "sdateTextBox"; - this.sdateTextBox.Size = new System.Drawing.Size(131, 21); - this.sdateTextBox.TabIndex = 2; - this.sdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // label2 // this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label2.Dock = System.Windows.Forms.DockStyle.Top; + this.tableLayoutPanel1.SetColumnSpan(this.label2, 2); + this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.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.label2.Location = new System.Drawing.Point(0, 0); + this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(200, 29); + this.label2.Size = new System.Drawing.Size(432, 25); this.label2.TabIndex = 0; - this.label2.Text = "INFORMATION"; + this.label2.Text = "개선방향"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // textBox3 + // + this.tableLayoutPanel1.SetColumnSpan(this.textBox3, 2); + this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true)); + this.textBox3.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox3.Location = new System.Drawing.Point(0, 25); + this.textBox3.Margin = new System.Windows.Forms.Padding(0); + 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.TabIndex = 8; + // + // label4 + // + this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); + this.label4.Dock = System.Windows.Forms.DockStyle.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.Margin = new System.Windows.Forms.Padding(0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(100, 25); + this.label4.TabIndex = 12; + this.label4.Text = "--"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // bsHist + // + this.bsHist.DataMember = "ProjectsHistory"; + this.bsHist.DataSource = this.dsMSSQL; + this.bsHist.Sort = "pdate desc"; + // + // panel2 + // + 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.Margin = new System.Windows.Forms.Padding(0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(432, 193); + this.panel2.TabIndex = 13; + // + // textBox4 + // + this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true)); + this.textBox4.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox4.Location = new System.Drawing.Point(0, 0); + this.textBox4.Multiline = true; + 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.TabIndex = 10; + // + // button1 + // + 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); + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; + this.tableLayoutPanel2.ColumnCount = 6; + 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.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.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.Dock = System.Windows.Forms.DockStyle.Top; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 2; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(432, 45); + this.tableLayoutPanel2.TabIndex = 12; + // + // label6 + // + this.label6.Dock = System.Windows.Forms.DockStyle.Fill; + this.label6.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(4, 1); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(74, 21); + 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; + // + // textBox1 + // + this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + 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.TabIndex = 1; + this.textBox1.Text = "19-01-01"; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox2 + // + 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; + // + // textBox5 + // + 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; + // + // 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.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; + // + // textBox7 + // + 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; + // + // textBox8 + // + 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; + // + // 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(1016, 476); + this.ClientSize = new System.Drawing.Size(775, 553); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.panel1); this.Controls.Add(this.label1); @@ -861,9 +1030,13 @@ this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -876,9 +1049,9 @@ private dsPRJTableAdapters.ProjectsTableAdapter ta; private dsPRJTableAdapters.TableAdapterManager tam; private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; + private System.Windows.Forms.ToolStripButton btAdd; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; + private System.Windows.Forms.ToolStripButton btDel; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; @@ -887,7 +1060,7 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton projectsBindingNavigatorSaveItem; + private System.Windows.Forms.ToolStripButton btSave; private System.Windows.Forms.ContextMenuStrip cm; private System.Windows.Forms.ToolStripMenuItem partListToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; @@ -919,20 +1092,34 @@ private System.Windows.Forms.ToolStripButton chk대기; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox sdateTextBox; private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.TextBox textBox5; private System.Windows.Forms.ToolStripLabel toolStripLabel2; private System.Windows.Forms.ToolStripComboBox cmbYear; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.ToolStripMenuItem 엑셀파일로저장ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 메일발송주소관리ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.BindingSource bsHist; + private dsPRJTableAdapters.ProjectsHistoryTableAdapter taHist; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox5; + 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; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.cs b/SubProject/FPJ0000/fProjectList.cs index 355fe61..3180f3c 100644 --- a/SubProject/FPJ0000/fProjectList.cs +++ b/SubProject/FPJ0000/fProjectList.cs @@ -320,7 +320,7 @@ namespace FPJ0000 var cols = new string[] { "name","process","reqstaff","usermain", "usersub","userManager", - "remark_req","remark_ans" }; + "remark_req"}; bs.Filter = FCOMMON.Util.MakeFilterString(cols, search); tbFind.BackColor = Color.Lime; tbFind.SelectAll(); @@ -366,5 +366,65 @@ namespace FPJ0000 var f = new fMailList(dr.idx); f.ShowDialog(); } + + private void bs_CurrentChanged(object sender, EventArgs e) + { + //히스토리 데이터를 업데이트하고 첫번재 자료를 표시한다. + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.ProjectsRow; + try + { + taHist.Fill(this.dsMSSQL.ProjectsHistory, dr.idx); + } + catch (Exception ex) + { + + } + } + + private void button1_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.ProjectsRow; + var f = new fProejctHistory(dr.idx); + f.StartPosition = FormStartPosition.CenterScreen; + var dlg = f.ShowDialog(); + bs_CurrentChanged(sender, e); + } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + var newdr = this.dsMSSQL.Projects.NewProjectsRow(); + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd"); + newdr.sdate = DateTime.Now.ToString("yyyy-MM-dd"); + newdr.userManager = FCOMMON.info.Login.nameK; + newdr.progress = 0; + newdr.costn = 0; + newdr.costo = 0; + newdr.cnt = 1; + newdr.name = "Project Title"; + var f = new fProjectData(newdr); + f.StartPosition = FormStartPosition.CenterScreen; + var dlg = f.ShowDialog(); + if (dlg == System.Windows.Forms.DialogResult.OK) + { + this.dsMSSQL.Projects.AddProjectsRow(newdr); + ta.Update(newdr); + } + else newdr.Delete(); + } + + private void btEdit_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.ProjectsRow; + var f = new fProjectData(dr); + f.ShowDialog(); + } } -} +} \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx index dad72b6..2626146 100644 --- a/SubProject/FPJ0000/fProjectList.resx +++ b/SubProject/FPJ0000/fProjectList.resx @@ -117,40 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - - - False - - - False - - - False - 321, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC - pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ - Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ - /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA - zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ - IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E - rkJggg== - - 122, 17 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -191,7 +167,19 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC @@ -203,13 +191,26 @@ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - + + + R0lGODlhEAAQAIQAAGB3lYivyMDf/XiZt+Ts9ajT/Mbh/UlVa/P2+bLY/FRlfu3x9ZzN++Xy/rTR4ENL + XN7v/tTk8Jm/1enx96jL3uDo7ykxQz5FVb2JAP+8Bv/RV6HQ/FSr9qfR+jhllf///yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIugA/CBxIsKDACA4cUJAgIUCAARA9eJAg0EEEAhMyTiDA + 0UMHDh4qTjBAkqSABh5BKhBIAUFJASdTekCw8oMElwZgovzoAQJNgTdzxuQJocDPDwEQ6MRAtIDRAwKT + nsSgIUPPAh02EID6YcCCBlQzYCiaVesDgV4jVB2LdcMGBhXOdl2QQIFdBQAGMNhb4QJaBAkSYC0wAIBh + AAv8fgAQAcFGjgQqSF7gwAJavHcPHHjw4MIFCzUNihYYEAA7 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 17, 17 + 387, 17 @@ -259,117 +260,117 @@ 248, 17 - 17, 56 + 731, 17 - 607, 17 + 455, 17 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPdS1NxHMbPn9HO3FlpeJHtohhFpZBeFUio - g2xpmrkszW1nc86UthnDZlqkgfNlSYr4lqVWm3MqU+dsOqeUicumhJi76YVqw+jFns4ZEzUqCHrg4fe9 - +H6e3zvx35UxFR91ZvyIRuw45EsZ3BdIsgkCybYYX7J1jyapb3dUuO33ynTFiVIdB/wqhxgtXiO6F1tD - bp6vQZ4tCQmdfP/RDkoUbt+uTOdhkWhEGKya0cG63IPGF7ehnykKma0ty92onLiM/SZe8OAd7vaQ02Ox - kSK7cJWF2cYSjxRqdx6UExehYlzIuHjyEsyv7uO6U429RnJVYKQiwzhBiO1CLT2cGpqZhVmQdp2HbDwb - Muc5KJzZsK/0QeuSw8KEZHQeQ/StCG0YJ4iUQYGv2VsDk7ca6slcyJ9IGDAL8jHGjiyMvLaBlT+4gvpn - lWicqQS/nPSFcYI4bo5ee7jUjlKPEgWuHGYlvZh/Pwt6NBvDK/0h+Pv6N9Q/vQHtaC66vc2gdJy1ME4Q - CQ/4az2LbdC5aZS6C/Dxy4cQ9O7zm9DIwsbpcihsadDYL6DH2wSqZGtAO993d7YaDXM3oRqTwDBZjODX - TyF4/cc6jFPXILWmQskE1HrK0OAygK/mbG4htoXSSnoTYV66h+JRCRT2TJSNF2Lh7RzqpyuQ33cSMssp - qKzpML9swwlTPKgicvMQhY1UpIC5GoNDiUe+DhQNnUXBQDrofjHkFtYsnIbHC63Q9eeConesUvSWa2QV - U8UV7SznBvV2KSxMSJ3HAM1QDq4MSFDHbMHMwBprDnh5ZJBS/PKQNrSrgiviX+X4U5oS0OA2oOu5CV2z - JhhdeiTWxiEin+OnZH+AN8TT86IoLanhl3B8VAEZoGgywJczNU1qeFLe3z/Tv4sgfgJDxrF9a4mFvQAA - AABJRU5ErkJggg== + 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= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPdS1NxHMbPn9HO3FlpeJHtohhFpZBeFUio - g2xpmrkszW1nc86UthnDZlqkgfNlSYr4lqVWm3MqU+dsOqeUicumhJi76YVqw+jFns4ZEzUqCHrg4fe9 - +H6e3zvx35UxFR91ZvyIRuw45EsZ3BdIsgkCybYYX7J1jyapb3dUuO33ynTFiVIdB/wqhxgtXiO6F1tD - bp6vQZ4tCQmdfP/RDkoUbt+uTOdhkWhEGKya0cG63IPGF7ehnykKma0ty92onLiM/SZe8OAd7vaQ02Ox - kSK7cJWF2cYSjxRqdx6UExehYlzIuHjyEsyv7uO6U429RnJVYKQiwzhBiO1CLT2cGpqZhVmQdp2HbDwb - Muc5KJzZsK/0QeuSw8KEZHQeQ/StCG0YJ4iUQYGv2VsDk7ca6slcyJ9IGDAL8jHGjiyMvLaBlT+4gvpn - lWicqQS/nPSFcYI4bo5ee7jUjlKPEgWuHGYlvZh/Pwt6NBvDK/0h+Pv6N9Q/vQHtaC66vc2gdJy1ME4Q - CQ/4az2LbdC5aZS6C/Dxy4cQ9O7zm9DIwsbpcihsadDYL6DH2wSqZGtAO993d7YaDXM3oRqTwDBZjODX - TyF4/cc6jFPXILWmQskE1HrK0OAygK/mbG4htoXSSnoTYV66h+JRCRT2TJSNF2Lh7RzqpyuQ33cSMssp - qKzpML9swwlTPKgicvMQhY1UpIC5GoNDiUe+DhQNnUXBQDrofjHkFtYsnIbHC63Q9eeConesUvSWa2QV - U8UV7SznBvV2KSxMSJ3HAM1QDq4MSFDHbMHMwBprDnh5ZJBS/PKQNrSrgiviX+X4U5oS0OA2oOu5CV2z - JhhdeiTWxiEin+OnZH+AN8TT86IoLanhl3B8VAEZoGgywJczNU1qeFLe3z/Tv4sgfgJDxrF9a4mFvQAA - AABJRU5ErkJggg== + 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= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPdS1NxHMbPn9HO3FlpeJHtohhFpZBeFUio - g2xpmrkszW1nc86UthnDZlqkgfNlSYr4lqVWm3MqU+dsOqeUicumhJi76YVqw+jFns4ZEzUqCHrg4fe9 - +H6e3zvx35UxFR91ZvyIRuw45EsZ3BdIsgkCybYYX7J1jyapb3dUuO33ynTFiVIdB/wqhxgtXiO6F1tD - bp6vQZ4tCQmdfP/RDkoUbt+uTOdhkWhEGKya0cG63IPGF7ehnykKma0ty92onLiM/SZe8OAd7vaQ02Ox - kSK7cJWF2cYSjxRqdx6UExehYlzIuHjyEsyv7uO6U429RnJVYKQiwzhBiO1CLT2cGpqZhVmQdp2HbDwb - Muc5KJzZsK/0QeuSw8KEZHQeQ/StCG0YJ4iUQYGv2VsDk7ca6slcyJ9IGDAL8jHGjiyMvLaBlT+4gvpn - lWicqQS/nPSFcYI4bo5ee7jUjlKPEgWuHGYlvZh/Pwt6NBvDK/0h+Pv6N9Q/vQHtaC66vc2gdJy1ME4Q - CQ/4az2LbdC5aZS6C/Dxy4cQ9O7zm9DIwsbpcihsadDYL6DH2wSqZGtAO993d7YaDXM3oRqTwDBZjODX - TyF4/cc6jFPXILWmQskE1HrK0OAygK/mbG4htoXSSnoTYV66h+JRCRT2TJSNF2Lh7RzqpyuQ33cSMssp - qKzpML9swwlTPKgicvMQhY1UpIC5GoNDiUe+DhQNnUXBQDrofjHkFtYsnIbHC63Q9eeConesUvSWa2QV - U8UV7SznBvV2KSxMSJ3HAM1QDq4MSFDHbMHMwBprDnh5ZJBS/PKQNrSrgiviX+X4U5oS0OA2oOu5CV2z - JhhdeiTWxiEin+OnZH+AN8TT86IoLanhl3B8VAEZoGgywJczNU1qeFLe3z/Tv4sgfgJDxrF9a4mFvQAA - AABJRU5ErkJggg== + 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= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPdS1NxHMbPn9HO3FlpeJHtohhFpZBeFUio - g2xpmrkszW1nc86UthnDZlqkgfNlSYr4lqVWm3MqU+dsOqeUicumhJi76YVqw+jFns4ZEzUqCHrg4fe9 - +H6e3zvx35UxFR91ZvyIRuw45EsZ3BdIsgkCybYYX7J1jyapb3dUuO33ynTFiVIdB/wqhxgtXiO6F1tD - bp6vQZ4tCQmdfP/RDkoUbt+uTOdhkWhEGKya0cG63IPGF7ehnykKma0ty92onLiM/SZe8OAd7vaQ02Ox - kSK7cJWF2cYSjxRqdx6UExehYlzIuHjyEsyv7uO6U429RnJVYKQiwzhBiO1CLT2cGpqZhVmQdp2HbDwb - Muc5KJzZsK/0QeuSw8KEZHQeQ/StCG0YJ4iUQYGv2VsDk7ca6slcyJ9IGDAL8jHGjiyMvLaBlT+4gvpn - lWicqQS/nPSFcYI4bo5ee7jUjlKPEgWuHGYlvZh/Pwt6NBvDK/0h+Pv6N9Q/vQHtaC66vc2gdJy1ME4Q - CQ/4az2LbdC5aZS6C/Dxy4cQ9O7zm9DIwsbpcihsadDYL6DH2wSqZGtAO993d7YaDXM3oRqTwDBZjODX - TyF4/cc6jFPXILWmQskE1HrK0OAygK/mbG4htoXSSnoTYV66h+JRCRT2TJSNF2Lh7RzqpyuQ33cSMssp - qKzpML9swwlTPKgicvMQhY1UpIC5GoNDiUe+DhQNnUXBQDrofjHkFtYsnIbHC63Q9eeConesUvSWa2QV - U8UV7SznBvV2KSxMSJ3HAM1QDq4MSFDHbMHMwBprDnh5ZJBS/PKQNrSrgiviX+X4U5oS0OA2oOu5CV2z - JhhdeiTWxiEin+OnZH+AN8TT86IoLanhl3B8VAEZoGgywJczNU1qeFLe3z/Tv4sgfgJDxrF9a4mFvQAA - AABJRU5ErkJggg== + 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= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPdS1NxHMbPn9HO3FlpeJHtohhFpZBeFUio - g2xpmrkszW1nc86UthnDZlqkgfNlSYr4lqVWm3MqU+dsOqeUicumhJi76YVqw+jFns4ZEzUqCHrg4fe9 - +H6e3zvx35UxFR91ZvyIRuw45EsZ3BdIsgkCybYYX7J1jyapb3dUuO33ynTFiVIdB/wqhxgtXiO6F1tD - bp6vQZ4tCQmdfP/RDkoUbt+uTOdhkWhEGKya0cG63IPGF7ehnykKma0ty92onLiM/SZe8OAd7vaQ02Ox - kSK7cJWF2cYSjxRqdx6UExehYlzIuHjyEsyv7uO6U429RnJVYKQiwzhBiO1CLT2cGpqZhVmQdp2HbDwb - Muc5KJzZsK/0QeuSw8KEZHQeQ/StCG0YJ4iUQYGv2VsDk7ca6slcyJ9IGDAL8jHGjiyMvLaBlT+4gvpn - lWicqQS/nPSFcYI4bo5ee7jUjlKPEgWuHGYlvZh/Pwt6NBvDK/0h+Pv6N9Q/vQHtaC66vc2gdJy1ME4Q - CQ/4az2LbdC5aZS6C/Dxy4cQ9O7zm9DIwsbpcihsadDYL6DH2wSqZGtAO993d7YaDXM3oRqTwDBZjODX - TyF4/cc6jFPXILWmQskE1HrK0OAygK/mbG4htoXSSnoTYV66h+JRCRT2TJSNF2Lh7RzqpyuQ33cSMssp - qKzpML9swwlTPKgicvMQhY1UpIC5GoNDiUe+DhQNnUXBQDrofjHkFtYsnIbHC63Q9eeConesUvSWa2QV - U8UV7SznBvV2KSxMSJ3HAM1QDq4MSFDHbMHMwBprDnh5ZJBS/PKQNrSrgiviX+X4U5oS0OA2oOu5CV2z - JhhdeiTWxiEin+OnZH+AN8TT86IoLanhl3B8VAEZoGgywJczNU1qeFLe3z/Tv4sgfgJDxrF9a4mFvQAA - AABJRU5ErkJggg== + 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= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPdS1NxHMbPn9HO3FlpeJHtohhFpZBeFUio - g2xpmrkszW1nc86UthnDZlqkgfNlSYr4lqVWm3MqU+dsOqeUicumhJi76YVqw+jFns4ZEzUqCHrg4fe9 - +H6e3zvx35UxFR91ZvyIRuw45EsZ3BdIsgkCybYYX7J1jyapb3dUuO33ynTFiVIdB/wqhxgtXiO6F1tD - bp6vQZ4tCQmdfP/RDkoUbt+uTOdhkWhEGKya0cG63IPGF7ehnykKma0ty92onLiM/SZe8OAd7vaQ02Ox - kSK7cJWF2cYSjxRqdx6UExehYlzIuHjyEsyv7uO6U429RnJVYKQiwzhBiO1CLT2cGpqZhVmQdp2HbDwb - Muc5KJzZsK/0QeuSw8KEZHQeQ/StCG0YJ4iUQYGv2VsDk7ca6slcyJ9IGDAL8jHGjiyMvLaBlT+4gvpn - lWicqQS/nPSFcYI4bo5ee7jUjlKPEgWuHGYlvZh/Pwt6NBvDK/0h+Pv6N9Q/vQHtaC66vc2gdJy1ME4Q - CQ/4az2LbdC5aZS6C/Dxy4cQ9O7zm9DIwsbpcihsadDYL6DH2wSqZGtAO993d7YaDXM3oRqTwDBZjODX - TyF4/cc6jFPXILWmQskE1HrK0OAygK/mbG4htoXSSnoTYV66h+JRCRT2TJSNF2Lh7RzqpyuQ33cSMssp - qKzpML9swwlTPKgicvMQhY1UpIC5GoNDiUe+DhQNnUXBQDrofjHkFtYsnIbHC63Q9eeConesUvSWa2QV - U8UV7SznBvV2KSxMSJ3HAM1QDq4MSFDHbMHMwBprDnh5ZJBS/PKQNrSrgiviX+X4U5oS0OA2oOu5CV2z - JhhdeiTWxiEin+OnZH+AN8TT86IoLanhl3B8VAEZoGgywJczNU1qeFLe3z/Tv4sgfgJDxrF9a4mFvQAA - AABJRU5ErkJggg== + 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= @@ -383,4 +384,13 @@ dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + 561, 17 + + + 561, 17 + + + 647, 17 + \ No newline at end of file