From f5b0e77af30c8d9211fc532cd76642f387a4c60a Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 2 Feb 2023 20:47:21 +0900 Subject: [PATCH] ... --- JobReportMailService/fSendMail.cs | 2 - Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.Designer.cs | 55 +- Project/fMain.cs | 35 +- Project/fMain.resx | 12 +- SubProject/FBS0000/FBS0000.csproj | 3 + .../FBS0000/Holiday/fHolyday.Designer.cs | 63 +- SubProject/FBS0000/Holiday/fHolyday.cs | 47 +- SubProject/FBS0000/Holiday/fHolyday.resx | 98 +-- SubProject/FBS0000/dsMSSQL.Designer.cs | 606 ++++++++++++++++++ SubProject/FBS0000/dsMSSQL.cs | 11 + SubProject/FBS0000/dsMSSQL.xsd | 65 +- SubProject/FBS0000/dsMSSQL.xss | 19 +- SubProject/FEQ0000/FEQ0000.csproj | 3 + .../Project/fPartBuyStatus.Designer.cs | 254 ++++---- .../FPJ0000/Project/fPartBuyStatus.resx | 28 +- .../FPJ0000/Project/fProjectList.Designer.cs | 8 +- SubProject/FPJ0000/Project/fProjectList.cs | 2 +- SubProject/FPJ0000/Project/fProjectList.resx | 20 +- 19 files changed, 1047 insertions(+), 288 deletions(-) create mode 100644 SubProject/FBS0000/dsMSSQL.cs diff --git a/JobReportMailService/fSendMail.cs b/JobReportMailService/fSendMail.cs index 45dee3f..809d1ca 100644 --- a/JobReportMailService/fSendMail.cs +++ b/JobReportMailService/fSendMail.cs @@ -110,7 +110,6 @@ namespace JobReportMailService "
메일이 잘못 전송 되었다면 [chikyun.kim@amkor.co.kr] 로 문의 주시기 바랍니다" + "

"; - //전송을 해야 함 var mc = new System.Net.Mail.SmtpClient("10.101.10.6"); var msg = new System.Net.Mail.MailMessage @@ -119,7 +118,6 @@ namespace JobReportMailService dr.subject, body); - if (list_bcc != "") msg.Bcc.Add(list_bcc); if (list_cc != "") msg.CC.Add(list_cc); msg.IsBodyHtml = true; diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 9851ef6..cd5f551 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.30.1900")] -[assembly: AssemblyFileVersion("23.01.30.1900")] +[assembly: AssemblyVersion("23.02.02.2000")] +[assembly: AssemblyFileVersion("23.02.02.2000")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 79e9047..f596843 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -57,6 +57,9 @@ this.메일양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mn_purchase = new System.Windows.Forms.ToolStripMenuItem(); + this.일반구매ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cR구매ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.sPR구매ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mn_project = new System.Windows.Forms.ToolStripMenuItem(); this.목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.구매진행현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -77,6 +80,7 @@ this.aLLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.라인코드관리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.휴일연장근무집계표출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -139,7 +143,6 @@ 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.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -361,12 +364,39 @@ // // mn_purchase // + this.mn_purchase.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.일반구매ToolStripMenuItem, + this.cR구매ToolStripMenuItem, + this.sPR구매ToolStripMenuItem}); this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image"))); this.mn_purchase.Name = "mn_purchase"; this.mn_purchase.Size = new System.Drawing.Size(203, 24); this.mn_purchase.Text = "구매신청"; this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click); // + // 일반구매ToolStripMenuItem + // + this.일반구매ToolStripMenuItem.Name = "일반구매ToolStripMenuItem"; + this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.일반구매ToolStripMenuItem.Text = "NR 구매"; + this.일반구매ToolStripMenuItem.Click += new System.EventHandler(this.일반구매ToolStripMenuItem_Click); + // + // cR구매ToolStripMenuItem + // + this.cR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Blue; + this.cR구매ToolStripMenuItem.Name = "cR구매ToolStripMenuItem"; + this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.cR구매ToolStripMenuItem.Text = "CR 구매"; + this.cR구매ToolStripMenuItem.Click += new System.EventHandler(this.cR구매ToolStripMenuItem_Click); + // + // sPR구매ToolStripMenuItem + // + this.sPR구매ToolStripMenuItem.Enabled = false; + this.sPR구매ToolStripMenuItem.Name = "sPR구매ToolStripMenuItem"; + this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.sPR구매ToolStripMenuItem.Text = "SPR 구매"; + this.sPR구매ToolStripMenuItem.Click += new System.EventHandler(this.sPR구매ToolStripMenuItem_Click); + // // mn_project // this.mn_project.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -415,21 +445,21 @@ // 목록ToolStripMenuItem1 // this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24); + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_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); // // 양식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); // @@ -533,6 +563,13 @@ this.라인코드관리ToolStripMenuItem.Text = "라인코드관리"; this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click); // + // 프로그램사용관련알림ToolStripMenuItem + // + this.프로그램사용관련알림ToolStripMenuItem.Name = "프로그램사용관련알림ToolStripMenuItem"; + this.프로그램사용관련알림ToolStripMenuItem.Size = new System.Drawing.Size(233, 24); + this.프로그램사용관련알림ToolStripMenuItem.Text = "프로그램 사용 관련 알림"; + this.프로그램사용관련알림ToolStripMenuItem.Click += new System.EventHandler(this.프로그램사용관련알림ToolStripMenuItem_Click); + // // 휴가관리ToolStripMenuItem // this.휴가관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1069,13 +1106,6 @@ this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // 프로그램사용관련알림ToolStripMenuItem - // - this.프로그램사용관련알림ToolStripMenuItem.Name = "프로그램사용관련알림ToolStripMenuItem"; - this.프로그램사용관련알림ToolStripMenuItem.Size = new System.Drawing.Size(233, 24); - this.프로그램사용관련알림ToolStripMenuItem.Text = "프로그램 사용 관련 알림"; - this.프로그램사용관련알림ToolStripMenuItem.Click += new System.EventHandler(this.프로그램사용관련알림ToolStripMenuItem_Click); - // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1218,6 +1248,9 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem12; private System.Windows.Forms.ToolStripMenuItem 그룹정보ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 프로그램사용관련알림ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 일반구매ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem cR구매ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem sPR구매ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 6bda521..5c43964 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -459,14 +459,28 @@ namespace Project void menu_nrpurchase() { - string formkey = "PUCHASE"; + string formkey = "PUCHASENR"; if (!ShowForm(formkey)) - AddForm(formkey, new FEQ0000.fPurchase()); + AddForm(formkey, new FEQ0000.fPurchase(),"NR구매"); + } + void menu_crpurchase() + { + FCOMMON.Util.MsgE("CR구매현황은 신규 개발 기능으로 아직 open 되지 않았습니다"); + string formkey = "PUCHASECR"; + if (!ShowForm(formkey)) + AddForm(formkey, new FEQ0000.fPurchase(),"CR구매"); + } + void menu_sprpurchase() + { + FCOMMON.Util.MsgE("SPR구매현황은 신규 개발 기능으로 아직 open 되지 않았습니다"); + string formkey = "PUCHASESPR"; + if (!ShowForm(formkey)) + AddForm(formkey, new FEQ0000.fPurchase(), "SPR구매"); } private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e) { - menu_nrpurchase(); + } private void purchaseImportToolStripMenuItem_Click(object sender, EventArgs e) @@ -1301,5 +1315,20 @@ namespace Project } } + + private void 일반구매ToolStripMenuItem_Click(object sender, EventArgs e) + { + menu_nrpurchase(); + } + + private void cR구매ToolStripMenuItem_Click(object sender, EventArgs e) + { + menu_crpurchase(); + } + + private void sPR구매ToolStripMenuItem_Click(object sender, EventArgs e) + { + menu_sprpurchase(); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 206df85..cb7c0f0 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -452,14 +452,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/UbMj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e - /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vtEb8vV7o9blnWyHc + /U7m/E+5XP8/92TF/3lzYj/UrMn/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e + /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8vtIb8vV7o9blnWyHc gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi - v2iNEH9c5vn/SobhnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu + v2iNEH9c5vn/SobunyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ - Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bLgd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP6XrU3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQDvi6uR57RFnwAAAABJRU5ErkJggg== + Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bDgd7fQPo/MoaKnQGr + 2d+jAdUG1LhtIjtQcP6HjfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQCro6tjRV7j6gAAAABJRU5ErkJggg== diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj index 11c0864..5cef95d 100644 --- a/SubProject/FBS0000/FBS0000.csproj +++ b/SubProject/FBS0000/FBS0000.csproj @@ -121,6 +121,9 @@ + + dsMSSQL.xsd + True True diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index 16a6bdb..038bda3 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -96,19 +96,19 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.현재사원원장보기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); this.cmO.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.SuspendLayout(); // // bn @@ -188,6 +188,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -395,6 +396,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(100, 31); this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -418,6 +420,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(100, 31); this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -435,9 +438,11 @@ // // toolStripLabel3 // + this.toolStripLabel3.IsLink = true; this.toolStripLabel3.Name = "toolStripLabel3"; this.toolStripLabel3.Size = new System.Drawing.Size(43, 28); this.toolStripLabel3.Text = "담당자"; + this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); // // cmbUser // @@ -485,7 +490,7 @@ this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown); this.fpSpread1.SetViewportLeftColumn(0, 0, 1); - this.fpSpread1.SetActiveViewport(0, 0, -1); + this.fpSpread1.SetActiveViewport(0, -1, -1); // // cmO // @@ -561,29 +566,6 @@ this.현재사원원장보기ToolStripMenuItem.Text = "현재 사원 원장 보기"; this.현재사원원장보기ToolStripMenuItem.Click += new System.EventHandler(this.현재사원원장보기ToolStripMenuItem_Click); // - // bs - // - this.bs.DataMember = "Holyday"; - this.bs.DataSource = this.dsMSSQL; - this.bs.Sort = ""; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // taUser - // - this.taUser.ClearBeforeFill = true; - // - // textBox1 - // - this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.textBox1.Location = new System.Drawing.Point(0, 801); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(1465, 21); - this.textBox1.TabIndex = 5; - this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -621,7 +603,7 @@ dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2022, 3, 14, 8, 30, 41, 469); + dateTimeCellType1.TimeDefault = new System.DateTime(2023, 2, 2, 20, 6, 38, 860); this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "시작일"; @@ -630,7 +612,7 @@ dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType2.TimeDefault = new System.DateTime(2022, 3, 14, 8, 30, 41, 469); + dateTimeCellType2.TimeDefault = new System.DateTime(2023, 2, 2, 20, 6, 38, 860); this.fpSpread1_Sheet1.Columns.Get(2).CellType = dateTimeCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -770,6 +752,29 @@ this.fpSpread1_Sheet1.ShowRowSelector = true; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // bs + // + this.bs.DataMember = "Holyday"; + this.bs.DataSource = this.dsMSSQL; + this.bs.Sort = ""; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // taUser + // + this.taUser.ClearBeforeFill = true; + // + // textBox1 + // + this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.textBox1.Location = new System.Drawing.Point(0, 801); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(1465, 21); + this.textBox1.TabIndex = 5; + this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); + // // fHolyday // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -791,8 +796,8 @@ this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); this.cmO.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 5fa2cf7..db9316a 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -61,17 +61,7 @@ namespace FBS0000 //if (string.IsNullOrEmpty(GrpName) == false) cmbGrp.Text = GrpName; //else if (cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0; - //해당그룹내의 사용자 목록을 가져와야한다 - var dtUser = FCOMMON.DBM.getUserTable(); - //this.cmbUser.DisplayMember = "dispName"; - //this.cmbUser.ValueMember = "id"; - // this.bs.DataSource = dr; - this.cmbUser.Items.Clear(); - this.cmbUser.Items.Add("-- ALL --"); - foreach (DataRow dr in dtUser.Rows) - { - this.cmbUser.Items.Add(dr["dispname"].ToString()); - } + UpdateUserList(); //일반사용자의경우에는 상태를 변경하지 못한다. //int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); @@ -100,7 +90,6 @@ namespace FBS0000 //this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. } - this.cmbUser.Text = string.Format("{1}({0})", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); RefreshData(); } @@ -722,5 +711,39 @@ namespace FBS0000 dtSD.Text = sd.ToShortDateString(); dtED.Text = ed.ToShortDateString(); } + + private void toolStripLabel3_Click(object sender, EventArgs e) + { + //담당자 목록을 기간내로 업데이트합니다. + UpdateUserList(true); + } + + void UpdateUserList(bool datelist = false) + { //this.cmbUser.DisplayMember = "dispName"; + //this.cmbUser.ValueMember = "id"; + // this.bs.DataSource = dr; + this.cmbUser.Items.Clear(); + this.cmbUser.Items.Add("-- ALL --"); + //해당그룹내의 사용자 목록을 가져와야한다 + if (datelist==false) + { + var dtUser = FCOMMON.DBM.getUserTable(); + foreach (DataRow dr in dtUser.Rows) + { + this.cmbUser.Items.Add(dr["dispname"].ToString()); + } + } + else + { + var ta = new dsMSSQLTableAdapters.HolydayUserListTableAdapter(); + var dtUser = ta.GetData(FCOMMON.info.Login.gcode, dtSD.Text, dtED.Text); + foreach (dsMSSQL.HolydayUserListRow dr in dtUser.Rows) + { + this.cmbUser.Items.Add($"{dr.UserName}({dr.uid})"); + } + } + this.cmbUser.Text = $"{FCOMMON.info.Login.nameK}({FCOMMON.info.Login.no})"; + //if (this.cmbUser.SelectedIndex < 0) this.cmbUser.SelectedIndex = 0; + } } } diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index 4399b48..cf7067b 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -212,23 +212,6 @@ - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqqsoU2cXEUQU3QUFoSjR - BwURfYhzo6uoiVlGI7sI6iKQqNQh5pIsTZnTfRi6j/bBpifah7b06LbUNedS2M5px83x9J6zPDbchS/8 - OLwH/s/7O885Zwe/KIqqsD6XYqyxEiM1B0FuHd8m+/nhw3a7nXE7baCcFhhulGN9fX1bCCFKpXKnRqO5 - aXwqh71NDsP1cqRSqTxYlgXDMCKJRAKZTCYXkG9ghv6qZEvARsgGyWQS6XQ630D/RA5bqwz6KxJwHCfw - oDuMRnUY9wgNXSE0dIZQT+AtxADRwJEzGL4swdramgA/rDbH0EV4a4qhcyyGOx1BIYC3yjMYbpbhy6s6 - DF0qE9J5/j9VQQbvqmjcbqeFDiYnJ7MFDQYvlAkF8QEcl4LFG0afYxqdpjDe2xaho+ax+nsJKysrDAk4 - ummgrIP1pRSD50v/DXPoGp3BELWEmV8sgnEOrtkEDN+WYXTPIR6PF+jAYYbmbIkQwHfw0RHB1EIS7tAf - OOZY2Am+CIceawgejwdFRUUnRAPtQyksLbUYqCoRS+wYDYGOcXDMMrDRDEYDSVA/ObyzLCAajW41mCAG - /ZUHxBJ7yDNPLbKwTOeGeSbmObTpfmz9ErX3a2F6UYP+M5sBZk8ELjqBr2TIGUphnJyu9STRqh7EPKUv - bNB3uhjZbFZ4E8urLJzfY+glXXywR6AaCeK1WgefQYXxNhkaqvc1CQYKhaK4u+oQBq4dQ++pYtA0jUAg - AL/fD6/XKxTm8/mEq+XTG7jab2HO2IKB5ooUscitmtJdJx8d2fO4VrJbSraFfl2R+uq9TZ+VF7mRZ+fw - F+UJx/ryG7vdAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi @@ -243,6 +226,23 @@ 4gY9pyXI5XLCSSyvsPB+j6ObdPHBHYVuKITX+gEErDqMa5Wor9nXKBio1WpJZ/UhGK4dQ/cpCWiaRjAY 5M8afr9fKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv 3hnH99rC8mEAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi + Dwoi+hibG11FTcwyGtlFUBeBROUcYi7J0hzb1E1D99E+8ONE28SWHt2WuuZcE7Zz2pk6nt5zlseGu/CF + H4dz4P+8v/O85+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN + NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4 + gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur + WvRdKhfSef7fVU0G7+po3G6lhQ4CgUCuqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg + 6KaBphbOlwqYzpf9G+bQMTyDPmoJM79YhBIcRmdTsH5bxuDYHBKJRJEOPHYYz5YKAXwHHz1RTC2kMRb+ + A88cCzchEOXQ5QzD5/OhpKTkhGhgfqiAo1kOQ3WpWGLbcBh0nINnloGLZjAcTIP6yeGdYwGxWGyrwQQx + 6K06IJbYRd55apGFYzo/zDMxz0E78GPrl2i+L4fthQy9ZzYD7L4oRukUvpIhbziDcbK72ZdGi96EecpS + 3KDntAS5XE44ieUVFt7vcXSTLj64o9ANhfBaP4CAVYdxrRL1NfsaBQO1Wi3prD4Ew7Vj6D4lAU3TCAaD + mJychN/vFwoj5y5cHZ/eYLT1FuYGm2FoqswQi/ySle06+ejInsdy6W4FuS3264rU1ext/Ky5yA09O4e/ + 1ynH9HmAcj4AAAAASUVORK5CYII= @@ -284,41 +284,41 @@ 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 @@ -388,7 +388,7 @@ cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////AQgAAP////8AAQgAAAs= + AAD///////////////8A/////ws= @@ -398,7 +398,7 @@ cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////AQgAAP////8AAQgAAAs= + AAD///////////////8A/////ws= diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs index cfb9bef..356ce56 100644 --- a/SubProject/FBS0000/dsMSSQL.Designer.cs +++ b/SubProject/FBS0000/dsMSSQL.Designer.cs @@ -40,6 +40,8 @@ namespace FBS0000 { private HolidayLIstDataTable tableHolidayLIst; + private HolydayUserListDataTable tableHolydayUserList; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -92,6 +94,9 @@ namespace FBS0000 { if ((ds.Tables["HolidayLIst"] != null)) { base.Tables.Add(new HolidayLIstDataTable(ds.Tables["HolidayLIst"])); } + if ((ds.Tables["HolydayUserList"] != null)) { + base.Tables.Add(new HolydayUserListDataTable(ds.Tables["HolydayUserList"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -190,6 +195,16 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public HolydayUserListDataTable HolydayUserList { + get { + return this.tableHolydayUserList; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -281,6 +296,9 @@ namespace FBS0000 { if ((ds.Tables["HolidayLIst"] != null)) { base.Tables.Add(new HolidayLIstDataTable(ds.Tables["HolidayLIst"])); } + if ((ds.Tables["HolydayUserList"] != null)) { + base.Tables.Add(new HolydayUserListDataTable(ds.Tables["HolydayUserList"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -362,6 +380,12 @@ namespace FBS0000 { this.tableHolidayLIst.InitVars(); } } + this.tableHolydayUserList = ((HolydayUserListDataTable)(base.Tables["HolydayUserList"])); + if ((initTable == true)) { + if ((this.tableHolydayUserList != null)) { + this.tableHolydayUserList.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -388,6 +412,8 @@ namespace FBS0000 { base.Tables.Add(this.tablevJobReportForUser); this.tableHolidayLIst = new HolidayLIstDataTable(); base.Tables.Add(this.tableHolidayLIst); + this.tableHolydayUserList = new HolydayUserListDataTable(); + base.Tables.Add(this.tableHolydayUserList); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -438,6 +464,12 @@ namespace FBS0000 { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeHolydayUserList() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -517,6 +549,9 @@ namespace FBS0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void HolidayLIstRowChangeEventHandler(object sender, HolidayLIstRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void HolydayUserListRowChangeEventHandler(object sender, HolydayUserListRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -3968,6 +4003,281 @@ namespace FBS0000 { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class HolydayUserListDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnuid; + + private global::System.Data.DataColumn columnUserName; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListDataTable() { + this.TableName = "HolydayUserList"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal HolydayUserListDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected HolydayUserListDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn uidColumn { + get { + return this.columnuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn UserNameColumn { + get { + return this.columnUserName; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListRow this[int index] { + get { + return ((HolydayUserListRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event HolydayUserListRowChangeEventHandler HolydayUserListRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event HolydayUserListRowChangeEventHandler HolydayUserListRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event HolydayUserListRowChangeEventHandler HolydayUserListRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event HolydayUserListRowChangeEventHandler HolydayUserListRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddHolydayUserListRow(HolydayUserListRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListRow AddHolydayUserListRow(string uid, string UserName) { + HolydayUserListRow rowHolydayUserListRow = ((HolydayUserListRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + uid, + UserName}; + rowHolydayUserListRow.ItemArray = columnValuesArray; + this.Rows.Add(rowHolydayUserListRow); + return rowHolydayUserListRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListRow FindByuid(string uid) { + return ((HolydayUserListRow)(this.Rows.Find(new object[] { + uid}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + HolydayUserListDataTable cln = ((HolydayUserListDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new HolydayUserListDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnuid = base.Columns["uid"]; + this.columnUserName = base.Columns["UserName"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuid); + this.columnUserName = new global::System.Data.DataColumn("UserName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnUserName); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnuid}, true)); + this.columnuid.AllowDBNull = false; + this.columnuid.Unique = true; + this.columnuid.MaxLength = 20; + this.columnUserName.ReadOnly = true; + this.columnUserName.MaxLength = 200; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListRow NewHolydayUserListRow() { + return ((HolydayUserListRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new HolydayUserListRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(HolydayUserListRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.HolydayUserListRowChanged != null)) { + this.HolydayUserListRowChanged(this, new HolydayUserListRowChangeEvent(((HolydayUserListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.HolydayUserListRowChanging != null)) { + this.HolydayUserListRowChanging(this, new HolydayUserListRowChangeEvent(((HolydayUserListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.HolydayUserListRowDeleted != null)) { + this.HolydayUserListRowDeleted(this, new HolydayUserListRowChangeEvent(((HolydayUserListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.HolydayUserListRowDeleting != null)) { + this.HolydayUserListRowDeleting(this, new HolydayUserListRowChangeEvent(((HolydayUserListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveHolydayUserListRow(HolydayUserListRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsMSSQL ds = new dsMSSQL(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "HolydayUserListDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -6396,6 +6706,60 @@ namespace FBS0000 { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class HolydayUserListRow : global::System.Data.DataRow { + + private HolydayUserListDataTable tableHolydayUserList; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal HolydayUserListRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableHolydayUserList = ((HolydayUserListDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string uid { + get { + return ((string)(this[this.tableHolydayUserList.uidColumn])); + } + set { + this[this.tableHolydayUserList.uidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string UserName { + get { + if (this.IsUserNameNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableHolydayUserList.UserNameColumn])); + } + } + set { + this[this.tableHolydayUserList.UserNameColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsUserNameNull() { + return this.IsNull(this.tableHolydayUserList.UserNameColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetUserNameNull() { + this[this.tableHolydayUserList.UserNameColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -6667,6 +7031,40 @@ namespace FBS0000 { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class HolydayUserListRowChangeEvent : global::System.EventArgs { + + private HolydayUserListRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListRowChangeEvent(HolydayUserListRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace FBS0000.dsMSSQLTableAdapters { @@ -10938,6 +11336,214 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class HolydayUserListTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public HolydayUserListTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "HolydayUserList"; + tableMapping.ColumnMappings.Add("uid", "uid"); + tableMapping.ColumnMappings.Add("UserName", "UserName"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT uid, dbo.getUserName(uid) AS UserName\r\nFROM Holyday\r\nWHERE (gcode =" + + " @gcode) AND (sdate >= @sd) AND (sdate <= @ed)\r\nGROUP BY uid\r\nORDER BY UserName"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [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, true)] + public virtual int Fill(dsMSSQL.HolydayUserListDataTable dataTable, string gcode, string sd, string ed) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); + } + 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, true)] + public virtual dsMSSQL.HolydayUserListDataTable GetData(string gcode, string sd, string ed) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); + } + dsMSSQL.HolydayUserListDataTable dataTable = new dsMSSQL.HolydayUserListDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///Represents the connection and commands used to retrieve and save data. /// diff --git a/SubProject/FBS0000/dsMSSQL.cs b/SubProject/FBS0000/dsMSSQL.cs new file mode 100644 index 0000000..abd78ec --- /dev/null +++ b/SubProject/FBS0000/dsMSSQL.cs @@ -0,0 +1,11 @@ +namespace FBS0000 +{ + + + partial class dsMSSQL + { + partial class HolydayUserListDataTable + { + } + } +} diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd index b7c4031..9ad2324 100644 --- a/SubProject/FBS0000/dsMSSQL.xsd +++ b/SubProject/FBS0000/dsMSSQL.xsd @@ -821,6 +821,31 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O + + + + + + SELECT uid, dbo.getUserName(uid) AS UserName +FROM Holyday +WHERE (gcode = @gcode) AND (sdate >= @sd) AND (sdate <= @ed) +GROUP BY uid +ORDER BY UserName + + + + + + + + + + + + + + + @@ -875,7 +900,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -935,7 +960,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -987,7 +1012,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1089,7 +1114,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1134,7 +1159,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1147,7 +1172,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1212,7 +1237,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1350,7 +1375,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1380,6 +1405,26 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= + + + + + + + + + + + + + + + + + + + + @@ -1410,5 +1455,9 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= + + + + \ No newline at end of file diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss index 2805dfc..0af7d58 100644 --- a/SubProject/FBS0000/dsMSSQL.xss +++ b/SubProject/FBS0000/dsMSSQL.xss @@ -6,15 +6,16 @@ --> - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 2790df1..ea2f941 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -392,6 +392,9 @@ PreserveNewest + + +