From 9871904e9dbe251f6389dc92d5e6d170a01df713 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 29 Dec 2021 00:30:27 +0900 Subject: [PATCH] .... --- Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.Designer.cs | 41 +-- Project/fMain.cs | 16 +- Project/fMain.resx | 4 +- .../FBS0000/Holiday/fHolyday.Designer.cs | 110 +++---- SubProject/FBS0000/Holiday/fHolyday.cs | 85 ++++-- SubProject/FBS0000/Holiday/fHolyday.resx | 81 +++--- .../FBS0000/Holiday/fHolyday_Add.Designer.cs | 274 ++++++++++-------- SubProject/FBS0000/Holiday/fHolyday_Add.cs | 147 +++++----- SubProject/FBS0000/Holiday/fHolyday_Add.resx | 14 +- SubProject/FBS0000/Holiday/fWorkTableUser.cs | 12 +- SubProject/FPJ0000/OtConfirm/fHolyRequest.cs | 2 +- 12 files changed, 442 insertions(+), 348 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 9eb024d..67d36e0 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("21.12.21.0850")] -[assembly: AssemblyFileVersion("21.12.21.0850")] +[assembly: AssemblyVersion("21.12.29.0030")] +[assembly: AssemblyFileVersion("21.12.29.0030")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index e63044c..f84aa3d 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -97,7 +97,6 @@ this.bugReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.todoListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem5 = 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(); @@ -387,21 +386,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); // @@ -595,8 +594,7 @@ this.freeBoardToolStripMenuItem, this.bugReportToolStripMenuItem, this.todoListToolStripMenuItem, - this.메일전송ToolStripMenuItem, - this.toolStripMenuItem5}); + this.메일전송ToolStripMenuItem}); this.mn_docu.Image = ((System.Drawing.Image)(resources.GetObject("mn_docu.Image"))); this.mn_docu.Name = "mn_docu"; this.mn_docu.Size = new System.Drawing.Size(65, 23); @@ -605,39 +603,39 @@ // 메모장ToolStripMenuItem // this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메모장ToolStripMenuItem.Text = "메모장"; this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6); // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(165, 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(165, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -646,7 +644,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -655,7 +653,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -663,7 +661,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -671,7 +669,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -680,19 +678,11 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red; - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24); - this.toolStripMenuItem5.Text = "(test)휴가등록"; - this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); - // // 기타ToolStripMenuItem // this.기타ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1047,7 +1037,6 @@ private System.Windows.Forms.ToolStripMenuItem 메일양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 메일내역ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5; private System.Windows.Forms.ToolStripMenuItem pMP데이터베이스업데이트ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pMP현황ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mailBackupToolStripMenuItem; diff --git a/Project/fMain.cs b/Project/fMain.cs index 65a69a2..d01c632 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -863,11 +863,6 @@ namespace Project AddForm(formkey, new FCM0000.fMailform()); } - private void 메일전송ToolStripMenuItem1_Click(object sender, EventArgs e) - { - - } - private void 메일내역ToolStripMenuItem_Click(object sender, EventArgs e) { string formkey = "MAILLIST"; @@ -875,16 +870,7 @@ namespace Project AddForm(formkey, new FCM0000.Mail.fMailList()); } - private void toolStripMenuItem5_Click(object sender, EventArgs e) - { - - var f = new FBS0000.fHolyday_Add(); - f.TopMost = true; - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - //RefreshData(); - } - } + private void pMP데이터베이스업데이트ToolStripMenuItem_Click(object sender, EventArgs e) { diff --git a/Project/fMain.resx b/Project/fMain.resx index a1236ce..c104de9 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -425,7 +425,7 @@ asZIhG3MDvkZ3T4YlJYfnZ10WGTU0dIWWqD8FChbhpYiW7HRjdE5NiSbMdEt2RZmXapzXXBaDMYzEjK9 LO+6ZCPL7uQ+efLc1/e8z/t+soEKNavtLVfTJ6no2aukW6uks0yBqzQdZ/Fa7EVrsRY+y6eaNFp2PoMA /PWd+9G+0MHCbDvx807+/MbOndM2fj95mPmQhdsnmmkukAvAfOTLA8RnrcTGC+95bBe3/O9y81gBv/q2 - Ee17hxtduUScW7je+iY/uzT85jfTlCW/mwCoSiZtW8UXw40bmTz4Kqa8VIL7NzBWv4ERw8sMVb0kam5t + Ee17hxtduUScW7je+iY/uzT85jfTlCm/mwCoSiZtW8UXw40bmTz4Kqa8VIL7NzBWv4ERw8sMVb0kam5t JvbiDK76Ggg25PDxtjX9shV5JfWlyyNVzB3/iIm650XzZ7r1DFeso3+Pmq7dKlFr1Sj53LKbi869iXDK wv6cp1IEoFdSbB4zZXPnbBuhxk2iebB8HT1lKjqKVdgKlaLWolnPj30fckSfTUPe0yUifF/dWsXoedcu vvcZmBmoY8pj4OsuPSG3nhPt1Xzh0DHpquGrxjxM+anfJmP31GvIfLJfUoYOlSnudryR/u/qq1rZdtN2 @@ -434,7 +434,7 @@ aHyF0ernxLIe56btCtyGtzneXiOOJAC3Z+zETjVyc+IDfhmvJRrQcWNkHz8Na5nzlnDNU8gV1w4u2/O5 1JrLD5bEgxo2rewjCTjXlgiVEjm6g6M9Njwej/C04z0uWnI49IkZo9GIXq9nIVoqfN1nEhMJwK0zVuan HcTCbQR8ncRiMSKRCH6/H4fDQTgcZmlpicqKcq4NNojwQ4AH/zhXfS5TU1PE43GWl5eFFxcXCQQC6DSv - i7Ef3Im4idWyWq3vm83m6P2xJUn6o6ioaFCj0TyRbElKJvsfTXs1OQIXb+gAAAAASUVORK5CYII= + i7Ef3Im4idWyWq3vm83m6P2xJUn6o6ioaFCj0TyRbElKJvsfSis1OE3GifsAAAAASUVORK5CYII= diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index 256eac9..ed0aa7e 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -30,19 +30,19 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - 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.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType3 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -90,6 +90,7 @@ this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); @@ -118,6 +119,7 @@ this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, this.btAdd, + this.toolStripButton2, this.btDel, this.btSave, this.toolStripSeparator1, @@ -517,27 +519,27 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(일)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate"; 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; - 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(2021, 12, 25, 21, 27, 32, 750); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1; + dateTimeCellType3.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType3.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType3.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType3.TimeDefault = new System.DateTime(2021, 12, 29, 23, 55, 36, 293); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType3; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "일자"; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "요일"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "사번"; @@ -545,90 +547,90 @@ this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - textCellType4.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + textCellType16.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명"; this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType1.MaximumValue = 999999999999999D; - numberCellType1.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1; + numberCellType13.MaximumValue = 999999999999999D; + numberCellType13.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType13; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(일)"; this.fpSpread1_Sheet1.Columns.Get(5).Tag = "dr"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; + numberCellType14.MaximumValue = 999999999999999D; + numberCellType14.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType14; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "#"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 40F; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; + numberCellType15.MaximumValue = 999999999999999D; + numberCellType15.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType15; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(일)"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "cr"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; + numberCellType16.MaximumValue = 999999999999999D; + numberCellType16.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType16; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 1; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - numberCellType5.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; + numberCellType17.DecimalPlaces = 1; + numberCellType17.MaximumValue = 999999999999999D; + numberCellType17.MinimumValue = -999999999999999D; + numberCellType17.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType17; this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType17; this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType6.DecimalPlaces = 1; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - numberCellType6.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6; + numberCellType18.DecimalPlaces = 1; + numberCellType18.MaximumValue = 999999999999999D; + numberCellType18.MinimumValue = -999999999999999D; + numberCellType18.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType18; this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType18; this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)"; @@ -656,6 +658,15 @@ // this.taUser.ClearBeforeFill = true; // + // toolStripButton2 + // + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(69, 24); + this.toolStripButton2.Text = "편집(&E)"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); + // // fHolyday // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -732,5 +743,6 @@ private System.Windows.Forms.ToolStripMenuItem 현재사원원장보기ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel lbStt; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 37b8162..44f759a 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -247,33 +247,46 @@ namespace FBS0000 newdr.contents = string.Empty; newdr.wuid = FCOMMON.info.Login.no; newdr.wdate = DateTime.Now; - this.dsMSSQL.Holyday.AddHolydayRow(newdr); - var rowindex = this.bs.Count - 1; + newdr.UserName = FCOMMON.info.Login.nameK; - //잔액및 성명찾기 - //모든데이터의 성명을 표시해준다 - var qta = new dsMSSQLTableAdapters.QueriesTableAdapter(); - var col_name = this.fpSpread1.ActiveSheet.Columns["name"].Index; - var col_jand = this.fpSpread1.ActiveSheet.Columns["jand"].Index; - var col_yjand = this.fpSpread1.ActiveSheet.Columns["yjand"].Index; - var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index; - var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index; + var f = new fHolyday_Add(newdr); + if (f.ShowDialog() == DialogResult.OK) + { + newdr.EndEdit(); + this.dsMSSQL.Holyday.AddHolydayRow(newdr); + } + else newdr.Delete(); - var drUser = this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault(); - var username = drUser == null ? string.Empty : drUser.name; - fpSpread1.ActiveSheet.Cells[rowindex, col_name].Value = username; - //이 사용자의 이전까지의 잔량을 가져온다 - var fistdate = newdr.sdate.ToString("yyyy-01-01"); - var yjand = 0;// qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, this.seluid, fistdate, newdr.sdate.ToShortDateString(),"999999"); - var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToShortDateString(), "999999"); + + //var rowindex = this.bs.Count - 1; + + + + ////잔액및 성명찾기 + ////모든데이터의 성명을 표시해준다 + //var qta = new dsMSSQLTableAdapters.QueriesTableAdapter(); + //var col_name = this.fpSpread1.ActiveSheet.Columns["name"].Index; + //var col_jand = this.fpSpread1.ActiveSheet.Columns["jand"].Index; + //var col_yjand = this.fpSpread1.ActiveSheet.Columns["yjand"].Index; + //var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index; + //var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index; + + //var drUser = this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault(); + //var username = drUser == null ? string.Empty : drUser.name; + //fpSpread1.ActiveSheet.Cells[rowindex, col_name].Value = username; + + ////이 사용자의 이전까지의 잔량을 가져온다 + //var fistdate = newdr.sdate.ToString("yyyy-01-01"); + //var yjand = 0;// qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, this.seluid, fistdate, newdr.sdate.ToShortDateString(),"999999"); + //var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToShortDateString(), "999999"); - //var jand = yjand + dr.termDr - dr.term; - //var janh = yjanh + dr.DrTime - dr.CrTime; - this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjand].Value = yjand; - this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjanh].Value = yjanh; + ////var jand = yjand + dr.termDr - dr.term; + ////var janh = yjanh + dr.DrTime - dr.CrTime; + //this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjand].Value = yjand; + //this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjanh].Value = yjanh; } @@ -289,14 +302,14 @@ namespace FBS0000 private void dv1_DoubleClick(object sender, EventArgs e) { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsMSSQL.vHoliday_uselistRow; - var f = new fHolyday_Add(dr.idx); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - RefreshData(); - } + //var drv = this.bs.Current as DataRowView; + //if (drv == null) return; + //var dr = drv.Row as dsMSSQL.vHoliday_uselistRow; + //var f = new fHolyday_Add(dr.idx); + //if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + //{ + // RefreshData(); + //} } @@ -534,5 +547,19 @@ namespace FBS0000 tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString(); this.RefreshData(); } + + private void toolStripButton2_Click_1(object sender, EventArgs e) + { + + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsMSSQL.HolydayRow; + var f = new fHolyday_Add(dr); + if (f.ShowDialog() == DialogResult.OK) + { + dr.EndEdit(); + } + else dr.RejectChanges(); + } } } diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index fb16903..f4b4fad 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -171,6 +171,21 @@ zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== @@ -197,23 +212,6 @@ - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR - hYKILuJ09BQ1MUtpZA9BPQQSlXOIbUmWpszLbqG7tAteTrQLtvSo29Q155qwndPOdOPb/5zlseEe/MOH - w//A7/v/nO85Zxe/KIqqsL2QYqypEqaawyC3Tu6Qg/zwUYfDwUy47KBcVhhulSOTyewIIUShUOzWarW3 - jc9kcChlMNwsRyqVyoNlWTAMI5JIJLCxsZELyDewQH9dsi1gM2STZDKJ9fX1fAP9Uxns7fXQX5OA4ziB - R91BNGmCeEBoVAfQ2BVAA4G3EANEA2fOYOSqBOl0WoAf1liiUBPemaPoGoviXueCEMBb5RmMtNbj6+s6 - DF8pE9J5/j9VTgbvq2jc7aCFDkKhULagweClMqEgPoDjUrB6guhzzqDLHMQH+zJ01CLWfq8gHo8zJOD4 - loGiDrZXUgxeLP03zEE9OothagWzv1gsxDiMzyVg+L4K48Q8YrFYgQ6cFmjPlwgBfAefnGFMLyUxEfgD - 5zwLB8Eb5tBjC8DtdqOoqOiUaDDUIoW1rRYDVSViiZ2jAdBRDs45Bnaawag/CSrE4b11CZFIZLvBFDHo - rzwklthDnnl6mYV1JjfMM7XIQan7uf1LHHpYC/PLGvSf2wqwuMMYpxP4RoZcgRQmyelD7iTaNYNYpPSF - DfrOFiObzQpvYnWNhetHFL2ki4+OMFSmBbzR6OA1qDCprEdj9YFmwUAulxd3Vx3BwI0T6D1TDJqm4ff7 - 4fP54PF4hMK8Xq9wtX5+i/GOO5g3tmGgtSJFLHKrpnTP6cfH9j2pleyVkm2hX1ekoXp/8xfFZc70/AL+ - Aj9IyCGwUBkWAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR @@ -228,6 +226,23 @@ Bj2ni5HNZsU3sbLKwfM9im7SxQdXGNrhIF7rjfCbtZjQKNBQva9JNFCpVMWdVYfQd+0Yuk8Vg6ZpBAIB TE1NwefziYX5/X7xav/0BmNttzBvaUFfc0WKWORWTemuk4+O7HlcK9stJ9tCv65EffXeps/qi/zws3P4 CzhYyB5xw8wTAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNbSFNxHMd7GD3XU09Rps4eIogoegsKQlGi + CwURXcSp9BQ1MctoZA9BPQQSlVNkbUmWpszbpqFutgteTrQLtvQ4z1KXzjVh55zOcRe+/c9ZHhvuwT98 + OPwP/L7/z/mec3ZIi6Ko4rHnGozUlWCo/CDIrePbZL80fNjpdHITbgcotx3WG0VIpVLbQg7R6XQ7zWbz + zcGn1XDqq2G9XgRBELLgeR4cxynE43Ekk8lMQLaBDZar6i0BGyEbsCyLRCKRbWB5Ug1HUxUsV9QQRVHm + QVsIdaYQ7hFqjQxqDQxqCJKFEqAYuDIG/ZfVWF9fl5GGTbYIjIS3oxEYRiK40zovB0hWWQb9DVX48qoS + fZcK5XSJ/0/VksG7LTRuN9NyBwzDpHMa9FwolAuSAkRRgN0bQqdrBobREN47ljBALWDt9wpisRhHAo5u + GugqMfZSg57zBf+GRRiHZ9FHrWD2F4/5qIjxuTis31YxOBFENBrN0YHLBvPZfDlA6uCjK4zpRRYTzB+4 + gjycBF9YRPsYA4/HA5VKdUIx6H2ogb2xAt2l+UqJrcMM6IgI1xwHB81hOMCC+ininX0Ry8vLWw2miEFX + yQGlxHbyzNNLPOwzmWGJqQUR+oEfW7/E3vsVGH1Rjq4zmwE2TxjjdBxfyZCbETBJTu/1sGgy9WCBsuQ2 + 6Dydh3Q6Lb+J1TUe7u8RdJAuPjjDaBmax2vTAHzWFkzqq1Bbtq9eNtBqtXltpYfQfe0YOk7lgaZpBAIB + +P1+eL1euTCfzydf7Z/eYLz5FoKDjehuKBaIRWaVF+w6+ejInscV6t0ass316yrUlO2t/6y7KA49O4e/ + MWjIG/RgRIMAAAAASUVORK5CYII= @@ -254,6 +269,22 @@ 659, 17 + + 737, 17 + + + + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh + cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 + cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 + AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// + K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA + AAD/////AQgAAP////8AAQgAAAs= + + + + 294, 17 + R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ @@ -293,22 +324,6 @@ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - 737, 17 - - - - AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh - cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 - cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 - AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// - K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD///////////////8A/////ws= - - - - 294, 17 - 358, 17 diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs index 4de317b..db308c8 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs @@ -28,53 +28,60 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label sdateLabel; System.Windows.Forms.Label contentsLabel; System.Windows.Forms.Label uidLabel; System.Windows.Forms.Label label1; System.Windows.Forms.Label label2; + System.Windows.Forms.Label label3; + System.Windows.Forms.Label label4; + System.Windows.Forms.Label label5; this.dsMSSQL = new FBS0000.dsMSSQL(); - this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.tam = new FBS0000.dsMSSQLTableAdapters.TableAdapterManager(); this.contentsTextBox = new System.Windows.Forms.TextBox(); this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); this.cmbUser = new System.Windows.Forms.ComboBox(); this.btOK = new System.Windows.Forms.Button(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.radDR = new System.Windows.Forms.RadioButton(); - this.radCR = new System.Windows.Forms.RadioButton(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); + this.nudCrDAy = new System.Windows.Forms.NumericUpDown(); + this.nudCrHour = new System.Windows.Forms.NumericUpDown(); + this.cmbType = new System.Windows.Forms.ComboBox(); + this.nudDrHour = new System.Windows.Forms.NumericUpDown(); + this.nudDrDay = new System.Windows.Forms.NumericUpDown(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); sdateLabel = new System.Windows.Forms.Label(); contentsLabel = new System.Windows.Forms.Label(); uidLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCrDAy)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCrHour)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudDrHour)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudDrDay)).BeginInit(); this.SuspendLayout(); // // sdateLabel // sdateLabel.AutoSize = true; - sdateLabel.Location = new System.Drawing.Point(30, 49); + sdateLabel.Location = new System.Drawing.Point(44, 49); sdateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); sdateLabel.Name = "sdateLabel"; - sdateLabel.Size = new System.Drawing.Size(51, 19); + sdateLabel.Size = new System.Drawing.Size(37, 19); sdateLabel.TabIndex = 2; - sdateLabel.Text = "등록일"; + sdateLabel.Text = "기간"; // // contentsLabel // contentsLabel.AutoSize = true; - contentsLabel.Location = new System.Drawing.Point(42, 83); + contentsLabel.Location = new System.Drawing.Point(42, 113); contentsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); contentsLabel.Name = "contentsLabel"; contentsLabel.Size = new System.Drawing.Size(37, 19); - contentsLabel.TabIndex = 4; + contentsLabel.TabIndex = 6; contentsLabel.Text = "내용"; // // uidLabel @@ -89,25 +96,29 @@ // // label1 // - label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); label1.AutoSize = true; - label1.Location = new System.Drawing.Point(44, 258); + label1.Location = new System.Drawing.Point(28, 340); label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(37, 19); - label1.TabIndex = 6; - label1.Text = "일수"; + label1.Size = new System.Drawing.Size(51, 19); + label1.TabIndex = 12; + label1.Text = "사용일"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(279, 340); + label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(65, 19); + label2.TabIndex = 14; + label2.Text = "사용시간"; // // dsMSSQL // this.dsMSSQL.DataSetName = "dsMSSQL"; this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // bs - // - this.bs.DataMember = "Holyday"; - this.bs.DataSource = this.dsMSSQL; - // // ta // this.ta.ClearBeforeFill = true; @@ -116,153 +127,187 @@ // this.tam.BackupDataSetBeforeUpdate = false; this.tam.BoardTableAdapter = null; + this.tam.EETGW_WorkTableUserTableAdapter = null; + this.tam.HolidayLIstTableAdapter = null; this.tam.HolydayTableAdapter = this.ta; this.tam.minutesTableAdapter = null; this.tam.UpdateOrder = FBS0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // contentsTextBox // - this.contentsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.contentsTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "contents", true)); - this.contentsTextBox.Location = new System.Drawing.Point(87, 80); + this.contentsTextBox.Location = new System.Drawing.Point(87, 113); this.contentsTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.contentsTextBox.Multiline = true; this.contentsTextBox.Name = "contentsTextBox"; this.contentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.contentsTextBox.Size = new System.Drawing.Size(422, 168); - this.contentsTextBox.TabIndex = 5; + this.contentsTextBox.Size = new System.Drawing.Size(460, 184); + this.contentsTextBox.TabIndex = 7; // // dateTimePicker1 // - this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dateTimePicker1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "sdate", true)); this.dateTimePicker1.Location = new System.Drawing.Point(87, 45); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(214, 27); + this.dateTimePicker1.Size = new System.Drawing.Size(462, 27); this.dateTimePicker1.TabIndex = 3; this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged); // // cmbUser // - this.cmbUser.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.cmbUser.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.bs, "uid", true)); this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbUser.FormattingEnabled = true; this.cmbUser.Location = new System.Drawing.Point(87, 12); this.cmbUser.Name = "cmbUser"; - this.cmbUser.Size = new System.Drawing.Size(422, 27); + this.cmbUser.Size = new System.Drawing.Size(462, 27); this.cmbUser.TabIndex = 1; // // btOK // - this.btOK.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.btOK.Location = new System.Drawing.Point(87, 291); + this.btOK.Location = new System.Drawing.Point(87, 373); this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(422, 38); - this.btOK.TabIndex = 8; + this.btOK.Size = new System.Drawing.Size(460, 38); + this.btOK.TabIndex = 16; this.btOK.Text = "OK"; this.btOK.UseVisualStyleBackColor = true; this.btOK.Click += new System.EventHandler(this.btOK_Click); // - // numericUpDown1 + // nudCrDAy // - this.numericUpDown1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.numericUpDown1.DecimalPlaces = 2; - this.numericUpDown1.Location = new System.Drawing.Point(87, 256); - this.numericUpDown1.Maximum = new decimal(new int[] { - 999999, - 0, + this.nudCrDAy.DecimalPlaces = 2; + this.nudCrDAy.Location = new System.Drawing.Point(87, 338); + this.nudCrDAy.Maximum = new decimal(new int[] { + 1215752191, + 23, 0, 0}); - this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(159, 27); - this.numericUpDown1.TabIndex = 7; - this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudCrDAy.Name = "nudCrDAy"; + this.nudCrDAy.Size = new System.Drawing.Size(183, 27); + this.nudCrDAy.TabIndex = 13; + this.nudCrDAy.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // radDR + // nudCrHour // - this.radDR.AutoSize = true; - this.radDR.Location = new System.Drawing.Point(389, 47); - this.radDR.Name = "radDR"; - this.radDR.Size = new System.Drawing.Size(55, 23); - this.radDR.TabIndex = 9; - this.radDR.Text = "발생"; - this.radDR.UseVisualStyleBackColor = true; - // - // radCR - // - this.radCR.AutoSize = true; - this.radCR.Checked = true; - this.radCR.Location = new System.Drawing.Point(317, 47); - this.radCR.Name = "radCR"; - this.radCR.Size = new System.Drawing.Size(55, 23); - this.radCR.TabIndex = 10; - this.radCR.TabStop = true; - this.radCR.Text = "사용"; - this.radCR.UseVisualStyleBackColor = true; - // - // numericUpDown2 - // - this.numericUpDown2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.numericUpDown2.DecimalPlaces = 2; - this.numericUpDown2.Location = new System.Drawing.Point(350, 256); - this.numericUpDown2.Maximum = new decimal(new int[] { - 999999, - 0, + this.nudCrHour.DecimalPlaces = 2; + this.nudCrHour.Location = new System.Drawing.Point(350, 338); + this.nudCrHour.Maximum = new decimal(new int[] { + 1215752191, + 23, 0, 0}); - this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.Size = new System.Drawing.Size(159, 27); - this.numericUpDown2.TabIndex = 12; - this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudCrHour.Name = "nudCrHour"; + this.nudCrHour.Size = new System.Drawing.Size(197, 27); + this.nudCrHour.TabIndex = 15; + this.nudCrHour.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // label2 + // cmbType // - label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - label2.AutoSize = true; - label2.Location = new System.Drawing.Point(307, 258); - label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(37, 19); - label2.TabIndex = 11; - label2.Text = "시간"; + this.cmbType.FormattingEnabled = true; + this.cmbType.Location = new System.Drawing.Point(87, 78); + this.cmbType.Name = "cmbType"; + this.cmbType.Size = new System.Drawing.Size(462, 27); + this.cmbType.TabIndex = 5; + // + // nudDrHour + // + this.nudDrHour.DecimalPlaces = 2; + this.nudDrHour.Location = new System.Drawing.Point(350, 305); + this.nudDrHour.Maximum = new decimal(new int[] { + 1215752191, + 23, + 0, + 0}); + this.nudDrHour.Name = "nudDrHour"; + this.nudDrHour.Size = new System.Drawing.Size(197, 27); + this.nudDrHour.TabIndex = 11; + this.nudDrHour.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(279, 307); + label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(65, 19); + label3.TabIndex = 10; + label3.Text = "발생시간"; + // + // nudDrDay + // + this.nudDrDay.DecimalPlaces = 2; + this.nudDrDay.Location = new System.Drawing.Point(87, 305); + this.nudDrDay.Maximum = new decimal(new int[] { + 1215752191, + 23, + 0, + 0}); + this.nudDrDay.Name = "nudDrDay"; + this.nudDrDay.Size = new System.Drawing.Size(183, 27); + this.nudDrDay.TabIndex = 9; + this.nudDrDay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(28, 307); + label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(51, 19); + label4.TabIndex = 8; + label4.Text = "발생일"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(44, 81); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(37, 19); + label5.TabIndex = 4; + label5.Text = "구분"; + // + // dateTimePicker2 + // + this.dateTimePicker2.Location = new System.Drawing.Point(12, 176); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(252, 27); + this.dateTimePicker2.TabIndex = 18; + this.dateTimePicker2.Visible = false; // // fHolyday_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 340); - this.Controls.Add(this.numericUpDown2); + this.ClientSize = new System.Drawing.Size(566, 430); + this.Controls.Add(this.contentsTextBox); + this.Controls.Add(this.dateTimePicker2); + this.Controls.Add(this.nudDrHour); + this.Controls.Add(label3); + this.Controls.Add(this.nudDrDay); + this.Controls.Add(label4); + this.Controls.Add(this.cmbType); + this.Controls.Add(this.nudCrHour); this.Controls.Add(label2); - this.Controls.Add(this.radCR); - this.Controls.Add(this.radDR); - this.Controls.Add(this.numericUpDown1); + this.Controls.Add(this.nudCrDAy); this.Controls.Add(label1); this.Controls.Add(this.btOK); this.Controls.Add(this.cmbUser); this.Controls.Add(this.dateTimePicker1); + this.Controls.Add(label5); this.Controls.Add(sdateLabel); this.Controls.Add(contentsLabel); - this.Controls.Add(this.contentsTextBox); this.Controls.Add(uidLabel); this.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "fHolyday_Add"; - this.Text = "휴가 발생/사용 등록"; + this.Text = "근태입력"; this.TopMost = true; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCrDAy)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCrHour)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudDrHour)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudDrDay)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -271,16 +316,17 @@ #endregion private dsMSSQL dsMSSQL; - private System.Windows.Forms.BindingSource bs; private dsMSSQLTableAdapters.HolydayTableAdapter ta; private dsMSSQLTableAdapters.TableAdapterManager tam; private System.Windows.Forms.TextBox contentsTextBox; private System.Windows.Forms.DateTimePicker dateTimePicker1; private System.Windows.Forms.ComboBox cmbUser; private System.Windows.Forms.Button btOK; - private System.Windows.Forms.NumericUpDown numericUpDown1; - private System.Windows.Forms.RadioButton radDR; - private System.Windows.Forms.RadioButton radCR; - private System.Windows.Forms.NumericUpDown numericUpDown2; + private System.Windows.Forms.NumericUpDown nudCrDAy; + private System.Windows.Forms.NumericUpDown nudCrHour; + private System.Windows.Forms.ComboBox cmbType; + private System.Windows.Forms.NumericUpDown nudDrHour; + private System.Windows.Forms.NumericUpDown nudDrDay; + private System.Windows.Forms.DateTimePicker dateTimePicker2; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index 36d5e30..060c6d9 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.cs @@ -14,90 +14,103 @@ namespace FBS0000 Boolean bInit = false; dsMSSQL.HolydayRow dr; - public fHolyday_Add(int idx) + public fHolyday_Add(dsMSSQL.HolydayRow dr_) { InitializeComponent(); - if (idx == -1) - { - dr = this.dsMSSQL.Holyday.NewHolydayRow(); - dr.sdate = DateTime.Parse(DateTime.Now.Year.ToString() + "-01-01"); - dr.edate = dr.sdate; - dr.wuid = FCOMMON.info.Login.no; - dr.wdate = DateTime.Now; - dr.term = 0.0; - dr.cate = "10"; - dr.gcode = FCOMMON.info.Login.gcode; - dr.uid = FCOMMON.info.Login.no; - this.dsMSSQL.Holyday.AddHolydayRow(dr); - } - else - { - ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx); - this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow; - if (dr.term > 0 || dr.CrTime > 0) radCR.Checked = true; - else radDR.Checked = true; - } + this.dr = dr_; + //if (idx == -1) + //{ + // dr = this.dsMSSQL.Holyday.NewHolydayRow(); + // dr.sdate = DateTime.Parse(DateTime.Now.Year.ToString() + "-01-01"); + // dr.edate = dr.sdate; + // dr.wuid = FCOMMON.info.Login.no; + // dr.wdate = DateTime.Now; + // dr.term = 0.0; + // dr.cate = "10"; + // dr.gcode = FCOMMON.info.Login.gcode; + // dr.uid = FCOMMON.info.Login.no; + // this.dsMSSQL.Holyday.AddHolydayRow(dr); + //} + //else + //{ + // ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx); + // this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow; + // if (dr.term > 0 || dr.CrTime > 0) radCR.Checked = true; + // else radDR.Checked = true; + //} + //사용자 목록 업데이트 this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); this.cmbUser.DisplayMember = "dispName"; this.cmbUser.ValueMember = "id"; - this.bs.DataSource = dr; + // this.bs.DataSource = dr; + + var catelist = FCOMMON.DBM.getCodeList("50"); + var lst = catelist.Select(t => t.Value).ToArray(); + cmbType.Items.Clear(); + foreach (var item in lst) + cmbType.Items.Add(item); + + } - public fHolyday_Add() : this(-1) { } + private void __Load(object sender, EventArgs e) { - bInit = true; - this.Show(); + cmbUser.SelectedValue = dr.uid;// FCOMMON.info.Login.no;// .Text = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")"; + dateTimePicker1.Value = dr.sdate; + dateTimePicker2.Value = dr.edate; + + cmbType.Text = dr.cate; + contentsTextBox.Text = dr.contents; + + this.nudCrDAy.Value = (decimal)dr.term; + this.nudCrHour.Value = (decimal)dr.CrTime; + + this.nudDrDay.Value = (decimal)dr.termDr; + this.nudDrHour.Value = (decimal)dr.DrTime; + + bInit = true; - if (radCR.Checked) - { - this.numericUpDown1.Value = (decimal)dr.term; - this.numericUpDown2.Value = (decimal)dr.CrTime; - } - else - { - this.numericUpDown1.Value = (decimal)dr.termDr; - this.numericUpDown2.Value = (decimal)dr.DrTime; - } - Application.DoEvents(); } private void btOK_Click(object sender, EventArgs e) { - if (radCR.Checked) - { - dr.CrTime = (double)numericUpDown2.Value; - dr.term = (double)numericUpDown1.Value; - dr.cate = "20"; //OT년차발생 - } - else - { - dr.DrTime = (double)numericUpDown2.Value; - dr.termDr = (double)numericUpDown1.Value; - dr.cate = "10";//일반 년차발생 - } - + //기본값처리 this.Validate(); - this.bs.EndEdit(); + + if(string.IsNullOrEmpty( this.cmbType.Text)) + { + FCOMMON.Util.MsgE("구분을 입력하세요"); + cmbType.Focus(); + return; + } + + if(cmbType.SelectedValue == null) + { + FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다"); + return; + } + dr.uid = cmbType.SelectedValue.ToString(); + + dr.sdate = dateTimePicker1.Value; + dr.edate = dateTimePicker2.Value; + + dr.cate = cmbType.Text; + dr.contents = contentsTextBox.Text; + + dr.term = (double)this.nudCrDAy.Value; + dr.CrTime = (double)this.nudCrHour.Value; + + dr.termDr = (double)this.nudDrDay.Value; + dr.DrTime = (double)this.nudDrHour.Value; + + this.dr.EndEdit(); - try - { - - this.ta.Update(this.dr); - dr.AcceptChanges(); - DialogResult = System.Windows.Forms.DialogResult.OK; - } - catch (Exception eX) - { - FCOMMON.Util.MsgE(eX.Message); - } - - - + DialogResult = DialogResult.OK; } private void dateTimePicker1_ValueChanged(object sender, EventArgs e) @@ -105,9 +118,9 @@ namespace FBS0000 if (!bInit) return; - //if(dateTimePicker1.Value > this.dateTimePicker2.Value) - // this.dateTimePicker2.Value = dateTimePicker1.Value; - //RefreshTerm(); + if(dateTimePicker1.Value > this.dateTimePicker2.Value) + this.dateTimePicker2.Value = dateTimePicker1.Value; + RefreshTerm(); } diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.resx b/SubProject/FBS0000/Holiday/fHolyday_Add.resx index 567a2d2..ac8fe14 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.resx +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.resx @@ -129,19 +129,25 @@ False + + False + 17, 17 - - 122, 17 - 186, 17 248, 17 - + + False + + + False + + False \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fWorkTableUser.cs b/SubProject/FBS0000/Holiday/fWorkTableUser.cs index d80daca..1fe62a1 100644 --- a/SubProject/FBS0000/Holiday/fWorkTableUser.cs +++ b/SubProject/FBS0000/Holiday/fWorkTableUser.cs @@ -84,12 +84,12 @@ namespace FBS0000 private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) { - var f = new fHolyday_Add(); - f.TopMost = true; - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - RefreshData(); - } + //var f = new fHolyday_Add(); + //f.TopMost = true; + //if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + //{ + // RefreshData(); + //} } private void autoResizeComlumnsToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs index 5b2e2dc..57026b8 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs @@ -242,7 +242,7 @@ namespace FPJ0000 newdr.edate = DateTime.Now.ToShortDateString(); newdr.HolyDays = 0; newdr.HolyTimes = 0f; - newdr.cate = "연차"; + newdr.cate = "년차"; var f = new OtConfirm.fHolyRequestAdd(newdr); if (f.ShowDialog() == DialogResult.OK) {