From f2114194d39297c92e8806418caa1a56007e3919 Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 1 Feb 2022 15:36:13 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=84=ED=8A=B8=EC=B0=A8=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FCOMMON/DataBaseManager.cs | 37 ++- .../FPJ0000/JobReport_/fJobReport.Designer.cs | 156 +++++++------ SubProject/FPJ0000/JobReport_/fJobReport.cs | 19 ++ SubProject/FPJ0000/JobReport_/fJobReport.resx | 75 ++++-- .../FPJ0000/JobReport_/rJobReport.Designer.cs | 197 +++++++++------- SubProject/FPJ0000/JobReport_/rJobReport.cs | 38 ++- SubProject/FPJ0000/JobReport_/rJobReport.resx | 73 ++++++ .../JobReport_/rJobReportDay.Designer.cs | 216 ++++++++++-------- .../FPJ0000/JobReport_/rJobReportDay.cs | 45 +++- .../FPJ0000/JobReport_/rJobReportDay.resx | 73 ++++++ .../OtConfirm/fHolyRequestAdd.Designer.cs | 177 +++++++++----- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 91 ++++++-- .../FPJ0000/Project/fProjectSchedule.cs | 82 +++++-- SubProject/FPJ0000/dsPRJ.xsd | 36 +-- 15 files changed, 939 insertions(+), 380 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 648bb31..064ae05 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("22.01.26.1040")] -[assembly: AssemblyFileVersion("22.01.26.1040")] +[assembly: AssemblyVersion("22.02.01.1200")] +[assembly: AssemblyFileVersion("22.02.01.1200")] diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 76a8e71..df2320b 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -224,6 +224,37 @@ namespace FCOMMON return retval; } + public static Dictionary GetUserHolidayJan(string gcode, string uid, string pdate) + { + var cn = getCn(); + cn.Open(); + + var retval = new Dictionary(); + var dt = DateTime.Parse(pdate); + var dtys = dt.Year.ToString("0000") + "-01-01"; + + string sql = "select isnull(cate,'--'), isnull(sum(termdr),0), isnull(sum(term),0), isnull(sum(termdr)-sum(term),0) , isnull(sum(drtime),0),isnull(sum(crtime),0), isnull(sum(drtime)-sum(crtime),0) as JanTime" + + " from Holyday " + + " where gcode=@gcode and uid = @uid and sdate between @sdate and @edate group by cate order by cate"; + + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = gcode; + cmd.Parameters.Add("uid", System.Data.SqlDbType.VarChar).Value = uid; + cmd.Parameters.Add("sdate", System.Data.SqlDbType.VarChar).Value = dtys; + cmd.Parameters.Add("edate", System.Data.SqlDbType.VarChar).Value = pdate; + + + + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.Add(rdr[0].ToString(), $"{rdr[1]}|{rdr[2]}|{rdr[3]}|{rdr[4]}|{rdr[5]}|{rdr[6]}"); + } + + cn.Close(); + cn.Dispose(); + return retval; + } /// /// 서플라이정보를 찾습니다. 1개의데이터가 검색된 경우에만 사용 됩니다. @@ -267,7 +298,7 @@ namespace FCOMMON /// /// /// - public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message,string rtf) + public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message, string rtf) { var cn = getCn(); @@ -716,7 +747,7 @@ namespace FCOMMON } - public static System.Data.DataTable getCodeTable(string GroupCode = "99",string sort="memo") + public static System.Data.DataTable getCodeTable(string GroupCode = "99", string sort = "memo") { System.Data.DataTable retval = new System.Data.DataTable(); @@ -730,7 +761,7 @@ namespace FCOMMON " from common" + " where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" + " and isnull(code,'') <> ''" + - " order by isnull("+ sort + ",'')"; + " order by isnull(" + sort + ",'')"; var cmd = new SqlCommand(sql, cn); var rdr = cmd.ExecuteReader(); while (rdr.Read()) diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 86fa29c..0abb2e4 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -30,26 +30,26 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = 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.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType3 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType4 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -108,6 +108,7 @@ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); @@ -116,7 +117,8 @@ this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -584,131 +586,131 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "기술료($K)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; 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).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType21; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; 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 = 80F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - numberCellType3.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + numberCellType7.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2021, 12, 20, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; + dateTimeCellType3.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType3.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType3.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType3.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType3.TimeDefault = new System.DateTime(2022, 2, 1, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType3; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType2.TimeDefault = new System.DateTime(2021, 12, 20, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; + dateTimeCellType4.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType4.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType4.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType4.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType4.TimeDefault = new System.DateTime(2022, 2, 1, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType4; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "초과종료"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType26; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "기술분류"; this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType27; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "기술레벨"; this.fpSpread1_Sheet1.Columns.Get(17).Tag = "kisullv"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 2; - numberCellType4.NegativeRed = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + numberCellType8.DecimalPlaces = 2; + numberCellType8.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Label = "기술료($K)"; this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType28; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag"; this.fpSpread1_Sheet1.Columns.Get(19).Label = "#"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -723,11 +725,13 @@ // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton8, this.lbStt, this.dtSD, this.lbEnd, this.toolStripLabel4, this.dtED, + this.toolStripButton7, this.lbTime, this.toolStripSeparator2, this.toolStripLabel1, @@ -821,6 +825,11 @@ this.toolStripButton4.Text = "toolStripButton4"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); + // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; @@ -905,10 +914,25 @@ this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; // - // toolStripSeparator3 + // toolStripButton7 // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); + this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(34, 34); + this.toolStripButton7.Text = "toolStripButton7"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); + // + // toolStripButton8 + // + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(34, 34); + this.toolStripButton8.Text = "toolStripButton7"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); // // fJobReport // @@ -1010,5 +1034,7 @@ private System.Windows.Forms.ToolStripButton toolStripButton6; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripButton toolStripButton8; + private System.Windows.Forms.ToolStripButton toolStripButton7; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index f6f26da..d488bf8 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -753,5 +753,24 @@ namespace FPJ0000 this.splitContainer1.Panel2Collapsed = !this.splitContainer1.Panel2Collapsed; richTextBox1.Visible = true; } + + private void toolStripButton8_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(dtSD.Text); + var sd = DateTime.Parse(sdo.AddMonths(-1).ToString("yyyy-MM-01")); + var ed = sd.AddMonths(1).AddDays(-1); + dtSD.Text = sd.ToShortDateString(); + dtED.Text = ed.ToShortDateString(); + + } + + private void toolStripButton7_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(dtSD.Text); + var sd = DateTime.Parse(sdo.AddMonths(1).ToString("yyyy-MM-01")); + var ed = sd.AddMonths(1).AddDays(-1); + dtSD.Text = sd.ToShortDateString(); + dtED.Text = ed.ToShortDateString(); + } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index fbe1eb3..4c088f6 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -260,20 +260,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSalFRL1JTmxrY - zVTMvM0pmprowiBbTCPzEpqoUCFK0YsK7aJTm5pzTjeckWnmXTed5XSpu5yjO2d+e87ZUgOhH3x4Xjzn - ++H8vucIuAm6q4q/UKJVhpdqfwfLtBQ5aZ4y7tTR4SV9dOgjzfAZqbriUMTrPXxo54Q86FGbrfTyhMHE - WuzrsNi2WbZy0PixYEX+ByOiS0cdogzFXk/UPWFFGvPM3E+2b9YJnYGBzshAO8tAM7MB1cQ6WkfsWGeA - plEK+e8MSHoyTP0jCZa1UmuODQzMsfgyx5CTQT8v2UD35Do+jTiIwIWBBRY6kxOFCiMC7nS+4sNRZf7T - 12QRm5LqK0iquoqqtnoUNJQhQOYDf4Ko8DSC5CdQ3lTOr2KjGSyuOBCU3s3wgsiSgLedQ81oHn+OKm0u - L4mrDEXuy1hk1kdDXHMRiTWJaBpcRPOwDR+/rWGV9BQs76F5gahCtNdPlsVqx7rwYkiOYlUGL4mvDiPh - S0h9mgL1pJ1fpWOcgpL0sGJ3Irig1y3gJqSom86uTYB+UoMa3W08bM9BVNk5xFdGQD/rgJ4UyxWsnnJ3 - YiGCIPkOwdl7MufJvIOIrRBhYKoPhV1pkCuyEf04EPWq9/g6z0BPiu2bcaKXYLY6EXDfIzgm9ZIIpQeQ - WReD69UhiCk/z0uyFbGQNqSQNwkEdz9gZNHPfWKClRTpm6VxC4TSffNC6X7ykBeEuV64XByI9GcJUI8o - UajMQ9qbBIirI6EnAh35N7REQDtdRKDaXsEvq4deWKUxOM/ydI+ZcKs2FckkKKmJRk7dza07DscGSwSN - 2wLONmfZFvwPO7dCyg7BqezPDv2ocXO3h3fD9MvsOhLXZPPESZGp7dOGNYdVPzbvml6iMG2mMOlhyebk - 4Zq30SwMpkUXRVGr3jdavnviAsHx1LZ0X3Fr+1GJ0uIraaS3SHbj8xdxI+0tblk5nNjS4ZOgSBIIBII/ - jEqgaRqp4qMAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZLrS1NhHMf3qv6EsF70UohSalFRL0xTmxrY + zVTMvM0pmprowiBbTCPzEpqoUCFK0YsK7aJTm5pzTjeckWne0jnntLwsdZdzdOfMb885W2og9IMPz4vn + fD+c3/ccATdBd1XxF0q0yvBS7e9gmZYiJ81Txp06Orykjw59pBk+I1VXHIp4vYcP7ZyQBz3qRSu9PGE0 + sxb7Oiy2bZatHDRG563I/2BCdOmYQ5Sh2OuJuiesSLNoMM2zfUYndDMMdCYGWiMDzfQGVD/W0TpixzoD + NI1RyH83g6Qnw9Q/kmBZK7Xm2MDALIsvsww5GfTzkg10T67j04iDCFwYmGehm3OiUGFCwJ3OV3w4qszf + cE0WsSmpvoKkqquoaqtHQUMZAmQ+8CeICk8jSH4C5U3l/Co2msHCigNBad0ML4gsCXjbOdSM5onnqNLm + 8pK4ylDkvoxFZn00xDUXkViTiKbBBTQP2/Dx2xpWSU/B8h6aF4gqRHv9ZFmsdrwLL4bkKFZl8JL46jAS + voTUpylQT9r5VTomKChJDyt2J4ILet0CbkKKuuns2gToJzWo0d3Gw/YcRJWdQ3xlBPRGB/SkWK5g9ZS7 + EwsRBMl3CPzuyZwn8w4itkKEgak+FHalQa7IRvTjQNSr3uOrmYGeFNs37UQvYdHqRMB9j+CY1EsilB5A + Zl0MrleHIKb8PC/JVsRC2pBC3iQQ3P2AiUU/94kJVlKkb5bGLRBK95mF0v3kIS8Ic71wuTgQ6c8SoB5R + olCZh7Q3CRBXR0JPBDryb2iJgHa6iEC1vcLZrB56fpXGoJnl6R6fw63aVCSToKQmGjl1N7fuOBwbLBE0 + bgs426xlW/A/7NwKKTsEp7I/O/pHZzZ3e3g3zD8XXEfimmyeOCkytd0ws+aw9o/NugxLFAyLFCY9LNmc + PFzzNpqF0fzLRVHUqveNlu+euEBwPLUt3Vfc2n5UorT4ShrpLZLd+PxF3Eh7i1tWDie2dPgkKJIEAoHg + D2sGoFW3eSyMAAAAAElFTkSuQmCC @@ -303,6 +303,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 17, 17 + 325, 17 @@ -354,7 +357,7 @@ 561, 17 - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 @@ -364,7 +367,7 @@ AAD/////AQgAAP////8AAQgAAAs= - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 @@ -377,6 +380,46 @@ 393, 17 + + + iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANRSURBVFhH7dhZTxNRHAVwPoRx3yuyKUtZCgUUcQPXaExM + jF/AF1ETjQhCEWVroVCgbILKopK4RoRCV9pS2YpPqAmokWDUiFE2WeU4k84k1If23iHBl57kPt9fZu6Z + /+R6eeKJJwLy8PjrCw+O2SfuH+1DwxFmHbaj/pAddYm9qE3oxb2DPbh7oAd39jNrXzdq9najOr4Lt/d0 + oSquE5W7O1Gx6xXKY5kVY0NZtA1qqQ2lUR0oiexAscQKVQSzwi0oCrOgMNQ8USA2JXHbu88y46AUm6EI + MY9z27vPcuMKQszID24Ht737/A+cIogGuARcWUwHVFFG5EvaUCgxoDjSSoRTBJrIgUt5ckVSPfoef8Ts + 1Dx6Gj9AEaYjwsl3UgCF4tgnZ6l8h8UpSdAT4fJ2GMmBQnAlUjMeXerGwp8Fjgb8HJ6EPEJDhMsNoADS + 4tTRVlSdMmF6fJajAXMz86g52w5laDsRLsffQA6kwzGliNPj+/sxjubIC1kf8kMNxLhsPwogKY79lCgj + dXir+8yxHOlqGEReiJYKl+VLAyTEFUUaYa5wLsVQ3whz7lqpcVk+enIgCa44iinFRedSjH75jaJ4LXPu + TNS4W9spgO5wpVKuFBNzHM1Riuoz7WCGviDcTW8dOdAVjh1fyggDBq1fOZojz1LtUIj1gnGZ2yiArnDs + bC0IN2DA4gx8mtILeYheMO6GSEsOdIVjB79KYkb5CaPzK56eR+VpBhRkFITL2EoBdIXjB78yzIjGpC6n + kvxiSqKIbYU80ECNk21pIwe6w/GzVS7Wwah+w/Ec+WQfQVZQMzUufTMNkADHf+eygzTobxvmeI7YageQ + 6d9ChUvf1EoOJMWxhVAEm5Ar0eDb4CjHc+RJcg8yfVuJcWkbKYCkOL6t7JlTJeowNbboZ4Epjfokg/LR + EuGub6AA0uD4tmYHaFF/rsOpND+GxiHzayLCpa7XkANpcXwhMv000Kn6OZ4jOVEtRLiUdRRAITi+EDLf + l+hk/mZmJudgqxtAmqiJCHdtbQs5UCiOL4TMuwWpoucMrhkZojYiXPIaGuAScKSF+BeXvLqZHPg/cFdX + UQAZ3MRy4y6vbCK/+mAvcti7kuXEXVnRdJ7b3hNPPCGPl9dfmxo+BV0T69wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7djJTxNRHAdw/gjjvq+UtQUEhILgDrglRhMP + 3r2oeEFBkb3slAKCLC4IiEbFRFna0qHTIlDKdpJAgkCiSCJGEimRRfk6w0wjxIS+NyZw6Td55/fJvPnO + 72VcnHHGGQl5fq4vuvZsr+3ZmV7UnOZWVA+qI3tQFdGNp6e6UXmyC09OdOHxcW4ds+LRUSseHulERXgn + ysMsKDtsQWloBx6EcEvZjpLgdhQHteP+oTYUBbahMOA9Cvy5dbAVGr9W5PuabXk+7A1xe8dZZRzUPmbk + KsxT4vaOs9q4PAUHlJsgbu84a4HL8aYBEuLKwy0oDjVBo2xGkZJFSUi7ZFyOF0sOJH1yRSEsel+NYO7n + L/TVjaIgmJGMy/akABIf63kWS9NaNgBNoFESLsvDSA4kfecKwxhMjk2LPGDh9wJe3rRCE2CixmW6UwBJ + C1GsbEPlldbFI7Zn1jaPsossNP5mKlyGWws5kARnb2thkAlv43tFnpBvo1NQh+qR72cmxqXLKICkOHsh + 1P4tsNZ+FHlCBtlxZPnoiHEqVxogBc5eiJwAHUasEyJPiLG4H5lyAxFOdYAhB9Li+EJo/Ll3LUyPyc9L + SrMAvIi2IMPL4BCXtp8CSIuzt1Xta0LFZRbzM39LMzM1h8IoA7I8W1bEpe4zkAOl4OxtzVYweBPXLfKE + DJrGkeqmXRGXspcCKBXHFyJLzqAudjlwwPiFA+pWxCXvaSYHSsXlyFmUXjL+c8SaiGakuzEr4pJ2UwCl + 4HIVJmQrtfj+ySbShJLUXutAqkznEJe4S08OpMXx3zmVvBHD1q8iTQhT8AEpMi0RLmEnDZASl+6lR0f1 + kMgS0s+MIdmtgRiXsENHDqTBZXob8PpWl8gSMjH8Ayq/RqhkDDHu3nYKICku29uIkgvGZZeFGe6yUBDZ + TI2L30YBJMHx4ytd0bS8FNx1q+pqG1Jd9dS4u1u15EASHD9b1eF6kSaEL0Wyq1YS7s4WCiAJjp+tae5a + dD4bwuz0PCw1Q0iSNUjGxW1uIgeS4PjBn+nRsjghEl3f/deT43Gxm2iABDhHg58WF7uxkRy4FrjbGyiA + HM622riY9fXkvz74Hzn8v5LVxMWsq78ubu+MM86Qx8XlD1h6Pq4TZeLwAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs index 0173b8c..e0280f7 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs @@ -29,21 +29,25 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(rJobReport)); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsReport = new FPJ0000.dsReport(); this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter(); this.dataGridView1 = new arCtl.arDatagridView(); - this.panel1 = new System.Windows.Forms.Panel(); - this.button1 = new System.Windows.Forms.Button(); - this.tbProcess = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.btRefresh = new System.Windows.Forms.Button(); - this.tbMon = new System.Windows.Forms.TextBox(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); + this.tbMon = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tbProcess = new System.Windows.Forms.ToolStripComboBox(); + this.btSearch = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.panel1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // bs @@ -71,86 +75,107 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(0, 42); + this.dataGridView1.Location = new System.Drawing.Point(0, 37); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1003, 534); + this.dataGridView1.Size = new System.Drawing.Size(1003, 539); this.dataGridView1.TabIndex = 2; // - // panel1 + // toolStrip1 // - this.panel1.Controls.Add(this.button1); - this.panel1.Controls.Add(this.tbProcess); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.linkLabel1); - this.panel1.Controls.Add(this.btRefresh); - this.panel1.Controls.Add(this.tbMon); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1003, 42); - this.panel1.TabIndex = 3; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton8, + this.lbStt, + this.tbMon, + this.toolStripButton7, + this.toolStripSeparator2, + this.toolStripLabel1, + this.tbProcess, + this.btSearch, + this.toolStripButton6}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1003, 37); + this.toolStrip1.TabIndex = 6; + this.toolStrip1.Text = "toolStrip1"; // - // button1 + // toolStripButton8 // - this.button1.Dock = System.Windows.Forms.DockStyle.Right; - this.button1.Location = new System.Drawing.Point(848, 5); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 32); - this.button1.TabIndex = 8; - this.button1.Text = "내보내기"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(34, 34); + this.toolStripButton8.Text = "toolStripButton7"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); // - // tbProcess + // lbStt // - this.tbProcess.FormattingEnabled = true; - this.tbProcess.Location = new System.Drawing.Point(222, 10); - this.tbProcess.Name = "tbProcess"; - this.tbProcess.Size = new System.Drawing.Size(158, 20); - this.tbProcess.TabIndex = 7; - this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(187, 15); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 12); - this.label1.TabIndex = 6; - this.label1.Text = "공정"; - // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(13, 15); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(45, 12); - this.linkLabel1.TabIndex = 0; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "조회 년"; - // - // btRefresh - // - this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; - this.btRefresh.Location = new System.Drawing.Point(923, 5); - this.btRefresh.Name = "btRefresh"; - this.btRefresh.Size = new System.Drawing.Size(75, 32); - this.btRefresh.TabIndex = 2; - this.btRefresh.Text = "새로고침"; - this.btRefresh.UseVisualStyleBackColor = true; - this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); + this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbStt.ForeColor = System.Drawing.Color.Blue; + this.lbStt.LinkColor = System.Drawing.Color.Black; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(47, 34); + this.lbStt.Text = "조회 년"; // // tbMon // - this.tbMon.Location = new System.Drawing.Point(66, 10); + this.tbMon.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbMon.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbMon.Name = "tbMon"; - this.tbMon.Size = new System.Drawing.Size(115, 21); - this.tbMon.TabIndex = 1; - this.tbMon.Text = "2020"; - this.tbMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbMon.Size = new System.Drawing.Size(90, 37); + this.tbMon.Text = "1982"; + this.tbMon.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripButton7 + // + this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(34, 34); + this.toolStripButton7.Text = "toolStripButton7"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel1.Text = "공정"; + // + // tbProcess + // + this.tbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(200, 37); + this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged); + // + // btSearch + // + this.btSearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSearch.Name = "btSearch"; + this.btSearch.Size = new System.Drawing.Size(80, 34); + this.btSearch.Text = "조회(&R)"; + this.btSearch.Click += new System.EventHandler(this.btSearch_Click); + // + // toolStripButton6 + // + this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(89, 34); + this.toolStripButton6.Text = "내보내기"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); // // rJobReport // @@ -158,16 +183,17 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1003, 576); this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.panel1); + this.Controls.Add(this.toolStrip1); this.Name = "rJobReport"; this.Text = "월/개인별 근무시간 내역 집계"; this.Load += new System.EventHandler(this.rJobReport_Load); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -176,12 +202,15 @@ private dsReport dsReport; private dsReportTableAdapters.jobReportTableAdapter ta; private arCtl.arDatagridView dataGridView1; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.LinkLabel linkLabel1; - private System.Windows.Forms.Button btRefresh; - private System.Windows.Forms.TextBox tbMon; - private System.Windows.Forms.ComboBox tbProcess; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button button1; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton8; + private System.Windows.Forms.ToolStripLabel lbStt; + private System.Windows.Forms.ToolStripTextBox tbMon; + private System.Windows.Forms.ToolStripButton toolStripButton7; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripComboBox tbProcess; + private System.Windows.Forms.ToolStripButton btSearch; + private System.Windows.Forms.ToolStripButton toolStripButton6; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReport.cs b/SubProject/FPJ0000/JobReport_/rJobReport.cs index 52e428c..08c4e0f 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReport.cs @@ -138,17 +138,51 @@ namespace FPJ0000.JobReport_ private void btRefresh_Click(object sender, EventArgs e) { - refrehData(); + } private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) { - if (tbProcess.SelectedIndex >= 0) refrehData(); + } private void button1_Click(object sender, EventArgs e) + { + + } + + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + + } + + private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + if (tbProcess.SelectedIndex >= 0) refrehData(); + } + + private void toolStripButton6_Click(object sender, EventArgs e) { dataGridView1.ExportData(string.Empty); } + + private void btSearch_Click(object sender, EventArgs e) + { + refrehData(); + } + + private void toolStripButton8_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(this.tbMon.Text + "-01-01"); + var sd = sdo.AddYears(-1); + tbMon.Text = sd.ToString("yyyy"); + } + + private void toolStripButton7_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(this.tbMon.Text + "-01-01"); + var sd = sdo.AddYears(1); + tbMon.Text = sd.ToString("yyyy"); + } } } diff --git a/SubProject/FPJ0000/JobReport_/rJobReport.resx b/SubProject/FPJ0000/JobReport_/rJobReport.resx index 1693e4e..7e35aee 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/rJobReport.resx @@ -123,7 +123,80 @@ 79, 17 + + 79, 17 + 17, 17 + + 605, 17 + + + + + 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 + GAwfCJT5L4+U6JYAAAAASUVORK5CYII= + + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs index 8a3fd5e..64cadd2 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs @@ -29,21 +29,25 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(rJobReportDay)); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsReport = new FPJ0000.dsReport(); - this.panel1 = new System.Windows.Forms.Panel(); - this.button1 = new System.Windows.Forms.Button(); - this.tbProcess = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.btRefresh = new System.Windows.Forms.Button(); - this.tbMon = new System.Windows.Forms.TextBox(); this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter(); this.dataGridView1 = new arCtl.arDatagridView(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); + this.tbMon = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tbProcess = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); + this.btSearch = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); - this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // bs @@ -56,80 +60,6 @@ this.dsReport.DataSetName = "dsReport"; this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // panel1 - // - this.panel1.Controls.Add(this.button1); - this.panel1.Controls.Add(this.tbProcess); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.linkLabel1); - this.panel1.Controls.Add(this.btRefresh); - this.panel1.Controls.Add(this.tbMon); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1041, 42); - this.panel1.TabIndex = 0; - // - // button1 - // - this.button1.Dock = System.Windows.Forms.DockStyle.Right; - this.button1.Location = new System.Drawing.Point(886, 5); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 32); - this.button1.TabIndex = 6; - this.button1.Text = "내보내기"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click_1); - // - // tbProcess - // - this.tbProcess.FormattingEnabled = true; - this.tbProcess.Location = new System.Drawing.Point(233, 10); - this.tbProcess.Name = "tbProcess"; - this.tbProcess.Size = new System.Drawing.Size(158, 20); - this.tbProcess.TabIndex = 5; - this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(198, 15); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 12); - this.label1.TabIndex = 3; - this.label1.Text = "공정"; - // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(13, 15); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(45, 12); - this.linkLabel1.TabIndex = 0; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "조회 월"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // - // btRefresh - // - this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; - this.btRefresh.Location = new System.Drawing.Point(961, 5); - this.btRefresh.Name = "btRefresh"; - this.btRefresh.Size = new System.Drawing.Size(75, 32); - this.btRefresh.TabIndex = 2; - this.btRefresh.Text = "새로고침"; - this.btRefresh.UseVisualStyleBackColor = true; - this.btRefresh.Click += new System.EventHandler(this.button1_Click); - // - // tbMon - // - this.tbMon.Location = new System.Drawing.Point(66, 10); - this.tbMon.Name = "tbMon"; - this.tbMon.Size = new System.Drawing.Size(115, 21); - this.tbMon.TabIndex = 1; - this.tbMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // ta // this.ta.ClearBeforeFill = true; @@ -145,43 +75,141 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(0, 42); + this.dataGridView1.Location = new System.Drawing.Point(0, 37); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1041, 586); + this.dataGridView1.Size = new System.Drawing.Size(1041, 591); this.dataGridView1.TabIndex = 1; // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton8, + this.lbStt, + this.tbMon, + this.toolStripButton7, + this.toolStripSeparator2, + this.toolStripLabel1, + this.tbProcess, + this.btSearch, + this.toolStripButton6}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1041, 37); + this.toolStrip1.TabIndex = 5; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton8 + // + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(34, 34); + this.toolStripButton8.Text = "toolStripButton7"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // + // lbStt + // + this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbStt.ForeColor = System.Drawing.Color.Blue; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(47, 34); + this.lbStt.Text = "조회 월"; + this.lbStt.Click += new System.EventHandler(this.lbStt_Click); + // + // tbMon + // + this.tbMon.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbMon.Name = "tbMon"; + this.tbMon.Size = new System.Drawing.Size(90, 37); + this.tbMon.Text = "1982-11"; + this.tbMon.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripButton7 + // + this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(34, 34); + this.toolStripButton7.Text = "toolStripButton7"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel1.Text = "공정"; + // + // tbProcess + // + this.tbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(200, 37); + this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); + // + // toolStripButton6 + // + this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(89, 34); + this.toolStripButton6.Text = "내보내기"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); + // + // btSearch + // + this.btSearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSearch.Name = "btSearch"; + this.btSearch.Size = new System.Drawing.Size(80, 34); + this.btSearch.Text = "조회(&R)"; + this.btSearch.Click += new System.EventHandler(this.btSearch_Click); + // // rJobReportDay // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1041, 628); this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.panel1); + this.Controls.Add(this.toolStrip1); this.Name = "rJobReportDay"; this.Text = "일/개인별 근무시간 집계(+OT 포함)"; this.Load += new System.EventHandler(this.rJobReport_Load); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private dsReport dsReport; private System.Windows.Forms.BindingSource bs; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Button btRefresh; - private System.Windows.Forms.TextBox tbMon; - private System.Windows.Forms.LinkLabel linkLabel1; private dsReportTableAdapters.JobReportDayTableAdapter ta; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.ComboBox tbProcess; private arCtl.arDatagridView dataGridView1; - private System.Windows.Forms.Button button1; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton8; + private System.Windows.Forms.ToolStripLabel lbStt; + private System.Windows.Forms.ToolStripTextBox tbMon; + private System.Windows.Forms.ToolStripButton toolStripButton7; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripComboBox tbProcess; + private System.Windows.Forms.ToolStripButton toolStripButton6; + private System.Windows.Forms.ToolStripButton btSearch; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs index 099372e..6d7f800 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs @@ -199,7 +199,7 @@ namespace FPJ0000.JobReport_ } private void button1_Click(object sender, EventArgs e) { - refrehData(); + } private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) @@ -208,8 +208,51 @@ namespace FPJ0000.JobReport_ } private void button1_Click_1(object sender, EventArgs e) + { + + } + + private void lbStt_Click(object sender, EventArgs e) + { + var f = new FCOMMON.fSelectMonth(); + if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + this.tbMon.Text = string.Format("{0:0000}-{1:00}", DateTime.Now.Year, f.selectmon); + refrehData(); + } + + private void toolStripTextBox1_Click(object sender, EventArgs e) + { + + } + + private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) + { + if (tbProcess.SelectedIndex >= 0) refrehData(); + } + + private void toolStripButton6_Click(object sender, EventArgs e) { dataGridView1.ExportData(string.Empty); } + + private void btSearch_Click(object sender, EventArgs e) + { + refrehData(); + } + + private void toolStripButton8_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(this.tbMon.Text + "-01"); + var sd = sdo.AddMonths(-1); + tbMon.Text = sd.ToString("yyyy-MM"); + + } + + private void toolStripButton7_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(this.tbMon.Text + "-01"); + var sd = sdo.AddMonths(1); + tbMon.Text = sd.ToString("yyyy-MM"); + } } } diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx index d42e47f..fad4171 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx @@ -123,7 +123,80 @@ 17, 17 + + 17, 17 + 245, 17 + + 499, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB1aNkXcwDUaExPj + F/BF1BgjglBE2VoolB0ElUUlcY0VCl0pbQVK8Qk1ATUSjBoxyiarHO+k04T6QO8dEnzpSe7z/WVmzvxv + roc77rgjIA+Pv77w4FjP+P2jvWg8QtZhGxoO2VCf2IO6hB7cO2jF3QNW3NlP1r5u1O7tRk18F27v6UJ1 + XCeqdneictcrVMSSFWNBebQFZVEWlEaaUSI2o1hkgiKCrPAOFIV1oDDUOF4QYkjit3edZcZBHmKENNg4 + xm/vOsuNKwg2Ij+oHfz2rvM/cLJAFuAScOUxZigi9cgXtaFQpEOx2ESFkwUY6IFLeXJFUVr0Pv6Imck5 + WJs+QBamocJJdzIAheK4J9dR9Q4LU5KgpcLl7dDTA4XgSqKMeHSpG/N/5nka8HNoAtIIFRUu158ByIor + izah+pQBU2MzPA2YnZ5D7dl2yEPbqXA5fjp6IBuOlCJOi+/vR3maPS8kvcgP1VHjsn0ZgLQ47lciF2vw + VvOZZ9nT1TiAvGA1Ey7LhwVIiSsS62GsdC7FYO8w+e5amXFZ3lp6IA2uOJKU4qJzKUa+/EZRvJp8dwZm + 3K3tDEBXuNIovhTjszzNXoqaM+0gQ18Q7qaXhh64GI4bX/IIHQZMX3maPc9SbZCFaAXjMrcxABfDcbO1 + IFyH/g5n4NOUHnIi0QrG3fBU0wMXw3GDXyEyouKE3vkVT82h6jQBBeoF4TK2MgAXwzkGvzxMj6akLqeS + /CIlkcW2QhqgY8ZJtrTRA13hHLNVGqKBvuwNz7Pnk20YWYHNzLj0zSxACpzjP5cdqEJf2xDPs8dS149M + vxYmXPqmVnogLY4rhCzIgFyRCt8GRniePU+Srcj0aaXGpW1kANLiHG3lvjlFogaTowsOC6Q0ZScJyltN + hbu+gQHIgnO0NdtfjYZzZqfS/Bgcg8RXSYVLXa+iB7LiHIXI9FVBo+jjefbkRLZQ4VLWMQCF4ByFkPi8 + RCc5zUxPzMJS3480TyUV7traFnqgUJyjEBKvFqR6Pie4ZmR4tlHhktewAJeAoy3Ev7jk1c30wP+Bu7qK + AUhw48uNu7xSSX/1wV3kcHcly4m7skJ5nt/eHXfcoY+Hx19QQj3/6zErOwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANRSURBVFhH7djJTxNRHAdw/gjjvq+UtQUE1ILgDq6J0cSD + dy9uBxdQBKGUrVAKWBRxRUWjYuKC3aadtraUsp0kkCCYuJCIkURKZFG+zjDTCDGh740JXvpN3vl9Mm++ + 83uZkGCCCUZCHu7vOFW/r833YG877u/h1u423EtvQ11aK+7uasWdnS24vaMFt7Zza5sXN7d6cWNLM2pT + m3E9xYOazR5cS27C1SRuKd2o3uSGfqMbVza4UJXoQmXCG1TEc2u9E7o4J8pjHb6yGPakuH3gzDIO2hgH + NArHkLh94Mw2rkzhQKncDnH7wPkfOE00DZAQdz3VA32yHTqlGVVKFtVJbsk4TRRLDiR9clVJLNqf9GHs + x090NLxHxSZGMq4kkgJIfKwHWEyNs6YLukSbJFxxhI0cSPrOVaYwGPw0LPKAiV8TeHzaC12CnRpXFE4B + JC2EXunCnaPOySP2Z9Q3jppDLHTxDipcYZiVHEiC87e1cqMdz7PaRZ6Qr++HoE02oTzOQYwrkFEASXH+ + QmjjrfDWvxN5QrrZfhTHGIlx6lAaIAXOXwhNghF93gGRJ8Sm70SR3EKEU69jyIG0OL4QunjuXUsxYfDj + lNJMAI9OeVAYZQmIy19LAaTF+duqjbWj9giL8ZE/pRkZGkPlbguKI60z4lRrLORAKTh/W0sUDJ5ltoo8 + Id32fqjCDDPi8lZTAKXi+EIUyxk0ZEwHdtk+c0DjjLjcVWZyoFScRs7i2mHbX0esSzOjIIyZEXd5JQVQ + Cq5UYUeJ0oBvH3wiTShJ/fEmqGTGgLicFSZyIC2O/86p5Y3o9X4RaUKYirfIkxmIcNnLaYCUuIIoE5ru + 9YgsIZ3MJ+SGvSLGZS8zkgNpcEXRFjw91yKyhAz0foc6rhFqGUOMu7SUAkiKK4m2ofqgbdplYYS7LFSk + m6lxWUsogCQ4fnwVKF5PLwV33ao75oIq1ESNu7jYQA4kwfGzVZtqEmlC+FLkhhok4S4sogCS4PjZmh9u + QPODHowOj8NzvweXZa8k4zIXviYHkuD4wV8UYZ2cEDmhL/7pyfG4jAU0QAJcoMFPi8uY30gO/B+48/Mo + gBzON9u4M3Nfkv/64H/k8P9KZhN3ds7LE+L2wQQTDHlCQn4DDaI+qML4+4cAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPtZPPasJAEMbzPn0FwWA92JtP4NGKB1/DP7ei + QSsovkChh7ZBrCfpyR4sikopUgq9StFzM/UbZ5asSS4FfzAkO7vft5udiZMEnSBpk5dhFJmncjdHxXaG + A+9K4SbFT1luEwQBbXavVO5d0nI3ovnW5yeiMriiu+kt5asXbABEdgRigAUQDr+aHLU3lxoLl/yPJhvF + GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG + cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E + dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIPSURBVFhHYxgFtAKWPZYa5r3W5VTB/fYKUGOpByx7bUIt + +mz+U4ptJzn+N++1eWjSZ6MENZo6gFoOXH9l43+vGb7UdyS1HHjqyZn/Z5+epb4jqenAF19fUt+R1HYg + 1R1JCwdS1ZG0ciDVHElLByI70qLX+r7ZRHsZqLXEA2o5cOaxOf/XXVqPFfcfnPjfss/2P8guqLXEA2o5 + kBg86kBK8agDKcUj14G1W+v/Tz08HYw9pnvDxQvWFcPFQ+dFoOjBhmnmwKottf9hYOHJRWAxx8ku/999 + fQcWe/rh2X/biY4Y+tAxzRwIwuefXAA75tuvb+BQnHxoKpgPAiAPYNODjmnqwPglSf///vsLdtCSM8v+ + v/7yBsy+/OwyuJbApgcd09SBILzj+k6wo2DgHxAmLUvFqhYbprkD/WcHw0MRBPbe3IdVHS5McwdWbq6G + Og0Cnnx4SlTmgGGaOhDkkCfvn4AdBkt/IDD54FSs6rFhmjpwyqFpUCf9/1+2seL/2cfnwOyvP7/+957p + h1UPOqaZAz2m+/z//OML2EG3Xt0C59qsVblgPgisu7geqz50TDMHrr+4AeqU///LN1XBxc89Pg8WA2Wc + mEXxKHqwYZo5MHZx4v+EpclgjFzmec3wg4v7zApA0YMN08yB1MKjDqQUjzqQUjzqQEoxWQ606LXTBWru + oAsG2gW1dhRQGTAwAACtgPk32asT/QAAAABJRU5ErkJggg== + + \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs index ca1ec72..1918225 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs @@ -44,7 +44,6 @@ namespace FPJ0000.OtConfirm this.radTime = new System.Windows.Forms.RadioButton(); this.tbTimes = new System.Windows.Forms.TextBox(); this.tbDays = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.tbBackup = new System.Windows.Forms.ComboBox(); this.label9 = new System.Windows.Forms.Label(); @@ -62,10 +61,15 @@ namespace FPJ0000.OtConfirm this.tbResponse = new System.Windows.Forms.RichTextBox(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit(); this.grpUser.SuspendLayout(); this.grpAdmin.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // label1 @@ -80,11 +84,11 @@ namespace FPJ0000.OtConfirm // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(38, 130); + this.label2.Location = new System.Drawing.Point(526, 84); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(93, 27); + this.label2.Size = new System.Drawing.Size(33, 27); this.label2.TabIndex = 4; - this.label2.Text = "종료일"; + this.label2.Text = "~"; // // tbCate // @@ -93,9 +97,9 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbCate.Location = new System.Drawing.Point(143, 173); + this.tbCate.Location = new System.Drawing.Point(143, 123); this.tbCate.Name = "tbCate"; - this.tbCate.Size = new System.Drawing.Size(429, 35); + this.tbCate.Size = new System.Drawing.Size(381, 35); this.tbCate.TabIndex = 7; // // bs @@ -112,37 +116,33 @@ namespace FPJ0000.OtConfirm // this.tbSD.Location = new System.Drawing.Point(143, 79); this.tbSD.Name = "tbSD"; - this.tbSD.Size = new System.Drawing.Size(627, 38); + this.tbSD.Size = new System.Drawing.Size(381, 38); this.tbSD.TabIndex = 3; // // tbED // - this.tbED.Location = new System.Drawing.Point(143, 126); + this.tbED.Location = new System.Drawing.Point(565, 79); this.tbED.Name = "tbED"; - this.tbED.Size = new System.Drawing.Size(627, 38); + this.tbED.Size = new System.Drawing.Size(381, 38); this.tbED.TabIndex = 5; this.tbED.ValueChanged += new System.EventHandler(this.tbED_ValueChanged); // // tbRemark // this.tbRemark.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbRemark.Location = new System.Drawing.Point(143, 337); + this.tbRemark.Location = new System.Drawing.Point(144, 246); this.tbRemark.Name = "tbRemark"; - this.tbRemark.Size = new System.Drawing.Size(629, 84); + this.tbRemark.Size = new System.Drawing.Size(578, 133); this.tbRemark.TabIndex = 16; this.tbRemark.Text = ""; // // grpUser // - this.grpUser.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.grpUser.Controls.Add(this.richTextBox1); + this.grpUser.Controls.Add(this.groupBox1); this.grpUser.Controls.Add(this.cmbUser); this.grpUser.Controls.Add(this.radioButton2); this.grpUser.Controls.Add(this.radTime); - this.grpUser.Controls.Add(this.tbTimes); - this.grpUser.Controls.Add(this.tbDays); - this.grpUser.Controls.Add(this.label11); this.grpUser.Controls.Add(this.label10); this.grpUser.Controls.Add(this.tbBackup); this.grpUser.Controls.Add(this.label9); @@ -157,12 +157,14 @@ namespace FPJ0000.OtConfirm this.grpUser.Controls.Add(this.tbSD); this.grpUser.Controls.Add(this.label4); this.grpUser.Controls.Add(this.tbCate); - this.grpUser.Location = new System.Drawing.Point(12, 12); + this.grpUser.Dock = System.Windows.Forms.DockStyle.Top; + this.grpUser.Location = new System.Drawing.Point(3, 3); this.grpUser.Name = "grpUser"; - this.grpUser.Size = new System.Drawing.Size(788, 487); + this.grpUser.Size = new System.Drawing.Size(957, 471); this.grpUser.TabIndex = 0; this.grpUser.TabStop = false; this.grpUser.Text = "신청자"; + this.grpUser.Enter += new System.EventHandler(this.grpUser_Enter); // // cmbUser // @@ -170,14 +172,15 @@ namespace FPJ0000.OtConfirm this.cmbUser.FormattingEnabled = true; this.cmbUser.Location = new System.Drawing.Point(143, 34); this.cmbUser.Name = "cmbUser"; - this.cmbUser.Size = new System.Drawing.Size(627, 35); + this.cmbUser.Size = new System.Drawing.Size(803, 35); this.cmbUser.TabIndex = 1; + this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); // // radioButton2 // this.radioButton2.AutoSize = true; this.radioButton2.Checked = true; - this.radioButton2.Location = new System.Drawing.Point(53, 173); + this.radioButton2.Location = new System.Drawing.Point(53, 123); this.radioButton2.Name = "radioButton2"; this.radioButton2.Size = new System.Drawing.Size(84, 31); this.radioButton2.TabIndex = 6; @@ -189,7 +192,7 @@ namespace FPJ0000.OtConfirm // radTime // this.radTime.AutoSize = true; - this.radTime.Location = new System.Drawing.Point(578, 174); + this.radTime.Location = new System.Drawing.Point(565, 127); this.radTime.Name = "radTime"; this.radTime.Size = new System.Drawing.Size(192, 31); this.radTime.TabIndex = 8; @@ -201,34 +204,26 @@ namespace FPJ0000.OtConfirm // tbTimes // this.tbTimes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbTimes.Location = new System.Drawing.Point(272, 430); + this.tbTimes.Location = new System.Drawing.Point(78, 81); this.tbTimes.Name = "tbTimes"; - this.tbTimes.Size = new System.Drawing.Size(116, 38); + this.tbTimes.Size = new System.Drawing.Size(130, 38); this.tbTimes.TabIndex = 19; this.tbTimes.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbDays // this.tbDays.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbDays.Location = new System.Drawing.Point(143, 430); + this.tbDays.Location = new System.Drawing.Point(78, 37); this.tbDays.Name = "tbDays"; - this.tbDays.Size = new System.Drawing.Size(116, 38); + this.tbDays.Size = new System.Drawing.Size(130, 38); this.tbDays.TabIndex = 18; this.tbDays.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(29, 433); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(102, 27); - this.label11.TabIndex = 17; - this.label11.Text = "사용 일"; + this.tbDays.TextChanged += new System.EventHandler(this.tbDays_TextChanged); // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(11, 300); + this.label10.Location = new System.Drawing.Point(12, 209); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(120, 27); this.label10.TabIndex = 13; @@ -241,19 +236,20 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbBackup.Location = new System.Drawing.Point(143, 296); + this.tbBackup.Location = new System.Drawing.Point(144, 205); this.tbBackup.Name = "tbBackup"; - this.tbBackup.Size = new System.Drawing.Size(627, 35); + this.tbBackup.Size = new System.Drawing.Size(802, 35); this.tbBackup.TabIndex = 14; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(38, 258); + this.label9.Location = new System.Drawing.Point(467, 167); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(93, 27); this.label9.TabIndex = 11; this.label9.Text = "행선지"; + this.label9.Click += new System.EventHandler(this.label9_Click); // // tbLocation // @@ -262,15 +258,16 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbLocation.Location = new System.Drawing.Point(143, 255); + this.tbLocation.Location = new System.Drawing.Point(565, 164); this.tbLocation.Name = "tbLocation"; - this.tbLocation.Size = new System.Drawing.Size(627, 35); + this.tbLocation.Size = new System.Drawing.Size(381, 35); this.tbLocation.TabIndex = 12; + this.tbLocation.SelectedIndexChanged += new System.EventHandler(this.tbLocation_SelectedIndexChanged); // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(65, 217); + this.label8.Location = new System.Drawing.Point(66, 167); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(66, 27); this.label8.TabIndex = 9; @@ -283,10 +280,11 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbReason.Location = new System.Drawing.Point(143, 214); + this.tbReason.Location = new System.Drawing.Point(144, 164); this.tbReason.Name = "tbReason"; - this.tbReason.Size = new System.Drawing.Size(627, 35); + this.tbReason.Size = new System.Drawing.Size(310, 35); this.tbReason.TabIndex = 10; + this.tbReason.SelectedIndexChanged += new System.EventHandler(this.tbReason_SelectedIndexChanged); // // label5 // @@ -300,7 +298,7 @@ namespace FPJ0000.OtConfirm // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(65, 340); + this.label4.Location = new System.Drawing.Point(66, 249); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(66, 27); this.label4.TabIndex = 15; @@ -308,25 +306,25 @@ namespace FPJ0000.OtConfirm // // grpAdmin // - this.grpAdmin.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.grpAdmin.Controls.Add(this.chkSendMail); this.grpAdmin.Controls.Add(this.cmbPreset); this.grpAdmin.Controls.Add(this.rad2); this.grpAdmin.Controls.Add(this.rad1); this.grpAdmin.Controls.Add(this.rad0); this.grpAdmin.Controls.Add(this.tbResponse); - this.grpAdmin.Location = new System.Drawing.Point(12, 503); + this.grpAdmin.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpAdmin.Location = new System.Drawing.Point(3, 474); this.grpAdmin.Name = "grpAdmin"; - this.grpAdmin.Size = new System.Drawing.Size(788, 179); + this.grpAdmin.Size = new System.Drawing.Size(957, 296); this.grpAdmin.TabIndex = 1; this.grpAdmin.TabStop = false; this.grpAdmin.Text = "관리자"; // // chkSendMail // + this.chkSendMail.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkSendMail.AutoSize = true; - this.chkSendMail.Location = new System.Drawing.Point(631, 37); + this.chkSendMail.Location = new System.Drawing.Point(806, 34); this.chkSendMail.Name = "chkSendMail"; this.chkSendMail.Size = new System.Drawing.Size(139, 31); this.chkSendMail.TabIndex = 7; @@ -335,6 +333,8 @@ namespace FPJ0000.OtConfirm // // cmbPreset // + this.cmbPreset.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.cmbPreset.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); this.cmbPreset.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPreset.FormattingEnabled = true; @@ -342,16 +342,16 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.cmbPreset.Location = new System.Drawing.Point(26, 74); + this.cmbPreset.Location = new System.Drawing.Point(10, 74); this.cmbPreset.Name = "cmbPreset"; - this.cmbPreset.Size = new System.Drawing.Size(744, 35); + this.cmbPreset.Size = new System.Drawing.Size(936, 35); this.cmbPreset.TabIndex = 6; this.cmbPreset.SelectedIndexChanged += new System.EventHandler(this.cmbPreset_SelectedIndexChanged); // // rad2 // this.rad2.AutoSize = true; - this.rad2.Location = new System.Drawing.Point(269, 37); + this.rad2.Location = new System.Drawing.Point(269, 34); this.rad2.Name = "rad2"; this.rad2.Size = new System.Drawing.Size(84, 31); this.rad2.TabIndex = 2; @@ -362,7 +362,7 @@ namespace FPJ0000.OtConfirm // rad1 // this.rad1.AutoSize = true; - this.rad1.Location = new System.Drawing.Point(179, 37); + this.rad1.Location = new System.Drawing.Point(179, 34); this.rad1.Name = "rad1"; this.rad1.Size = new System.Drawing.Size(84, 31); this.rad1.TabIndex = 1; @@ -374,7 +374,7 @@ namespace FPJ0000.OtConfirm // this.rad0.AutoSize = true; this.rad0.Checked = true; - this.rad0.Location = new System.Drawing.Point(26, 37); + this.rad0.Location = new System.Drawing.Point(26, 34); this.rad0.Name = "rad0"; this.rad0.Size = new System.Drawing.Size(147, 31); this.rad0.TabIndex = 0; @@ -384,17 +384,21 @@ namespace FPJ0000.OtConfirm // // tbResponse // - this.tbResponse.Location = new System.Drawing.Point(26, 115); + this.tbResponse.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.tbResponse.Location = new System.Drawing.Point(10, 115); this.tbResponse.Name = "tbResponse"; - this.tbResponse.Size = new System.Drawing.Size(744, 57); + this.tbResponse.Size = new System.Drawing.Size(936, 116); this.tbResponse.TabIndex = 3; this.tbResponse.Text = ""; // // button1 // - this.button1.Location = new System.Drawing.Point(12, 688); + this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button1.Location = new System.Drawing.Point(3, 720); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(788, 50); + this.button1.Size = new System.Drawing.Size(957, 50); this.button1.TabIndex = 2; this.button1.Text = "확인"; this.button1.UseVisualStyleBackColor = true; @@ -404,10 +408,55 @@ namespace FPJ0000.OtConfirm // this.ta.ClearBeforeFill = true; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label3); + this.groupBox1.Controls.Add(this.tbDays); + this.groupBox1.Controls.Add(this.tbTimes); + this.groupBox1.Location = new System.Drawing.Point(728, 249); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(218, 130); + this.groupBox1.TabIndex = 20; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "사용"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(35, 40); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(39, 27); + this.label3.TabIndex = 20; + this.label3.Text = "일"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(8, 84); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(66, 27); + this.label6.TabIndex = 21; + this.label6.Text = "시간"; + // + // richTextBox1 + // + this.richTextBox1.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.richTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.richTextBox1.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.richTextBox1.Location = new System.Drawing.Point(143, 385); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(803, 78); + this.richTextBox1.TabIndex = 21; + this.richTextBox1.Text = ""; + // // fHolyRequestAdd // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(812, 746); + this.ClientSize = new System.Drawing.Size(963, 773); this.Controls.Add(this.button1); this.Controls.Add(this.grpAdmin); this.Controls.Add(this.grpUser); @@ -415,6 +464,7 @@ namespace FPJ0000.OtConfirm this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "fHolyRequestAdd"; + this.Padding = new System.Windows.Forms.Padding(3); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "fHolyRequestAdd"; this.Load += new System.EventHandler(this.fHolyRequestAdd_Load); @@ -424,6 +474,8 @@ namespace FPJ0000.OtConfirm this.grpUser.PerformLayout(); this.grpAdmin.ResumeLayout(false); this.grpAdmin.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.ResumeLayout(false); } @@ -456,11 +508,14 @@ namespace FPJ0000.OtConfirm private System.Windows.Forms.ComboBox tbBackup; private System.Windows.Forms.TextBox tbTimes; private System.Windows.Forms.TextBox tbDays; - private System.Windows.Forms.Label label11; private System.Windows.Forms.ComboBox cmbPreset; private System.Windows.Forms.CheckBox chkSendMail; private System.Windows.Forms.RadioButton radTime; private System.Windows.Forms.RadioButton radioButton2; private System.Windows.Forms.ComboBox cmbUser; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.RichTextBox richTextBox1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index a0e1288..94d2bd3 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -46,7 +46,7 @@ namespace FPJ0000.OtConfirm { this.Text = "휴가신청 추가"; cmbUser.Text = $"{FCOMMON.info.Login.nameK}({FCOMMON.info.Login.no})"; - + //tbProcess.Text = FCOMMON.info.Login.process; //tbTel.Text = FCOMMON.info.Login.tel; } @@ -54,10 +54,10 @@ namespace FPJ0000.OtConfirm { this.Text = "휴가신청 편집"; cmbUser.Text = $"{dr.name}({dr.uid})"; //dr.name; - ////.Text = dr.processs; - // tbTel.Text = dr.tel; + ////.Text = dr.processs; + // tbTel.Text = dr.tel; } - + if (dr.conf == 1) rad1.Checked = true; else if (dr.conf == 2) rad2.Checked = true; else rad0.Checked = true; @@ -73,7 +73,7 @@ namespace FPJ0000.OtConfirm tbDays.Text = dr.HolyDays.ToString(); //211224 tbTimes.Text = dr.HolyTimes.ToString(); - if(dr.cate == "대체") + if (dr.cate == "대체") { tbTimes.Enabled = true; tbDays.Enabled = false; @@ -94,7 +94,7 @@ namespace FPJ0000.OtConfirm { curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); - + //관리자라면 관리자패널을 활성해준다. if (dr.RowState == DataRowState.Detached) { @@ -107,7 +107,7 @@ namespace FPJ0000.OtConfirm { cmbUser.Enabled = false; grpAdmin.Enabled = curLevel >= 5; - if(curLevel >= 5) + if (curLevel >= 5) { grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)"; } @@ -118,7 +118,7 @@ namespace FPJ0000.OtConfirm cmbPreset.SelectedIndex = 0; } - + binit = true; } @@ -147,8 +147,8 @@ namespace FPJ0000.OtConfirm if (tbDays.Enabled == false) tbDays.Text = string.Empty; if (tbTimes.Enabled == false) tbTimes.Text = string.Empty; - if (double.TryParse( tbDays.Text,out double val_days)) vDay = int.Parse(tbDays.Text.Trim()); - if (double.TryParse( tbTimes.Text, out double val_times)) vTime = float.Parse(tbTimes.Text.Trim()); + if (double.TryParse(tbDays.Text, out double val_days)) vDay = int.Parse(tbDays.Text.Trim()); + if (double.TryParse(tbTimes.Text, out double val_times)) vTime = float.Parse(tbTimes.Text.Trim()); //라디오버튼에 따른 시간 값 할당 if (radTime.Checked) vDay = 0; @@ -168,7 +168,7 @@ namespace FPJ0000.OtConfirm } //하나도 입력안했다면 경고한다 - if(String.IsNullOrEmpty(tbReason.Text) && String.IsNullOrEmpty(tbLocation.Text) && String.IsNullOrEmpty(tbBackup.Text) && String.IsNullOrEmpty(tbRemark.Text)) + if (String.IsNullOrEmpty(tbReason.Text) && String.IsNullOrEmpty(tbLocation.Text) && String.IsNullOrEmpty(tbBackup.Text) && String.IsNullOrEmpty(tbRemark.Text)) { FCOMMON.Util.MsgE("비고를 입력해주세요"); tbRemark.Focus(); @@ -203,7 +203,7 @@ namespace FPJ0000.OtConfirm dr.HolyLocation = tbLocation.Text.Trim(); dr.HolyBackup = tbBackup.Text.Trim(); dr.cate = cate;// tbCate.Text.Trim(); - dr.Remark = tbRemark.Text.Trim(); + dr.Remark = tbRemark.Text.Trim() + "\r\n" + this.richTextBox1.Text; dr.Response = tbResponse.Text.Trim(); dr.sdate = tbSD.Value.ToShortDateString(); dr.edate = tbED.Value.ToShortDateString(); @@ -275,7 +275,7 @@ namespace FPJ0000.OtConfirm tbTimes.Enabled = true; tbDays.BackColor = Color.DimGray; tbTimes.BackColor = Color.Gold; - label11.Text = "사용시간"; + groupBox1.Text = "사용시간"; } else { @@ -284,10 +284,69 @@ namespace FPJ0000.OtConfirm tbTimes.Enabled = false; tbTimes.BackColor = Color.DimGray; tbDays.BackColor = Color.Gold; - label11.Text = "사용일"; + groupBox1.Text = "사용일"; + } + if (binit) + UpdateStatus(); + } + + private void label11_Click(object sender, EventArgs e) + { + + } + + private void tbDays_TextChanged(object sender, EventArgs e) + { + + } + + private void grpUser_Enter(object sender, EventArgs e) + { + + } + + private void tbLocation_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void tbReason_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void label9_Click(object sender, EventArgs e) + { + + } + + private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) + { + var uiddt = this.cmbUser.SelectedValue; + if (uiddt == null) return; + var uid = uiddt.ToString(); + var lst = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, DateTime.Now.AddDays(-1).ToShortDateString()); + + this.richTextBox1.Clear(); + foreach (var item in lst) + { + var val = item.Value.Split('|'); + if (val[2] != "0") + { + var perc = 0f; + if (val[0] != "0") perc = float.Parse(val[1]) / float.Parse(val[0]); + if (richTextBox1.TextLength > 0) richTextBox1.AppendText(","); + richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc:N1}%사용)"); + } + else if (val[5] != "0") + { + var perc = 0f; + if (val[3] != "0") perc = float.Parse(val[4]) / float.Parse(val[3]); + if (richTextBox1.TextLength > 0) richTextBox1.AppendText(","); + richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc:N1}%사용)"); + } + } - if(binit) - UpdateStatus(); } } } diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index d4bceeb..a9ba6bb 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -13,7 +13,7 @@ namespace FPJ0000 { string fn_fpcolsize1 = ""; string fn_fpcolsize2 = ""; - int projectindex = 0; + int projectindex = 0; EEEntities db; Boolean bInit = false; @@ -30,8 +30,6 @@ namespace FPJ0000 //this.dsPRJ.EETGW_ProjectReson.TableNewRow += EETGW_ProjectReson_TableNewRow; } - - private void FProjectSchedule_FormClosing(object sender, FormClosingEventArgs e) { this.Validate(); @@ -378,6 +376,9 @@ namespace FPJ0000 if (list == null || list.Count < 1) return; + + var totalProgress = list.Sum(t=>t.progress) / list.Count(); + var vsw_s = list.Max(t => t.sw); var vew_s = list.Max(t => t.ew); var vswa_s = list.Max(t => t.swa); @@ -443,14 +444,20 @@ namespace FPJ0000 if (mvewa > 0) minw = Math.Min(minw, mvewa); if (minw == 9999) return; //값이 없다. - + var curyw = $"{DateTime.Now.Year.ToString("0000").Substring(2)}y{this.CWW:00}w"; + var curww = int.Parse($"{DateTime.Now.Year.ToString("0000").Substring(2)}{this.CWW:00}"); + var ProjecComplete = totalProgress > 99; + if(ProjecComplete == false) + { + maxw = Math.Max(curww, maxw); + } var wwcnt = maxw - minw + 1; for (int i = 1; i <= wwcnt; i++) { - var yy = (int)((minw + (i-1)) / 100); - var ww = (minw + (i-1) - yy * 100); + var yy = (int)((minw + (i - 1)) / 100); + var ww = (minw + (i - 1) - yy * 100); if (ww > 52 || ww < 1) continue; - cols.Add($"{yy}y{ww}w");// "ww" + (minw + i - 1).ToString());// + cols.Add($"{yy}y{ww:00}w");// "ww" + (minw + i - 1).ToString());// } @@ -463,13 +470,23 @@ namespace FPJ0000 var ci = 0; var titlewi = 200f; var twidth = (rect_title.Width - titlewi) / (cols.Count - 1); + foreach (var col in cols) { + var titleWidth = ci == 0 ? titlewi : twidth; var padX = ci > 0 ? ((ci - 1) * twidth + titlewi) : 0; var rect = new RectangleF(rect_title.Left + padX, rect_title.Top, titleWidth, rect_title.Height); + if (col == curyw) + { + e.Graphics.FillRectangle(Brushes.DeepSkyBlue, rect); + } + else + { + e.Graphics.FillRectangle(Brushes.DimGray, rect); + } e.Graphics.DrawRectangle(Pens.Black, rect.Left, rect.Top, rect.Width, rect.Height); - e.Graphics.DrawString(col, this.Font, Brushes.Gold, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); + e.Graphics.DrawString(col, this.Font, Brushes.Black, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); ci += 1; } @@ -479,9 +496,9 @@ namespace FPJ0000 var rect = new RectangleF(rect_body.Left, rect_body.Top + i * lineheight + ((i + 1) * 2), linewidth, lineheight); if (i % 2 == 0) - e.Graphics.FillRectangle(Brushes.Gray, rect.Left, rect.Top, rect.Width, rect.Height); + e.Graphics.FillRectangle(new SolidBrush(Color.FromArgb(25, 25, 25)), rect.Left, rect.Top, rect.Width, rect.Height); else - e.Graphics.FillRectangle(Brushes.DimGray, rect.Left, rect.Top, rect.Width, rect.Height); + e.Graphics.FillRectangle(new SolidBrush(Color.FromArgb(35, 35, 35)), rect.Left, rect.Top, rect.Width, rect.Height); Color PBg = Color.SkyBlue; Color ABg = Color.Gold; @@ -515,8 +532,8 @@ namespace FPJ0000 ewa = int.Parse(dr.ewa.Replace("-", ""));//.Split('-')[1]); } catch { } - - + + if (sw == 0) { sw = minw; PBg = Color.Transparent; } @@ -525,14 +542,14 @@ namespace FPJ0000 var isEmpty = swa == 0; if (swa == 0) { swa = minw; ABg = Color.Transparent; }; var isBusy = ewa == 0; //아직 완료되지 않았다 - if (ewa == 0) ewa = swa; + if (ewa == 0) ewa = int.Parse(DateTime.Now.Year.ToString().Substring(2) + this.CWW.ToString("00")); // swa; if (isBusy && ABg != Color.Transparent) ABg = Color.Pink; ci = 0; foreach (var col in cols) { - var ww = minw + (ci - 1); + var ww = ci == 0 ? 0 : int.Parse(col.Substring(0, 2) + col.Substring(3,2));// minw + (ci - 1); var titleWidth = ci == 0 ? titlewi : twidth; var padX = ci > 0 ? ((ci - 1) * twidth + titlewi) : 0; @@ -541,23 +558,52 @@ namespace FPJ0000 var rect2L = new RectangleF(rect2T.Left, rect2T.Bottom, rect2T.Width, rect2T.Height); - var spacing = 3f; + var spacing = 1f; var rect2TP = new RectangleF(rect2T.Left + spacing, rect2T.Top + spacing, rect2T.Width - spacing * 2, rect2T.Height - spacing * 2); var rect2BP = new RectangleF(rect2L.Left + spacing, rect2L.Top + spacing, rect2L.Width - spacing * 2, rect2L.Height - spacing * 2); var str = ci == 0 ? dr.title : ww.ToString(); if (ci == 0) { - //e.Graphics.DrawRectangle(Pens.Black, rect2.Left, rect2.Top, rect2.Width, rect2.Height); - e.Graphics.DrawString(str + "\n" + dr.uid, + //각 담당자 이름과 항목 이름을 표시한다 + if(isBusy==false) + { + e.Graphics.DrawString(str + "\n" + dr.uid, this.Font, - Brushes.Gold, + (isBusy ? Brushes.WhiteSmoke : Brushes.Lime), rect2, new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center } ); + } + else + { + if(dr.progress < 1) + { + e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[시작 안함]", + this.Font, + (isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime), + rect2, + new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center } + ); + } + else + { + e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[{dr.progress:N1}% 진행 중]", + this.Font, + (isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime), + rect2, + new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center } + ); + } + + } + } else { + if(col == "22y02w" && ew == 2202) + Console.WriteLine("sdf"); + //plan if (ww >= sw && ww <= ew) e.Graphics.FillRectangle(new SolidBrush(PBg), rect2TP.Left, rect2TP.Top, rect2TP.Width, rect2TP.Height); diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 7fc8319..afbbbea 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -2772,7 +2772,7 @@ WHERE (idx = @idx) - + @@ -3053,7 +3053,7 @@ WHERE (idx = @idx) - + @@ -3097,7 +3097,7 @@ WHERE (idx = @idx) - + @@ -3142,7 +3142,7 @@ WHERE (idx = @idx) - + @@ -3258,7 +3258,7 @@ WHERE (idx = @idx) - + @@ -3414,7 +3414,7 @@ WHERE (idx = @idx) - + @@ -3424,7 +3424,7 @@ WHERE (idx = @idx) - + @@ -3462,7 +3462,7 @@ WHERE (idx = @idx) - + @@ -3578,7 +3578,7 @@ WHERE (idx = @idx) - + @@ -3629,7 +3629,7 @@ WHERE (idx = @idx) - + @@ -3642,7 +3642,7 @@ WHERE (idx = @idx) - + @@ -3814,7 +3814,7 @@ WHERE (idx = @idx) - + @@ -3998,7 +3998,7 @@ WHERE (idx = @idx) - + @@ -4043,7 +4043,7 @@ WHERE (idx = @idx) - + @@ -4120,7 +4120,7 @@ WHERE (idx = @idx) - + @@ -4311,7 +4311,7 @@ WHERE (idx = @idx) - + @@ -4450,7 +4450,7 @@ WHERE (idx = @idx) - + @@ -4509,7 +4509,7 @@ WHERE (idx = @idx) - +