diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 4ea1674..44071ec 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -55,6 +55,11 @@ namespace Project.Dialog //마지막으로사용한 부서이름 if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1; else this.cmbDept.Text = Pub.setting.lastdpt; + if(cmbDept.SelectedIndex == -1 && Pub.setting.lastgcode.isEmpty()==false) + { + var dr =grplist.Where(t => t.gcode.Equals(Pub.setting.lastgcode)).FirstOrDefault(); + if (dr != null) cmbDept.Text = dr.dept; + } //foreach (var item in dlist) // if (item != "") this.cmbDept.Items.Add(item); //if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0; @@ -108,6 +113,7 @@ namespace Project.Dialog Pub.setting.lastid = vuserlist;// tbID.Text.Trim(); Pub.setting.lastdpt = cmbDept.Text; //부서저장 201006 + Pub.setting.lastgcode = gCode; Pub.setting.Save(); var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 3465bf5..63c9b10 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("23.01.17.2130")] -[assembly: AssemblyFileVersion("23.01.17.2130")] +[assembly: AssemblyVersion("23.01.25.0950")] +[assembly: AssemblyFileVersion("23.01.25.0950")] diff --git a/Project/Setting.cs b/Project/Setting.cs index 535da1c..eb41ae4 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -73,6 +73,8 @@ namespace Project public string lastid { get; set; } [Browsable(false)] public string lastdpt { get; set; } + [Browsable(false)] + public string lastgcode { get; set; } public int CamIndex { get; set; } [DisplayName("Tool Bar")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 71d67ad..c141818 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -126,6 +126,7 @@ this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); this.아이템비활성화하기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sPR설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.버젼확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.설명서ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1 = new System.Windows.Forms.TabControl(); @@ -136,7 +137,8 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.그룹정보ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripSeparator(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -259,14 +261,14 @@ // this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.codesToolStripMenuItem.Text = "공용코드"; this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); // // itemsToolStripMenuItem // this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.itemsToolStripMenuItem.Text = "품목정보"; this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); // @@ -275,43 +277,45 @@ this.userInfoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.userAccountToolStripMenuItem, this.myAccouserToolStripMenuItem, - this.권한설정ToolStripMenuItem}); + this.권한설정ToolStripMenuItem, + this.toolStripMenuItem12, + this.그룹정보ToolStripMenuItem}); this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.userInfoToolStripMenuItem.Text = "사용자"; // // userAccountToolStripMenuItem // this.userAccountToolStripMenuItem.Name = "userAccountToolStripMenuItem"; - this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.userAccountToolStripMenuItem.Text = "계정정보"; this.userAccountToolStripMenuItem.Click += new System.EventHandler(this.userAccountToolStripMenuItem_Click); // // myAccouserToolStripMenuItem // this.myAccouserToolStripMenuItem.Name = "myAccouserToolStripMenuItem"; - this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.myAccouserToolStripMenuItem.Text = "계정목록"; this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_Click); // // 권한설정ToolStripMenuItem // this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; - this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.권한설정ToolStripMenuItem.Text = "권한설정"; this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); // // customerToolStripMenuItem // this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.customerToolStripMenuItem.Text = "업체정보"; this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); // // mn_kuntae // this.mn_kuntae.Name = "mn_kuntae"; - this.mn_kuntae.Size = new System.Drawing.Size(153, 24); + this.mn_kuntae.Size = new System.Drawing.Size(180, 24); this.mn_kuntae.Text = "월별 근무표"; this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); // @@ -319,7 +323,7 @@ // this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; - this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일양식ToolStripMenuItem.Text = "메일 양식"; this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); // @@ -929,6 +933,13 @@ this.sPR설정ToolStripMenuItem.Text = "SPR 설정"; this.sPR설정ToolStripMenuItem.Click += new System.EventHandler(this.sPR설정ToolStripMenuItem_Click); // + // 프로젝트스케쥴담당자사번업데이트ToolStripMenuItem + // + this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Name = "프로젝트스케쥴담당자사번업데이트ToolStripMenuItem"; + this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Size = new System.Drawing.Size(302, 24); + this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Text = "프로젝트스케쥴담당자사번업데이트"; + this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Click += new System.EventHandler(this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem_Click); + // // 버젼확인ToolStripMenuItem // this.버젼확인ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("버젼확인ToolStripMenuItem.Image"))); @@ -1040,12 +1051,17 @@ this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // 프로젝트스케쥴담당자사번업데이트ToolStripMenuItem + // 그룹정보ToolStripMenuItem // - this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Name = "프로젝트스케쥴담당자사번업데이트ToolStripMenuItem"; - this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Size = new System.Drawing.Size(302, 24); - this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Text = "프로젝트스케쥴담당자사번업데이트"; - this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem.Click += new System.EventHandler(this.프로젝트스케쥴담당자사번업데이트ToolStripMenuItem_Click); + this.그룹정보ToolStripMenuItem.Name = "그룹정보ToolStripMenuItem"; + this.그룹정보ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.그룹정보ToolStripMenuItem.Text = "그룹정보"; + this.그룹정보ToolStripMenuItem.Click += new System.EventHandler(this.그룹정보ToolStripMenuItem_Click); + // + // toolStripMenuItem12 + // + this.toolStripMenuItem12.Name = "toolStripMenuItem12"; + this.toolStripMenuItem12.Size = new System.Drawing.Size(177, 6); // // fMain // @@ -1186,6 +1202,8 @@ private System.Windows.Forms.ToolStripMenuItem sPR설정ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripMenuItem 프로젝트스케쥴담당자사번업데이트ToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem12; + private System.Windows.Forms.ToolStripMenuItem 그룹정보ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 2f465f0..0af3661 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -720,7 +720,7 @@ namespace Project return; } - var f = new FCM0000.fUserGroup(); + var f = new FCM0000.fUserGroupDev(); f.ShowDialog(); } @@ -1283,5 +1283,11 @@ namespace Project FCOMMON.Util.MsgI("complete"); } + + private void 그룹정보ToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new FCM0000.fUserGroup(); + f.ShowDialog(); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 5c1957b..745e3c6 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -182,6 +182,74 @@ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 + + + + + R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA + AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 + QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl + OoWKdGiDBgEBADs= + + + + + R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh + e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI + oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui + ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC + Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= + + + + + R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt + Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqwA/CBTooeDAgwg9DFjoAWHCAQEAFBjQ0CHBAQAEFLBQ + 8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW + GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R + v3gHemD5QK4HtBMSEyRplOTBgAA7 + + + + + R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// + /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY + JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP + jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA + Ow== + + + + + R0lGODlhEAAQAIQfAKxoR8VkLxFw1feVPITSWv+eQv7Qo0Cc6OyIN/v7+3PLTSCZEFy17Wa6XuT1x2bG + Q3nNUU6vRXPAa9mLXMTkwJZEHJt7LL5aJ/z8/O2KONx3L/ubP/r6+rtVI////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpgA/CBxIsOBADBgEeljoweAHDB06eIi4QICAhRwOdjAQ + kaMDCgwELOiQ8WGHAQYMFIjIgMEBCBEzQkSwoUCBCR0OSGigIKZJDQM2cKxwoAGBBx0ykISoIcOGiAcO + EFCAVCkHphueAtgaIYKFpks7NM0qFIDFCxk0kPyQQCzZiB0CbLAqsO1YslnTrq0r9m4GvSUHcoioobDa + vQU5DIar2KFgxYEHBgQAOw== + + + + + R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c + hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg + USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP + GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE + DQ8eBAjwYKZhhQQPFoRMuXJAADs= + + + + + R0lGODlhEAAQAIQAAP/99v/qaOvOSem4M+zSSv/ypf/ug//1w//2zP/xnv/te//zrf/0uv/41/nWdufB + MP/vkevTVf/rcv/0s//wlv/57OvRM//vi+/OQtaXIuuYEuvTLNyhJ+vHUP///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsCBBDwgTKizogUCEhwQIYLBgYYOHgR4cKPQA + oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG + IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB + D4UNMwz8ISAAOw== @@ -297,74 +365,6 @@ h58L4755nzwWACmRSEixWEynl0gQtXWDq9efcWesTLPb7RZmkg1AikQiUigU0uklEoREZl63mEkW430F g0EHv2mdHpgsyzvNJMvHQ/n9fofX69XJ7HK5bGaSrfBQPNXBzU92nQFgfwCJli/+LKS33wAAAABJRU5E rkJggg== - - - - - R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA - AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 - QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl - OoWKdGiDBgEBADs= - - - - - R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh - e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI - oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui - ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC - Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= - - - - - R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt - Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqwA/CBTooeDAgwg9DFjoAWHCAQEAFBjQ0CHBAQAEFLBQ - 8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW - GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R - v3gHemD5QK4HtBMSEyRplOTBgAA7 - - - - - R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// - /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY - JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP - jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA - Ow== - - - - - R0lGODlhEAAQAIQfAKxoR8VkLxFw1feVPITSWv+eQv7Qo0Cc6OyIN/v7+3PLTSCZEFy17Wa6XuT1x2bG - Q3nNUU6vRXPAa9mLXMTkwJZEHJt7LL5aJ/z8/O2KONx3L/ubP/r6+rtVI////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpgA/CBxIsOBADBgEeljoweAHDB06eIi4QICAhRwOdjAQ - kaMDCgwELOiQ8WGHAQYMFIjIgMEBCBEzQkSwoUCBCR0OSGigIKZJDQM2cKxwoAGBBx0ykISoIcOGiAcO - EFCAVCkHphueAtgaIYKFpks7NM0qFIDFCxk0kPyQQCzZiB0CbLAqsO1YslnTrq0r9m4GvSUHcoioobDa - vQU5DIar2KFgxYEHBgQAOw== - - - - - R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c - hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg - USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP - GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE - DQ8eBAjwYKZhhQQPFoRMuXJAADs= - - - - - R0lGODlhEAAQAIQAAP/99v/qaOvOSem4M+zSSv/ypf/ug//1w//2zP/xnv/te//zrf/0uv/41/nWdufB - MP/vkevTVf/rcv/0s//wlv/57OvRM//vi+/OQtaXIuuYEuvTLNyhJ+vHUP///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsCBBDwgTKizogUCEhwQIYLBgYYOHgR4cKPQA - oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG - IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB - D4UNMwz8ISAAOw== @@ -452,14 +452,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/UbM7/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPpV1p/FZ8q+d/yc2e - /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vt0b/vV7o9blnWyHc - gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3V8BMkV3Ox5B9WCCmAuKLrZUwLi - v2iNEH9c5vn/aobJnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu + /U7m/E+5XP8/92TF/3lzYj/UbMr/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPpV5p+FZ8q+d/yc2e + /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vtUb9vV7o9blnWyHc + gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi + v2iNEH9c5vn/SobxnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ - Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b7gd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP73Ha3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQA4wau8U++cuAAAAABJRU5ErkJggg== + Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bbgd7fQPo/MoaKnQGr + 2d+jAdUG1LhtIjtQcP637S3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQAb7qusmv24WgAAAABJRU5ErkJggg== diff --git a/SubProject/FCM0000/DSUser.Designer.cs b/SubProject/FCM0000/DSUser.Designer.cs index 52700a5..33c793d 100644 --- a/SubProject/FCM0000/DSUser.Designer.cs +++ b/SubProject/FCM0000/DSUser.Designer.cs @@ -357,6 +357,14 @@ namespace FCM0000 { private global::System.Data.DataColumn columnpermission; + private global::System.Data.DataColumn columnadvpurchase; + + private global::System.Data.DataColumn columnadvkisul; + + private global::System.Data.DataColumn columnmanagerinfo; + + private global::System.Data.DataColumn columndevinfo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public UserGroupDataTable() { @@ -422,6 +430,38 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn advpurchaseColumn { + get { + return this.columnadvpurchase; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn advkisulColumn { + get { + return this.columnadvkisul; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn managerinfoColumn { + get { + return this.columnmanagerinfo; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn devinfoColumn { + get { + return this.columndevinfo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -459,13 +499,17 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public UserGroupRow AddUserGroupRow(string dept, string gcode, string path_kj, int permission) { + public UserGroupRow AddUserGroupRow(string dept, string gcode, string path_kj, int permission, bool advpurchase, bool advkisul, string managerinfo, string devinfo) { UserGroupRow rowUserGroupRow = ((UserGroupRow)(this.NewRow())); object[] columnValuesArray = new object[] { dept, gcode, path_kj, - permission}; + permission, + advpurchase, + advkisul, + managerinfo, + devinfo}; rowUserGroupRow.ItemArray = columnValuesArray; this.Rows.Add(rowUserGroupRow); return rowUserGroupRow; @@ -499,6 +543,10 @@ namespace FCM0000 { this.columngcode = base.Columns["gcode"]; this.columnpath_kj = base.Columns["path_kj"]; this.columnpermission = base.Columns["permission"]; + this.columnadvpurchase = base.Columns["advpurchase"]; + this.columnadvkisul = base.Columns["advkisul"]; + this.columnmanagerinfo = base.Columns["managerinfo"]; + this.columndevinfo = base.Columns["devinfo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -512,6 +560,14 @@ namespace FCM0000 { base.Columns.Add(this.columnpath_kj); this.columnpermission = new global::System.Data.DataColumn("permission", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpermission); + this.columnadvpurchase = new global::System.Data.DataColumn("advpurchase", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnadvpurchase); + this.columnadvkisul = new global::System.Data.DataColumn("advkisul", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnadvkisul); + this.columnmanagerinfo = new global::System.Data.DataColumn("managerinfo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnmanagerinfo); + this.columndevinfo = new global::System.Data.DataColumn("devinfo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndevinfo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columndept}, true)); this.columndept.AllowDBNull = false; @@ -519,6 +575,8 @@ namespace FCM0000 { this.columndept.MaxLength = 100; this.columngcode.MaxLength = 10; this.columnpath_kj.MaxLength = 100; + this.columnmanagerinfo.MaxLength = 255; + this.columndevinfo.MaxLength = 255; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1727,6 +1785,70 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool advpurchase { + get { + if (this.IsadvpurchaseNull()) { + return false; + } + else { + return ((bool)(this[this.tableUserGroup.advpurchaseColumn])); + } + } + set { + this[this.tableUserGroup.advpurchaseColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool advkisul { + get { + if (this.IsadvkisulNull()) { + return false; + } + else { + return ((bool)(this[this.tableUserGroup.advkisulColumn])); + } + } + set { + this[this.tableUserGroup.advkisulColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string managerinfo { + get { + if (this.IsmanagerinfoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserGroup.managerinfoColumn])); + } + } + set { + this[this.tableUserGroup.managerinfoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string devinfo { + get { + if (this.IsdevinfoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserGroup.devinfoColumn])); + } + } + set { + this[this.tableUserGroup.devinfoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsgcodeNull() { @@ -1762,6 +1884,54 @@ namespace FCM0000 { public void SetpermissionNull() { this[this.tableUserGroup.permissionColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsadvpurchaseNull() { + return this.IsNull(this.tableUserGroup.advpurchaseColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetadvpurchaseNull() { + this[this.tableUserGroup.advpurchaseColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsadvkisulNull() { + return this.IsNull(this.tableUserGroup.advkisulColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetadvkisulNull() { + this[this.tableUserGroup.advkisulColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsmanagerinfoNull() { + return this.IsNull(this.tableUserGroup.managerinfoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetmanagerinfoNull() { + this[this.tableUserGroup.managerinfoColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsdevinfoNull() { + return this.IsNull(this.tableUserGroup.devinfoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetdevinfoNull() { + this[this.tableUserGroup.devinfoColumn] = global::System.Convert.DBNull; + } } /// @@ -2892,10 +3062,14 @@ namespace FCM0000.DSUserTableAdapters { tableMapping.ColumnMappings.Add("gcode", "gcode"); tableMapping.ColumnMappings.Add("path_kj", "path_kj"); tableMapping.ColumnMappings.Add("permission", "permission"); + tableMapping.ColumnMappings.Add("advpurchase", "advpurchase"); + tableMapping.ColumnMappings.Add("advkisul", "advkisul"); + tableMapping.ColumnMappings.Add("managerinfo", "managerinfo"); + tableMapping.ColumnMappings.Add("devinfo", "devinfo"); 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 [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -2904,25 +3078,40 @@ namespace FCM0000.DSUserTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advpurchase", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advkisul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_managerinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_devinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", 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 [UserGroup] ([dept], [gcode], [path_kj], [permission]) VALUES (@dept," + - " @gcode, @path_kj, @permission);\r\nSELECT dept, gcode, path_kj, permission FROM U" + - "serGroup WHERE (dept = @dept)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [permission], [advpurchase], [advkisul], [managerinfo], [devinfo]) VALUES (@dept, @gcode, @path_kj, @permission, @advpurchase, @advkisul, @managerinfo, @devinfo); +SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", 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 [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission))); -SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission, [advpurchase] = @advpurchase, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo))); +SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -2930,6 +3119,14 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advpurchase", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advkisul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_managerinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_devinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2942,11 +3139,18 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT dept, gcode, path_kj, permission\r\nFROM UserGroup"; + this._commandCollection[0].CommandText = "SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev" + + "info\r\nFROM UserGroup"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "SELECT advkisul, advpurchase, dept, devinfo, gcode, managerinfo, path_kj, permis" + + "sion\r\nFROM UserGroup\r\nWHERE (gcode = @gcode)"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2973,6 +3177,42 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByID(DSUser.UserGroupDataTable dataTable, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + 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", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DSUser.UserGroupDataTable GetByID(string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + DSUser.UserGroupDataTable dataTable = new DSUser.UserGroupDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -3006,7 +3246,7 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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(string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_permission) { + public virtual int Delete(string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_permission, global::System.Nullable Original_advpurchase, global::System.Nullable Original_advkisul, string Original_managerinfo, string Original_devinfo) { if ((Original_dept == null)) { throw new global::System.ArgumentNullException("Original_dept"); } @@ -3037,6 +3277,38 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; } + if ((Original_advpurchase.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[8].Value = ((bool)(Original_advpurchase.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; + } + if ((Original_advkisul.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[10].Value = ((bool)(Original_advkisul.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; + } + if ((Original_managerinfo == null)) { + this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_managerinfo)); + } + if ((Original_devinfo == null)) { + this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_devinfo)); + } 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)) { @@ -3057,7 +3329,7 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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(string dept, string gcode, string path_kj, global::System.Nullable permission) { + public virtual int Insert(string dept, string gcode, string path_kj, global::System.Nullable permission, global::System.Nullable advpurchase, global::System.Nullable advkisul, string managerinfo, string devinfo) { if ((dept == null)) { throw new global::System.ArgumentNullException("dept"); } @@ -3082,6 +3354,30 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; else { this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((advpurchase.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[4].Value = ((bool)(advpurchase.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; + } + if ((advkisul.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[5].Value = ((bool)(advkisul.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; + } + if ((managerinfo == null)) { + this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[6].Value = ((string)(managerinfo)); + } + if ((devinfo == null)) { + this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[7].Value = ((string)(devinfo)); + } 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)) { @@ -3102,7 +3398,23 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string dept, string gcode, string path_kj, global::System.Nullable permission, string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_permission) { + public virtual int Update( + string dept, + string gcode, + string path_kj, + global::System.Nullable permission, + global::System.Nullable advpurchase, + global::System.Nullable advkisul, + string managerinfo, + string devinfo, + string Original_dept, + string Original_gcode, + string Original_path_kj, + global::System.Nullable Original_permission, + global::System.Nullable Original_advpurchase, + global::System.Nullable Original_advkisul, + string Original_managerinfo, + string Original_devinfo) { if ((dept == null)) { throw new global::System.ArgumentNullException("dept"); } @@ -3127,36 +3439,92 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; else { this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((advpurchase.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[4].Value = ((bool)(advpurchase.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; + } + if ((advkisul.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[5].Value = ((bool)(advkisul.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; + } + if ((managerinfo == null)) { + this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(managerinfo)); + } + if ((devinfo == null)) { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(devinfo)); + } if ((Original_dept == null)) { throw new global::System.ArgumentNullException("Original_dept"); } else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_dept)); } if ((Original_gcode == null)) { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_gcode)); - } - if ((Original_path_kj == null)) { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_path_kj)); - } - if ((Original_permission.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_permission.Value)); - } - else { 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_gcode)); + } + if ((Original_path_kj == 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_path_kj)); + } + if ((Original_permission.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_permission.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + } + if ((Original_advpurchase.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_advpurchase.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + } + if ((Original_advkisul.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((bool)(Original_advkisul.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + } + if ((Original_managerinfo == null)) { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_managerinfo)); + } + if ((Original_devinfo == null)) { + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_devinfo)); + } 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)) { @@ -3177,8 +3545,8 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept)"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string gcode, string path_kj, global::System.Nullable permission, string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_permission) { - return this.Update(Original_dept, gcode, path_kj, permission, Original_dept, Original_gcode, Original_path_kj, Original_permission); + public virtual int Update(string gcode, string path_kj, global::System.Nullable permission, global::System.Nullable advpurchase, global::System.Nullable advkisul, string managerinfo, string devinfo, string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_permission, global::System.Nullable Original_advpurchase, global::System.Nullable Original_advkisul, string Original_managerinfo, string Original_devinfo) { + return this.Update(Original_dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, Original_dept, Original_gcode, Original_path_kj, Original_permission, Original_advpurchase, Original_advkisul, Original_managerinfo, Original_devinfo); } } diff --git a/SubProject/FCM0000/DSUser.xsd b/SubProject/FCM0000/DSUser.xsd index 77b4409..fe05238 100644 --- a/SubProject/FCM0000/DSUser.xsd +++ b/SubProject/FCM0000/DSUser.xsd @@ -9,10 +9,10 @@ - + - DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission))) + DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo))) @@ -21,37 +21,53 @@ + + + + + + + + - INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [permission]) VALUES (@dept, @gcode, @path_kj, @permission); -SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept) + INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [permission], [advpurchase], [advkisul], [managerinfo], [devinfo]) VALUES (@dept, @gcode, @path_kj, @permission, @advpurchase, @advkisul, @managerinfo, @devinfo); +SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept) + + + + - SELECT dept, gcode, path_kj, permission + SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup - UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission))); -SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept) + UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission, [advpurchase] = @advpurchase, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo))); +SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept) + + + + @@ -59,6 +75,14 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept) + + + + + + + + @@ -69,8 +93,25 @@ SELECT dept, gcode, path_kj, permission FROM UserGroup WHERE (dept = @dept) + + + + - + + + + + SELECT advkisul, advpurchase, dept, devinfo, gcode, managerinfo, path_kj, permission +FROM UserGroup +WHERE (gcode = @gcode) + + + + + + + @@ -425,6 +466,22 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche + + + + + + + + + + + + + + + + @@ -584,7 +641,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche - + diff --git a/SubProject/FCM0000/DSUser.xss b/SubProject/FCM0000/DSUser.xss index bb5c4b7..b49349d 100644 --- a/SubProject/FCM0000/DSUser.xss +++ b/SubProject/FCM0000/DSUser.xss @@ -4,11 +4,11 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + \ No newline at end of file diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index 82cd842..964d165 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -275,6 +275,12 @@ fUserGroup.cs + + Form + + + fUserGroupDev.cs + Form @@ -426,6 +432,9 @@ fUserGroup.cs + + fUserGroupDev.cs + fCustoms.cs diff --git a/SubProject/FCM0000/User/fUserGroup.Designer.cs b/SubProject/FCM0000/User/fUserGroup.Designer.cs index 3547c17..dbbe907 100644 --- a/SubProject/FCM0000/User/fUserGroup.Designer.cs +++ b/SubProject/FCM0000/User/fUserGroup.Designer.cs @@ -1,417 +1,253 @@ -namespace FCM0000 -{ - partial class fUserGroup - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserGroup)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dSUser = new FCM0000.DSUser(); - this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter(); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - 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.customsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); - this.tbFind = new System.Windows.Forms.ToolStripTextBox(); - this.btFind = new System.Windows.Forms.ToolStripButton(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.권한설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.bsStaff = new System.Windows.Forms.BindingSource(this.components); - this.ta = new FCM0000.DSUserTableAdapters.UserGroupTableAdapter(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - this.cm1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit(); - this.SuspendLayout(); - // - // bs - // - this.bs.DataMember = "UserGroup"; - this.bs.DataSource = this.dSUser; - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // dSUser - // - this.dSUser.DataSetName = "DSUser"; - this.dSUser.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // taStaff - // - this.taStaff.ClearBeforeFill = true; - // - // bn - // - this.bn.AddNewItem = this.bindingNavigatorAddNewItem; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.bindingNavigatorAddNewItem, - this.bindingNavigatorDeleteItem, - this.customsBindingNavigatorSaveItem, - this.toolStripSeparator1, - this.toolStripLabel2, - this.tbFind, - this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 623); - 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(652, 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)"; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorDeleteItem - // - 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); - // - // customsBindingNavigatorSaveItem - // - this.customsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("customsBindingNavigatorSaveItem.Image"))); - this.customsBindingNavigatorSaveItem.Name = "customsBindingNavigatorSaveItem"; - this.customsBindingNavigatorSaveItem.Size = new System.Drawing.Size(66, 22); - this.customsBindingNavigatorSaveItem.Text = "저장(&S)"; - this.customsBindingNavigatorSaveItem.Click += new System.EventHandler(this.customsBindingNavigatorSaveItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // toolStripLabel2 - // - this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel2.Text = "검색"; - // - // tbFind - // - this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Name = "tbFind"; - this.tbFind.Size = new System.Drawing.Size(100, 25); - this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); - // - // btFind - // - this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); - this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btFind.Name = "btFind"; - this.btFind.Size = new System.Drawing.Size(23, 22); - this.btFind.Text = "toolStripButton2"; - this.btFind.Click += new System.EventHandler(this.btFind_Click); - // - // cm1 - // - this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F); - this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.columnSizeToolStripMenuItem, - this.toolStripMenuItem1, - this.권한설정ToolStripMenuItem}); - this.cm1.Name = "cm1"; - this.cm1.Size = new System.Drawing.Size(203, 116); - // - // columnSizeToolStripMenuItem - // - this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveToolStripMenuItem, - this.loadToolStripMenuItem}); - this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(202, 42); - this.columnSizeToolStripMenuItem.Text = "열 너비"; - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(292, 42); - this.saveToolStripMenuItem.Text = "현재 상태 저장"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // loadToolStripMenuItem - // - this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); - this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(292, 42); - this.loadToolStripMenuItem.Text = "너비값 불러오기"; - this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(199, 6); - // - // 권한설정ToolStripMenuItem - // - this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; - this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(202, 42); - this.권한설정ToolStripMenuItem.Text = "권한설정"; - this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); - // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.Location = new System.Drawing.Point(0, 0); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(652, 623); - this.fpSpread1.TabIndex = 2; - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 4; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "부서명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "부서코드"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "권한"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "dept"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "부서명"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "gcode"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "부서코드"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "path_kj"; - 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).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "permission"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "권한"; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 88F; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // fUserGroup - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(652, 648); - this.ContextMenuStrip = this.cm1; - this.Controls.Add(this.fpSpread1); - this.Controls.Add(this.bn); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "fUserGroup"; - this.Text = "사용자 그룹"; - this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSUser)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - this.cm1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.BindingSource bs; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton customsBindingNavigatorSaveItem; - private System.Windows.Forms.ContextMenuStrip cm1; - private FarPoint.Win.Spread.FpSpread fpSpread1; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripLabel toolStripLabel2; - private System.Windows.Forms.ToolStripTextBox tbFind; - private System.Windows.Forms.ToolStripButton btFind; - private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; - private System.Windows.Forms.BindingSource bsStaff; - private dsMSSQLTableAdapters.StaffTableAdapter taStaff; - private DSUser dSUser; - private DSUserTableAdapters.UserGroupTableAdapter ta; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem 권한설정ToolStripMenuItem; - } +namespace FCM0000 +{ + partial class fUserGroup + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.Label deptLabel; + System.Windows.Forms.Label gcodeLabel; + System.Windows.Forms.Label managerinfoLabel; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserGroup)); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSUser = new FCM0000.DSUser(); + this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.customsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.bsStaff = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FCM0000.DSUserTableAdapters.UserGroupTableAdapter(); + this.tableAdapterManager = new FCM0000.DSUserTableAdapters.TableAdapterManager(); + this.tbName = new System.Windows.Forms.TextBox(); + this.tbGcode = new System.Windows.Forms.TextBox(); + this.tbManager = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + deptLabel = new System.Windows.Forms.Label(); + gcodeLabel = new System.Windows.Forms.Label(); + managerinfoLabel = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit(); + this.SuspendLayout(); + // + // deptLabel + // + deptLabel.AutoSize = true; + deptLabel.Location = new System.Drawing.Point(67, 96); + deptLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + deptLabel.Name = "deptLabel"; + deptLabel.Size = new System.Drawing.Size(98, 37); + deptLabel.TabIndex = 1; + deptLabel.Text = "부서명"; + // + // gcodeLabel + // + gcodeLabel.AutoSize = true; + gcodeLabel.Location = new System.Drawing.Point(40, 17); + gcodeLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + gcodeLabel.Name = "gcodeLabel"; + gcodeLabel.Size = new System.Drawing.Size(125, 37); + gcodeLabel.TabIndex = 3; + gcodeLabel.Text = "부서코드"; + // + // managerinfoLabel + // + managerinfoLabel.AutoSize = true; + managerinfoLabel.Location = new System.Drawing.Point(13, 178); + managerinfoLabel.Name = "managerinfoLabel"; + managerinfoLabel.Size = new System.Drawing.Size(152, 37); + managerinfoLabel.TabIndex = 9; + managerinfoLabel.Text = "관리자정보"; + // + // bs + // + this.bs.DataMember = "UserGroup"; + this.bs.DataSource = this.dSUser; + // + // dSUser + // + this.dSUser.DataSetName = "DSUser"; + this.dSUser.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // taStaff + // + this.taStaff.ClearBeforeFill = true; + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = null; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.ImageScalingSize = new System.Drawing.Size(40, 40); + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.customsBindingNavigatorSaveItem}); + this.bn.Location = new System.Drawing.Point(0, 266); + this.bn.MoveFirstItem = null; + this.bn.MoveLastItem = null; + this.bn.MoveNextItem = null; + this.bn.MovePreviousItem = null; + this.bn.Name = "bn"; + this.bn.Padding = new System.Windows.Forms.Padding(0, 0, 2, 0); + this.bn.PositionItem = null; + this.bn.Size = new System.Drawing.Size(709, 47); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // customsBindingNavigatorSaveItem + // + this.customsBindingNavigatorSaveItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.customsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("customsBindingNavigatorSaveItem.Image"))); + this.customsBindingNavigatorSaveItem.Name = "customsBindingNavigatorSaveItem"; + this.customsBindingNavigatorSaveItem.Size = new System.Drawing.Size(90, 44); + this.customsBindingNavigatorSaveItem.Text = "저장(&S)"; + this.customsBindingNavigatorSaveItem.Click += new System.EventHandler(this.customsBindingNavigatorSaveItem_Click); + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tableAdapterManager + // + this.tableAdapterManager.AuthTableAdapter = null; + this.tableAdapterManager.BackupDataSetBeforeUpdate = false; + this.tableAdapterManager.UpdateOrder = FCM0000.DSUserTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tableAdapterManager.UserGroupTableAdapter = this.ta; + this.tableAdapterManager.UsersTableAdapter = null; + // + // tbName + // + this.tbName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "dept", true)); + this.tbName.Location = new System.Drawing.Point(177, 94); + this.tbName.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); + this.tbName.Name = "tbName"; + this.tbName.Size = new System.Drawing.Size(521, 43); + this.tbName.TabIndex = 2; + // + // tbGcode + // + this.tbGcode.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "gcode", true)); + this.tbGcode.Location = new System.Drawing.Point(177, 14); + this.tbGcode.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); + this.tbGcode.Name = "tbGcode"; + this.tbGcode.ReadOnly = true; + this.tbGcode.Size = new System.Drawing.Size(521, 43); + this.tbGcode.TabIndex = 4; + // + // tbManager + // + this.tbManager.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "managerinfo", true)); + this.tbManager.Location = new System.Drawing.Point(177, 175); + this.tbManager.Name = "tbManager"; + this.tbManager.Size = new System.Drawing.Size(521, 43); + this.tbManager.TabIndex = 10; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(178, 221); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(291, 19); + this.label1.TabIndex = 11; + this.label1.Text = "로그인 화면 하단에 해당 정보가 표시 됩니다"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label2.Location = new System.Drawing.Point(178, 142); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(249, 19); + this.label2.TabIndex = 11; + this.label2.Text = "이름 변경 후 다시 로그인 해야 합니다"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label3.Location = new System.Drawing.Point(178, 61); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(265, 19); + this.label3.TabIndex = 12; + this.label3.Text = "그룹식별 코드로서 \"변경\"이 불가 합니다"; + // + // fUserGroup + // + this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 37F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(709, 313); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(managerinfoLabel); + this.Controls.Add(this.tbManager); + this.Controls.Add(deptLabel); + this.Controls.Add(this.tbName); + this.Controls.Add(gcodeLabel); + this.Controls.Add(this.tbGcode); + this.Controls.Add(this.bn); + this.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fUserGroup"; + this.Text = "사용자 그룹"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSUser)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripButton customsBindingNavigatorSaveItem; + private System.Windows.Forms.BindingSource bsStaff; + private dsMSSQLTableAdapters.StaffTableAdapter taStaff; + private DSUser dSUser; + private DSUserTableAdapters.UserGroupTableAdapter ta; + private DSUserTableAdapters.TableAdapterManager tableAdapterManager; + private System.Windows.Forms.TextBox tbName; + private System.Windows.Forms.TextBox tbGcode; + private System.Windows.Forms.TextBox tbManager; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + } } \ No newline at end of file diff --git a/SubProject/FCM0000/User/fUserGroup.cs b/SubProject/FCM0000/User/fUserGroup.cs index 8606362..b96fb33 100644 --- a/SubProject/FCM0000/User/fUserGroup.cs +++ b/SubProject/FCM0000/User/fUserGroup.cs @@ -9,37 +9,25 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fUserGroup : FCOMMON.fBase + public partial class fUserGroup : Form { - string fn_fpcolsize1 = ""; public fUserGroup() { InitializeComponent(); Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; - fn_fpcolsize1 = FCOMMON.Util.MakeFilePath(FCOMMON.Util.CurrentPath, "formSetting", "fp1_" + this.Name + ".ini"); } private void __Load(object sender, EventArgs e) { - refreshData(); - this.dSUser.UserGroup.TableNewRow += Customs_TableNewRow; } - void Customs_TableNewRow(object sender, DataTableNewRowEventArgs e) - { - //e.Row["wuid"] = FCOMMON.info.Login.no; - //e.Row["wdate"] = DateTime.Now; - //e.Row["cid"] = selcectIDX; - } - - + void refreshData() { try { - this.ta.Fill(this.dSUser.UserGroup); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize1); + this.ta.FillByID(this.dSUser.UserGroup, FCOMMON.info.Login.gcode); }catch (Exception ex) { @@ -56,118 +44,13 @@ namespace FCM0000 { FCOMMON.Util.MsgI("변경된 내역이 없습니다."); } - else FCOMMON.Util.MsgI(string.Format("{0} 건의 자료가 업데이트 되었습니다.",cnt)); - - } - - private void toolStripButton1_Click(object sender, EventArgs e) - { - refreshData(); - } - - private void autoResizeColummsToolStripMenuItem_Click(object sender, EventArgs e) - { - this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true; - - for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) - this.fpSpread1.ActiveSheet.SetRowHeight(i, 25); - } - - private void btFind_Click(object sender, EventArgs e) - { - var search = tbFind.Text.Trim(); - search = search.Replace("*", "x"); - if (tbFind.Text != search) tbFind.Text = search; - try + else { - if (search.isEmpty()) - { - this.bs.Filter = ""; - tbFind.BackColor = Color.White; - } - else - { - search = search.Replace("'", "''"); - string filter = "dept like ?"; - filter = filter.Replace("?", "'%" + search + "%'"); - this.bs.Filter = filter; - tbFind.BackColor = Color.Lime; - } - tbFind.SelectAll(); - tbFind.Focus(); - } - catch (Exception ex) - { - this.tbFind.BackColor = Color.Tomato; - FCOMMON.Util.MsgE(ex.Message); + FCOMMON.Util.MsgI(string.Format("{0} 건의 자료가 업데이트 되었습니다.\n변경된 정보는 다음 로그인시 적용 됩니다", cnt)); + DialogResult = DialogResult.OK; } + } - private void tbFind_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) btFind.PerformClick(); - } - - private void autoToolStripMenuItem_Click(object sender, EventArgs e) - { - this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true; - - for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) - this.fpSpread1.ActiveSheet.SetRowHeight(i, 25); - } - - private void resetToolStripMenuItem_Click(object sender, EventArgs e) - { - foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) - { - col.Width = 100; - } - } - - private void saveToolStripMenuItem_Click(object sender, EventArgs e) - { - FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize1); - } - - private void loadToolStripMenuItem_Click(object sender, EventArgs e) - { - FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize1); - } - - - private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as DSUser.UserGroupRow; - if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) this.bs.RemoveCurrent(); - - var dlg =FCOMMON.Util.MsgQ("다음 자료를 삭제하시겠습니까?"); - if(dlg == System.Windows.Forms.DialogResult.Yes) - { - this.bs.RemoveCurrent(); - } - } - - //private int selcectIDX = -1; - private void bs_CurrentChanged(object sender, EventArgs e) - { - - } - - private void 권한설정ToolStripMenuItem_Click(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as DSUser.UserGroupRow; - var f = new fUserGroupPermission(dr.permission); - if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - dr.permission = f.permission; - dr.EndEdit(); - } - } - - } } diff --git a/SubProject/FCM0000/User/fUserGroup.resx b/SubProject/FCM0000/User/fUserGroup.resx index 4af3325..ddf9a69 100644 --- a/SubProject/FCM0000/User/fUserGroup.resx +++ b/SubProject/FCM0000/User/fUserGroup.resx @@ -1,247 +1,161 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 398, 17 - - - 311, 17 - - - 81, 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== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo - dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 - qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO - b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY - hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 - 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon - GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== - - - - 147, 17 - - - - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh - e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw - QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK - HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC - un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= - - - - - R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 - 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ - IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj - SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG - vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - - - 551, 17 - - - 222, 17 - - - 489, 17 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + + False + + + False + + + 17, 17 + + + 323, 17 + + + 323, 17 + + + 236, 17 + + + 81, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + 147, 17 + + + 414, 17 + + + 476, 17 + \ No newline at end of file diff --git a/SubProject/FCM0000/User/fUserGroupDev.Designer.cs b/SubProject/FCM0000/User/fUserGroupDev.Designer.cs new file mode 100644 index 0000000..9f26935 --- /dev/null +++ b/SubProject/FCM0000/User/fUserGroupDev.Designer.cs @@ -0,0 +1,417 @@ +namespace FCM0000 +{ + partial class fUserGroupDev + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserGroupDev)); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSUser = new FCM0000.DSUser(); + this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + 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.customsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbFind = new System.Windows.Forms.ToolStripTextBox(); + this.btFind = new System.Windows.Forms.ToolStripButton(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.권한설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.bsStaff = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FCM0000.DSUserTableAdapters.UserGroupTableAdapter(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + this.cm1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit(); + this.SuspendLayout(); + // + // bs + // + this.bs.DataMember = "UserGroup"; + this.bs.DataSource = this.dSUser; + this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); + // + // dSUser + // + this.dSUser.DataSetName = "DSUser"; + this.dSUser.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // taStaff + // + this.taStaff.ClearBeforeFill = true; + // + // bn + // + this.bn.AddNewItem = this.bindingNavigatorAddNewItem; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2, + this.bindingNavigatorAddNewItem, + this.bindingNavigatorDeleteItem, + this.customsBindingNavigatorSaveItem, + this.toolStripSeparator1, + this.toolStripLabel2, + this.tbFind, + this.btFind}); + this.bn.Location = new System.Drawing.Point(0, 623); + 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(652, 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)"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorDeleteItem + // + 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); + // + // customsBindingNavigatorSaveItem + // + this.customsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("customsBindingNavigatorSaveItem.Image"))); + this.customsBindingNavigatorSaveItem.Name = "customsBindingNavigatorSaveItem"; + this.customsBindingNavigatorSaveItem.Size = new System.Drawing.Size(66, 22); + this.customsBindingNavigatorSaveItem.Text = "저장(&S)"; + this.customsBindingNavigatorSaveItem.Click += new System.EventHandler(this.customsBindingNavigatorSaveItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel2.Text = "검색"; + // + // tbFind + // + this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Name = "tbFind"; + this.tbFind.Size = new System.Drawing.Size(100, 25); + this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); + // + // btFind + // + this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); + this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(23, 22); + this.btFind.Text = "toolStripButton2"; + this.btFind.Click += new System.EventHandler(this.btFind_Click); + // + // cm1 + // + this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F); + this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.columnSizeToolStripMenuItem, + this.toolStripMenuItem1, + this.권한설정ToolStripMenuItem}); + this.cm1.Name = "cm1"; + this.cm1.Size = new System.Drawing.Size(203, 116); + // + // columnSizeToolStripMenuItem + // + this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveToolStripMenuItem, + this.loadToolStripMenuItem}); + this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.columnSizeToolStripMenuItem.Text = "열 너비"; + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.Size = new System.Drawing.Size(292, 42); + this.saveToolStripMenuItem.Text = "현재 상태 저장"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // loadToolStripMenuItem + // + this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); + this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; + this.loadToolStripMenuItem.Size = new System.Drawing.Size(292, 42); + this.loadToolStripMenuItem.Text = "너비값 불러오기"; + this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(199, 6); + // + // 권한설정ToolStripMenuItem + // + this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; + this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.권한설정ToolStripMenuItem.Text = "권한설정"; + this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); + // + // fpSpread1 + // + this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.Location = new System.Drawing.Point(0, 0); + this.fpSpread1.Name = "fpSpread1"; + this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { + this.fpSpread1_Sheet1}); + this.fpSpread1.Size = new System.Drawing.Size(652, 623); + this.fpSpread1.TabIndex = 2; + // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 4; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "부서명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "부서코드"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "권한"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "dept"; + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "부서명"; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "gcode"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "부서코드"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "path_kj"; + 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).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "permission"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "권한"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 88F; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // fUserGroup + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(652, 648); + this.ContextMenuStrip = this.cm1; + this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.bn); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fUserGroup"; + this.Text = "사용자 그룹"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSUser)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + this.cm1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.ToolStripButton customsBindingNavigatorSaveItem; + private System.Windows.Forms.ContextMenuStrip cm1; + private FarPoint.Win.Spread.FpSpread fpSpread1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripTextBox tbFind; + private System.Windows.Forms.ToolStripButton btFind; + private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; + private System.Windows.Forms.BindingSource bsStaff; + private dsMSSQLTableAdapters.StaffTableAdapter taStaff; + private DSUser dSUser; + private DSUserTableAdapters.UserGroupTableAdapter ta; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem 권한설정ToolStripMenuItem; + } +} \ No newline at end of file diff --git a/SubProject/FCM0000/User/fUserGroupDev.cs b/SubProject/FCM0000/User/fUserGroupDev.cs new file mode 100644 index 0000000..ef6ca0f --- /dev/null +++ b/SubProject/FCM0000/User/fUserGroupDev.cs @@ -0,0 +1,173 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FCM0000 +{ + public partial class fUserGroupDev : FCOMMON.fBase + { + string fn_fpcolsize1 = ""; + public fUserGroupDev() + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + fn_fpcolsize1 = FCOMMON.Util.MakeFilePath(FCOMMON.Util.CurrentPath, "formSetting", "fp1_" + this.Name + ".ini"); + } + + private void __Load(object sender, EventArgs e) + { + + refreshData(); + this.dSUser.UserGroup.TableNewRow += Customs_TableNewRow; + } + + void Customs_TableNewRow(object sender, DataTableNewRowEventArgs e) + { + //e.Row["wuid"] = FCOMMON.info.Login.no; + //e.Row["wdate"] = DateTime.Now; + //e.Row["cid"] = selcectIDX; + } + + + void refreshData() + { + try + { + this.ta.Fill(this.dSUser.UserGroup); + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize1); + + }catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void customsBindingNavigatorSaveItem_Click(object sender, EventArgs e) + { + this.Validate(); + this.bs.EndEdit(); + int cnt = this.ta.Update(this.dSUser.UserGroup); + if (cnt < 1) + { + FCOMMON.Util.MsgI("변경된 내역이 없습니다."); + } + else FCOMMON.Util.MsgI(string.Format("{0} 건의 자료가 업데이트 되었습니다.",cnt)); + + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + refreshData(); + } + + private void autoResizeColummsToolStripMenuItem_Click(object sender, EventArgs e) + { + this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true; + + for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) + this.fpSpread1.ActiveSheet.SetRowHeight(i, 25); + } + + private void btFind_Click(object sender, EventArgs e) + { + var search = tbFind.Text.Trim(); + search = search.Replace("*", "x"); + if (tbFind.Text != search) tbFind.Text = search; + try + { + if (search.isEmpty()) + { + this.bs.Filter = ""; + tbFind.BackColor = Color.White; + } + else + { + search = search.Replace("'", "''"); + string filter = "dept like ?"; + filter = filter.Replace("?", "'%" + search + "%'"); + this.bs.Filter = filter; + tbFind.BackColor = Color.Lime; + } + tbFind.SelectAll(); + tbFind.Focus(); + } + catch (Exception ex) + { + this.tbFind.BackColor = Color.Tomato; + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void tbFind_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) btFind.PerformClick(); + } + + private void autoToolStripMenuItem_Click(object sender, EventArgs e) + { + this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true; + + for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) + this.fpSpread1.ActiveSheet.SetRowHeight(i, 25); + } + + private void resetToolStripMenuItem_Click(object sender, EventArgs e) + { + foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) + { + col.Width = 100; + } + } + + private void saveToolStripMenuItem_Click(object sender, EventArgs e) + { + FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize1); + } + + private void loadToolStripMenuItem_Click(object sender, EventArgs e) + { + FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize1); + } + + + private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as DSUser.UserGroupRow; + if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) this.bs.RemoveCurrent(); + + var dlg =FCOMMON.Util.MsgQ("다음 자료를 삭제하시겠습니까?"); + if(dlg == System.Windows.Forms.DialogResult.Yes) + { + this.bs.RemoveCurrent(); + } + } + + //private int selcectIDX = -1; + private void bs_CurrentChanged(object sender, EventArgs e) + { + + } + + private void 권한설정ToolStripMenuItem_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as DSUser.UserGroupRow; + var f = new fUserGroupPermission(dr.permission); + if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + dr.permission = f.permission; + dr.EndEdit(); + } + } + + + } +} diff --git a/SubProject/FCM0000/User/fUserGroupDev.resx b/SubProject/FCM0000/User/fUserGroupDev.resx new file mode 100644 index 0000000..a3f7cee --- /dev/null +++ b/SubProject/FCM0000/User/fUserGroupDev.resx @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 398, 17 + + + 311, 17 + + + 81, 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== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + + + 147, 17 + + + + R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh + e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw + QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK + HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC + un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= + + + + + R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 + 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ + IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj + SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG + vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== + + + + 551, 17 + + + 222, 17 + + + 489, 17 + + \ No newline at end of file