diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index dc81deb..06ad266 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -246,6 +246,12 @@ fJobChartMenu.cs + + Form + + + rJobReportPrj.cs + Form @@ -585,6 +591,9 @@ fJobChartMenu.cs + + rJobReportPrj.cs + rJobReportOT.cs diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 66ce4ff..66a443e 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(); @@ -71,11 +71,6 @@ this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.tbFind = new System.Windows.Forms.ToolStripTextBox(); this.btFind = new System.Windows.Forms.ToolStripButton(); - this.btReport = new System.Windows.Forms.ToolStripButton(); - this.btReportDay = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.btImport = new System.Windows.Forms.ToolStripButton(); this.btOpenFolder = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -119,6 +114,13 @@ this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.toolStripButton9 = new System.Windows.Forms.ToolStripDropDownButton(); + this.toolStripButton10 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton11 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton12 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton13 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton14 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -159,13 +161,9 @@ this.toolStripLabel2, this.tbFind, this.btFind, - this.btReport, - this.btReportDay, - this.toolStripButton1, - this.toolStripButton3, - this.toolStripButton5, this.btImport, - this.btOpenFolder}); + this.btOpenFolder, + this.toolStripButton9}); this.bn.Location = new System.Drawing.Point(0, 730); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -329,57 +327,6 @@ this.btFind.Text = "toolStripButton2"; this.btFind.Click += new System.EventHandler(this.btFind_Click); // - // btReport - // - this.btReport.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btReport.Image = ((System.Drawing.Image)(resources.GetObject("btReport.Image"))); - this.btReport.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btReport.Name = "btReport"; - this.btReport.Size = new System.Drawing.Size(108, 22); - this.btReport.Text = "월/개인별 요약"; - this.btReport.Click += new System.EventHandler(this.btReport_Click); - // - // btReportDay - // - this.btReportDay.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btReportDay.Image = ((System.Drawing.Image)(resources.GetObject("btReportDay.Image"))); - this.btReportDay.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btReportDay.Name = "btReportDay"; - this.btReportDay.Size = new System.Drawing.Size(108, 22); - this.btReportDay.Text = "일/개인별 요약"; - this.btReportDay.Click += new System.EventHandler(this.btReportDay_Click); - // - // toolStripButton1 - // - this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(75, 22); - this.toolStripButton1.Text = "작업분포"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // toolStripButton3 - // - this.toolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); - this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(111, 22); - this.toolStripButton3.Text = "적정인원보고서"; - this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); - // - // toolStripButton5 - // - this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(63, 22); - this.toolStripButton5.Text = "보고서"; - this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); - // // btImport // this.btImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -588,131 +535,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(2022, 5, 1, 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, 6, 17, 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(2022, 5, 1, 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, 6, 17, 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; @@ -936,6 +883,83 @@ this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; // + // toolStripButton9 + // + this.toolStripButton9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton9.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton10, + this.toolStripButton11, + this.toolStripButton12, + this.toolStripButton13, + this.toolStripButton14, + this.toolStripButton1}); + this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image"))); + this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton9.Name = "toolStripButton9"; + this.toolStripButton9.Size = new System.Drawing.Size(101, 22); + this.toolStripButton9.Text = "출력/보고서"; + // + // toolStripButton10 + // + this.toolStripButton10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton10.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton10.Image"))); + this.toolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton10.Name = "toolStripButton10"; + this.toolStripButton10.Size = new System.Drawing.Size(54, 20); + this.toolStripButton10.Text = "Daily"; + this.toolStripButton10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolStripButton10.Click += new System.EventHandler(this.toolStripButton10_Click); + // + // toolStripButton11 + // + this.toolStripButton11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton11.Image"))); + this.toolStripButton11.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton11.Name = "toolStripButton11"; + this.toolStripButton11.Size = new System.Drawing.Size(111, 20); + this.toolStripButton11.Text = "적정인원보고서"; + this.toolStripButton11.Click += new System.EventHandler(this.toolStripButton11_Click); + // + // toolStripButton12 + // + this.toolStripButton12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton12.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton12.Image"))); + this.toolStripButton12.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton12.Name = "toolStripButton12"; + this.toolStripButton12.Size = new System.Drawing.Size(75, 20); + this.toolStripButton12.Text = "작업분포"; + this.toolStripButton12.Click += new System.EventHandler(this.toolStripButton12_Click); + // + // toolStripButton13 + // + this.toolStripButton13.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton13.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton13.Image"))); + this.toolStripButton13.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton13.Name = "toolStripButton13"; + this.toolStripButton13.Size = new System.Drawing.Size(108, 20); + this.toolStripButton13.Text = "일/개인별 요약"; + this.toolStripButton13.Click += new System.EventHandler(this.toolStripButton13_Click); + // + // toolStripButton14 + // + this.toolStripButton14.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton14.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton14.Image"))); + this.toolStripButton14.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton14.Name = "toolStripButton14"; + this.toolStripButton14.Size = new System.Drawing.Size(108, 20); + this.toolStripButton14.Text = "월/개인별 요약"; + this.toolStripButton14.Click += new System.EventHandler(this.toolStripButton14_Click); + // + // toolStripButton1 + // + this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(143, 20); + this.toolStripButton1.Text = "개인별 프로젝트 현황"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); + // // fJobReport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1012,25 +1036,20 @@ private System.Windows.Forms.ToolStripButton btFind; private System.Windows.Forms.ToolStripComboBox cmbUser; private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem; - private System.Windows.Forms.ToolStripButton btReport; private System.Windows.Forms.ToolStripLabel lbTime; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; - private System.Windows.Forms.ToolStripButton btReportDay; - private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.RichTextBox richTextBox1; - private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripSplitButton btSearch; private System.Windows.Forms.ToolStripMenuItem 태그자료만조회ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel4; private System.Windows.Forms.ToolStripTextBox tbProcess; private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripButton btImport; - private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.ToolStripButton btOpenFolder; private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.ToolStripButton toolStripButton6; @@ -1038,5 +1057,12 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripButton toolStripButton8; private System.Windows.Forms.ToolStripButton toolStripButton7; - } + private System.Windows.Forms.ToolStripDropDownButton toolStripButton9; + private System.Windows.Forms.ToolStripButton toolStripButton10; + private System.Windows.Forms.ToolStripButton toolStripButton11; + private System.Windows.Forms.ToolStripButton toolStripButton12; + private System.Windows.Forms.ToolStripButton toolStripButton13; + private System.Windows.Forms.ToolStripButton toolStripButton14; + private System.Windows.Forms.ToolStripButton toolStripButton1; + } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index d86815f..bbad6d7 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -644,8 +644,7 @@ namespace FPJ0000 private void btReport_Click(object sender, EventArgs e) { - var f = new JobReport_.rJobReport(); - f.Show(); + } private void cmbUser_Click(object sender, EventArgs e) @@ -675,17 +674,12 @@ namespace FPJ0000 private void btReportDay_Click(object sender, EventArgs e) { - var f = new JobReport_.rJobReportDay(dtSD.Text); - f.Show(); + } private void toolStripButton1_Click(object sender, EventArgs e) { - //string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1); - //request = request.Substring(0, request.Length - 1); - //string name = cmbUser.Text.Substring(0, cmbUser.Text.IndexOf('(')); - var f = new JobReport_.fJobChartMenu(); - f.ShowDialog(); + } private void toolStripButton2_Click(object sender, EventArgs e) @@ -695,8 +689,7 @@ namespace FPJ0000 private void toolStripButton3_Click(object sender, EventArgs e) { - var f = new JobReport_.rJobReportUser(); - f.Show(); + } private void btSearch_ButtonClick(object sender, EventArgs e) @@ -750,8 +743,7 @@ namespace FPJ0000 private void toolStripButton5_Click(object sender, EventArgs e) { - var f = new JobReport_.rK5Dailyform(); - f.Show(); + } private void btOpenFolder_Click(object sender, EventArgs e) @@ -790,5 +782,44 @@ namespace FPJ0000 dtSD.Text = sd.ToShortDateString(); dtED.Text = ed.ToShortDateString(); } - } + + private void toolStripButton10_Click(object sender, EventArgs e) + { + var f = new JobReport_.rK5Dailyform(); + f.Show(); + } + + private void toolStripButton11_Click(object sender, EventArgs e) + { + var f = new JobReport_.rJobReportUser(); + f.Show(); + } + + private void toolStripButton12_Click(object sender, EventArgs e) + { + //string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1); + //request = request.Substring(0, request.Length - 1); + //string name = cmbUser.Text.Substring(0, cmbUser.Text.IndexOf('(')); + var f = new JobReport_.fJobChartMenu(); + f.ShowDialog(); + } + + private void toolStripButton13_Click(object sender, EventArgs e) + { + var f = new JobReport_.rJobReportDay(dtSD.Text); + f.Show(); + } + + private void toolStripButton14_Click(object sender, EventArgs e) + { + var f = new JobReport_.rJobReport(); + f.Show(); + } + + private void toolStripButton1_Click_1(object sender, EventArgs e) + { + var f = new JobReport_.rJobReportPrj(dtSD.Text); + f.Show(); + } + } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index 0479747..1c35a94 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -211,69 +211,6 @@ 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 - fwBJwqBB56/wJgAAAABJRU5ErkJggg== @@ -303,6 +240,94 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqiooDRdUwO7 + mYqZtzlFUxNdGGSLaWReQhMVKkQpelGhXXRqU3PO6RnOyLzfpvMGXpa6yzm6c+a355wtNRD6wYfnxXO+ + H87ve46In4CHmpgrhZQ6pIj6LVZQNDkZgWL+1DMhhd1M0DPdwDm5tvRI6Pt9Qmj3BD7p1C5ZmJXhSRNn + tm3AbN1hxcLDYHjBgpwvM4goGrFLUlX73VHXBOfrlsanZrnuaQf0Jhb6GRbUNAvd1CY04xtoGrJhgwXq + R2jkfDIh/sUA/Y9ErGii1+2b6J3l8GOWJSeLHkGyiY6JDXwbshOBE70LHPTzDuSpZuD3oO2dEA4v9jXe + UoRuySpuIL78Jsqba5BbWww/hRd8CZK8swhQnkJJfYmwipVhsbhqR0BiBysIwgr9Prb1N6Bh7DXKqSxB + El0WhKy3UUiriYC08iriKuNQ37eIhgErvv5axxrpSazsZASBpFSy/7winaNG2/GmX4kCTaogiakIJuFr + SHqZCO2ETVildYyGmvSwanNAnNvlEvATmN/BZFTFwjChQ6X+Pp62ZCK8+BJiykJhmLbDQIrlC9ZOujox + E0GAcpfgwiOF43T2YUSVStA72Y289mQoVRmIeO6PGs1n/JxjYSDFdk850EVYsjjg99gtOCH3kPnIDyGt + OhK3KwIRWXJZkGSooiCvTSRv4g/+vneGQw//iQkWUqR3us4l8JEfmPORHyQPecAnywPXC/yR8ioW2iE1 + 8tTZSP4QC2lFGAxEoCf/BkUEjMNJBJqdFS6mdzILawz65jiBjtF53KtKQgIJyiojkFl9d/uOx77JEUHd + joC3zZp3BP/Dxq+QuEtwJuO7nRowbu318F6Y5hacx6Lrre44KTKpxWhat1uowWmncZmGcYnGhJtlq0OA + b97KcJg0zTtpml7zvNM46I6LRCeTmlO8pU0tx2Vqs7esjtkmwYXXX6R1jKe0cfVoXGOrV6wqXiQSif4A + BzqgGQLdufgAAAAASUVORK5CYII= + + + + + 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 + + + + 17, 17 + 325, 17 @@ -354,24 +379,24 @@ 561, 17 - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD///////////////8A/////ws= + AAD/////AQgAAP////8AAQgAAAs= - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD///////////////8A/////ws= + AAD/////AQgAAP////8AAQgAAAs= @@ -380,41 +405,41 @@ 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 diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs index fcb74ad..c93c863 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs @@ -28,64 +28,64 @@ /// 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.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.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.toolStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // bs - // - this.bs.DataMember = "JobReportDay"; - this.bs.DataSource = this.dsReport; - // - // dsReport - // - this.dsReport.DataSetName = "dsReport"; - this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // dataGridView1 - // - this.dataGridView1.A_DelCurrentCell = true; - this.dataGridView1.A_EnterToTab = true; - this.dataGridView1.A_KoreanField = null; - this.dataGridView1.A_UpperField = null; - this.dataGridView1.A_ViewRownumOnHeader = true; - this.dataGridView1.AllowUserToAddRows = false; - 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, 37); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.ReadOnly = true; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1114, 662); - this.dataGridView1.TabIndex = 1; - // - // toolStrip1 - // - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + 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.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.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.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // bs + // + this.bs.DataMember = "JobReportDay"; + this.bs.DataSource = this.dsReport; + // + // dsReport + // + this.dsReport.DataSetName = "dsReport"; + this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // dataGridView1 + // + this.dataGridView1.A_DelCurrentCell = true; + this.dataGridView1.A_EnterToTab = true; + this.dataGridView1.A_KoreanField = null; + this.dataGridView1.A_UpperField = null; + this.dataGridView1.A_ViewRownumOnHeader = true; + this.dataGridView1.AllowUserToAddRows = false; + 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, 37); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.ReadOnly = true; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(1114, 662); + 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, @@ -95,105 +95,105 @@ 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(1114, 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.Font = new System.Drawing.Font("맑은 고딕", 9F); - 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); - // - // 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); - // - // rJobReportDay - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1114, 699); - this.Controls.Add(this.dataGridView1); - 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(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1114, 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.Font = new System.Drawing.Font("맑은 고딕", 9F); + 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); + // + // 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); + // + // rJobReportDay + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1114, 699); + this.Controls.Add(this.dataGridView1); + 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(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -212,5 +212,5 @@ 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 3fd47c5..ee9d282 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs @@ -203,17 +203,13 @@ namespace FPJ0000.JobReport_ } this.dataGridView1.AutoResizeColumns(); } - private void button1_Click(object sender, EventArgs e) - { - - } private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) { - if (tbProcess.SelectedIndex >= 0) refrehData(); - } - private void button1_Click_1(object sender, EventArgs e) + } + + private void button1_Click_1(object sender, EventArgs e) { } diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx index c1a387b..9a6a9b6 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx @@ -136,41 +136,41 @@ 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 @@ -188,15 +188,15 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVFhH7ZXLK0RxFMfnD7GQlY2dmMkMTVnIu6QsyCsb - pZTyTLYWM6MxxnilPBcWM57FgkIpMt4lNpI78grFCMUxv+POzVw/NbnnZ+N+p0/de/qdez73dn93DHpE - xWQzxSfbUxpI6EiLlS9LF5PdXGh0mEErlk4rJNvMp4kOc5x8aZpQCfoOpiCzJ4dekkpwQ9oEf8BPL0kp - eBG8pJekFiSXFCFIKilKkExSpOBXSaMt5STJmRYjj40+VIK9awPg3fNx6Vh2gslhATZLHht9qASjQRfU - ii6olf8r2DrXBu5VD5LhyVLqtd46pV44WBTRw0OYYPNsK4QztD6MNasrHW6Dt1gL3J+DxWn91qdGmCBj - W9pBmafXJ3yKrhU3nrOwG+D1qBEqWDpaAW/vbyg0ujkO1483eLx/vo//ErweNUIFGfOHCygVznvoVzFe - xV3LQ7hgXn+B8hRZFo+WuOt+Qrhg00yLrPYZ6T4Q1eYII1SQiUh3EoqF3z8W17Kbu56HUMGulW5ZCaB+ - qhH8Z1t4HHwJQlZvLrdHjTDBDE82PDw/otDx1THu2uqJGjxn8e76uH1qhAn6didlFYCG6WalvnW2jTW2 - cYqHSyN6eAgTLBkph7KxSuTrNy+zJ1epZ/flR/TwECZIhS6oFV1QK7qgVn4laLSnJoSa2/+E0Cx5rB7i - GAwfCJT5L4+U6JYAAAAASUVORK5CYII= + pZTyTLaKGY0xxivlubCY8SwWFEqR8S6xkdyRVyhGKI75HXdu5vqpyT0/G/c7fere0+/c87m3+7tj0CMq + pnZTbKItqY6EjpRo+bJ0MdnM+Ua7GbRi6bRCYrv5NN5ujpEvTRMqQe/BFKT3ZNFLUgluSJvg8/voJSkF + LwKX9JLUguSSIgRJJUUJkkmKFPwqaWxLOklwpETJYyMPlWDv2gB49rxcOpYdYLJbgM2Sx0YeKsFI0AW1 + ogtq5f8KNs+1gGvVjaS5M5R6tadGqecPFoT18BAm2DjbDKEMrQ9jzepMhdvALdb89+dgcVi/9akRJsjY + lnZQ5un1CZ+ic8WF5yzsBng9aoQKFo+Wwdv7GwqNbo7D9eMNHu+f7+O/BK9HjVBBxvzhAkqF8h78lY1X + cNfyEC6Y05+nPEWWxaMl7rqfEC7YMNMkq31GuvdHtDlCCBVkItKdhGKh94/FueziruchVLBrpVtWAqid + qgff2RYeB14CkNGbze1RI0wwzZ0JD8+PKHR8dYy7tnKiCs9ZPLtebp8aYYLe3UlZBaBuulGpb51tY41t + nMLh4rAeHsIEi0ZKoWSsHPn6zUvvyVbqmX25YT08hAlSoQtqRRfUii6olV8JGm3JccHm1j8hOEseq4c4 + BsMH9in5LvAGb8kAAAAASUVORK5CYII= \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrj.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrj.Designer.cs new file mode 100644 index 0000000..2dfcdc5 --- /dev/null +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrj.Designer.cs @@ -0,0 +1,400 @@ +namespace FPJ0000.JobReport_ +{ + partial class rJobReportPrj + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsReport = new FPJ0000.dsReport(); + this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter(); + this.panel1 = new System.Windows.Forms.Panel(); + this.linkLabel9 = new System.Windows.Forms.LinkLabel(); + this.linkLabel10 = new System.Windows.Forms.LinkLabel(); + this.linkLabel11 = new System.Windows.Forms.LinkLabel(); + this.linkLabel12 = new System.Windows.Forms.LinkLabel(); + this.linkLabel5 = new System.Windows.Forms.LinkLabel(); + this.linkLabel6 = new System.Windows.Forms.LinkLabel(); + this.linkLabel7 = new System.Windows.Forms.LinkLabel(); + this.linkLabel8 = new System.Windows.Forms.LinkLabel(); + this.linkLabel3 = new System.Windows.Forms.LinkLabel(); + this.linkLabel4 = new System.Windows.Forms.LinkLabel(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.btSave = new System.Windows.Forms.Button(); + this.cmbUser = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.dte = new System.Windows.Forms.DateTimePicker(); + this.label2 = new System.Windows.Forms.Label(); + this.dts = new System.Windows.Forms.DateTimePicker(); + this.tbProcess = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btRefresh = new System.Windows.Forms.Button(); + this.dv1 = new arCtl.arDatagridView(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.SuspendLayout(); + // + // bs + // + this.bs.DataMember = "JobReportDay"; + this.bs.DataSource = this.dsReport; + // + // dsReport + // + this.dsReport.DataSetName = "dsReport"; + this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.linkLabel9); + this.panel1.Controls.Add(this.linkLabel10); + this.panel1.Controls.Add(this.linkLabel11); + this.panel1.Controls.Add(this.linkLabel12); + this.panel1.Controls.Add(this.linkLabel5); + this.panel1.Controls.Add(this.linkLabel6); + this.panel1.Controls.Add(this.linkLabel7); + this.panel1.Controls.Add(this.linkLabel8); + this.panel1.Controls.Add(this.linkLabel3); + this.panel1.Controls.Add(this.linkLabel4); + this.panel1.Controls.Add(this.linkLabel2); + this.panel1.Controls.Add(this.linkLabel1); + this.panel1.Controls.Add(this.btSave); + this.panel1.Controls.Add(this.cmbUser); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.dte); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.dts); + this.panel1.Controls.Add(this.tbProcess); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.btRefresh); + 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(1114, 58); + this.panel1.TabIndex = 7; + // + // linkLabel9 + // + this.linkLabel9.AutoSize = true; + this.linkLabel9.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel9.Location = new System.Drawing.Point(672, 31); + this.linkLabel9.Name = "linkLabel9"; + this.linkLabel9.Size = new System.Drawing.Size(39, 19); + this.linkLabel9.TabIndex = 24; + this.linkLabel9.TabStop = true; + this.linkLabel9.Text = "12월"; + // + // linkLabel10 + // + this.linkLabel10.AutoSize = true; + this.linkLabel10.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel10.Location = new System.Drawing.Point(633, 31); + this.linkLabel10.Name = "linkLabel10"; + this.linkLabel10.Size = new System.Drawing.Size(39, 19); + this.linkLabel10.TabIndex = 23; + this.linkLabel10.TabStop = true; + this.linkLabel10.Text = "11월"; + // + // linkLabel11 + // + this.linkLabel11.AutoSize = true; + this.linkLabel11.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel11.Location = new System.Drawing.Point(594, 31); + this.linkLabel11.Name = "linkLabel11"; + this.linkLabel11.Size = new System.Drawing.Size(39, 19); + this.linkLabel11.TabIndex = 22; + this.linkLabel11.TabStop = true; + this.linkLabel11.Text = "10월"; + // + // linkLabel12 + // + this.linkLabel12.AutoSize = true; + this.linkLabel12.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel12.Location = new System.Drawing.Point(555, 31); + this.linkLabel12.Name = "linkLabel12"; + this.linkLabel12.Size = new System.Drawing.Size(39, 19); + this.linkLabel12.TabIndex = 21; + this.linkLabel12.TabStop = true; + this.linkLabel12.Text = "09월"; + // + // linkLabel5 + // + this.linkLabel5.AutoSize = true; + this.linkLabel5.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel5.Location = new System.Drawing.Point(516, 31); + this.linkLabel5.Name = "linkLabel5"; + this.linkLabel5.Size = new System.Drawing.Size(39, 19); + this.linkLabel5.TabIndex = 20; + this.linkLabel5.TabStop = true; + this.linkLabel5.Text = "08월"; + // + // linkLabel6 + // + this.linkLabel6.AutoSize = true; + this.linkLabel6.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel6.Location = new System.Drawing.Point(477, 31); + this.linkLabel6.Name = "linkLabel6"; + this.linkLabel6.Size = new System.Drawing.Size(39, 19); + this.linkLabel6.TabIndex = 19; + this.linkLabel6.TabStop = true; + this.linkLabel6.Text = "07월"; + // + // linkLabel7 + // + this.linkLabel7.AutoSize = true; + this.linkLabel7.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel7.Location = new System.Drawing.Point(672, 7); + this.linkLabel7.Name = "linkLabel7"; + this.linkLabel7.Size = new System.Drawing.Size(39, 19); + this.linkLabel7.TabIndex = 18; + this.linkLabel7.TabStop = true; + this.linkLabel7.Text = "06월"; + // + // linkLabel8 + // + this.linkLabel8.AutoSize = true; + this.linkLabel8.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel8.Location = new System.Drawing.Point(633, 7); + this.linkLabel8.Name = "linkLabel8"; + this.linkLabel8.Size = new System.Drawing.Size(39, 19); + this.linkLabel8.TabIndex = 17; + this.linkLabel8.TabStop = true; + this.linkLabel8.Text = "05월"; + // + // linkLabel3 + // + this.linkLabel3.AutoSize = true; + this.linkLabel3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel3.Location = new System.Drawing.Point(594, 7); + this.linkLabel3.Name = "linkLabel3"; + this.linkLabel3.Size = new System.Drawing.Size(39, 19); + this.linkLabel3.TabIndex = 16; + this.linkLabel3.TabStop = true; + this.linkLabel3.Text = "04월"; + // + // linkLabel4 + // + this.linkLabel4.AutoSize = true; + this.linkLabel4.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel4.Location = new System.Drawing.Point(555, 7); + this.linkLabel4.Name = "linkLabel4"; + this.linkLabel4.Size = new System.Drawing.Size(39, 19); + this.linkLabel4.TabIndex = 15; + this.linkLabel4.TabStop = true; + this.linkLabel4.Text = "03월"; + // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel2.Location = new System.Drawing.Point(516, 7); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(39, 19); + this.linkLabel2.TabIndex = 14; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "02월"; + // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel1.Location = new System.Drawing.Point(477, 7); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(39, 19); + this.linkLabel1.TabIndex = 13; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "01월"; + // + // btSave + // + this.btSave.Dock = System.Windows.Forms.DockStyle.Right; + this.btSave.Location = new System.Drawing.Point(959, 5); + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(75, 48); + this.btSave.TabIndex = 12; + this.btSave.Text = "파일저장"; + this.btSave.UseVisualStyleBackColor = true; + this.btSave.Click += new System.EventHandler(this.btSave_Click); + // + // cmbUser + // + this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUser.FormattingEnabled = true; + this.cmbUser.Location = new System.Drawing.Point(289, 32); + this.cmbUser.Name = "cmbUser"; + this.cmbUser.Size = new System.Drawing.Size(180, 20); + this.cmbUser.TabIndex = 11; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(254, 36); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(29, 12); + this.label4.TabIndex = 10; + this.label4.Text = "사원"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(261, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(14, 12); + this.label3.TabIndex = 9; + this.label3.Text = "~"; + // + // dte + // + this.dte.Location = new System.Drawing.Point(289, 8); + this.dte.Name = "dte"; + this.dte.Size = new System.Drawing.Size(180, 21); + this.dte.TabIndex = 8; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(10, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.TabIndex = 7; + this.label2.Text = "검색기간"; + // + // dts + // + this.dts.Location = new System.Drawing.Point(68, 8); + this.dts.Name = "dts"; + this.dts.Size = new System.Drawing.Size(180, 21); + this.dts.TabIndex = 6; + // + // tbProcess + // + this.tbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.tbProcess.FormattingEnabled = true; + this.tbProcess.Location = new System.Drawing.Point(68, 32); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(180, 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(34, 36); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 3; + this.label1.Text = "공정"; + // + // btRefresh + // + this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; + this.btRefresh.Location = new System.Drawing.Point(1034, 5); + this.btRefresh.Name = "btRefresh"; + this.btRefresh.Size = new System.Drawing.Size(75, 48); + this.btRefresh.TabIndex = 2; + this.btRefresh.Text = "새로고침"; + this.btRefresh.UseVisualStyleBackColor = true; + this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); + // + // dv1 + // + this.dv1.A_DelCurrentCell = true; + this.dv1.A_EnterToTab = true; + this.dv1.A_KoreanField = null; + this.dv1.A_UpperField = null; + this.dv1.A_ViewRownumOnHeader = true; + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 58); + this.dv1.Name = "dv1"; + this.dv1.ReadOnly = true; + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(1114, 641); + this.dv1.TabIndex = 1; + // + // rJobReportPrj + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1114, 699); + this.Controls.Add(this.dv1); + this.Controls.Add(this.panel1); + this.Name = "rJobReportPrj"; + this.Text = "개인별 프로젝트 집계"; + 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.dv1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + private dsReport dsReport; + private System.Windows.Forms.BindingSource bs; + private dsReportTableAdapters.JobReportDayTableAdapter ta; + private arCtl.arDatagridView dv1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.LinkLabel linkLabel9; + private System.Windows.Forms.LinkLabel linkLabel10; + private System.Windows.Forms.LinkLabel linkLabel11; + private System.Windows.Forms.LinkLabel linkLabel12; + private System.Windows.Forms.LinkLabel linkLabel5; + private System.Windows.Forms.LinkLabel linkLabel6; + private System.Windows.Forms.LinkLabel linkLabel7; + private System.Windows.Forms.LinkLabel linkLabel8; + private System.Windows.Forms.LinkLabel linkLabel3; + private System.Windows.Forms.LinkLabel linkLabel4; + private System.Windows.Forms.LinkLabel linkLabel2; + private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.Button btSave; + private System.Windows.Forms.ComboBox cmbUser; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DateTimePicker dte; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.DateTimePicker dts; + private System.Windows.Forms.ComboBox tbProcess; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btRefresh; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs new file mode 100644 index 0000000..4a708c9 --- /dev/null +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs @@ -0,0 +1,238 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FPJ0000.JobReport_ +{ + public partial class rJobReportPrj : Form + { + Boolean binit = false; + public rJobReportPrj(string baseday) + { + InitializeComponent(); + this.WindowState = FormWindowState.Maximized; + this.dts.Value = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01")); + this.dte.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddMonths(1).AddDays(-1); + + } + + private void rJobReport_Load(object sender, EventArgs e) + { + this.tbProcess.Items.Clear(); + tbProcess.Items.Add("--전체--"); + var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); + var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); + foreach (dsReport.ProcessListRow dr in dtProcessList.Rows) + tbProcess.Items.Add(dr.processs); + + this.tbProcess.Text = FCOMMON.info.Login.process; + if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; + + //사용자 목록을 선택한다 + UpdateUserList(); + + //this.tbMon.Text = DateTime.Now.ToString("yyyy-MM"); + refrehData(); + binit = true; + } + void UpdateUserList() + { + var ta = new dsPRJTableAdapters.vJobReportForUserListTableAdapter(); + + cmbUser.Items.Clear(); + + //일반사용자 목록 가져온다 + dsPRJ.vJobReportForUserListDataTable userlist; + + if (tbProcess.SelectedIndex <= 0) + { + //공정구분없이 전체사용자를 가져온다 + userlist = ta.GetData(FCOMMON.info.Login.gcode, "%"); + // db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name).GroupBy(t => t.name); + } + else + { + userlist = ta.GetData(FCOMMON.info.Login.gcode, tbProcess.Text); + //db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).OrderBy(t => t.name).GroupBy(t => t.name); + } + + //if (tbProcess.SelectedIndex != 0) userlist = userlist.Where(t => t.processs == tbProcess.Text); //해당 공정의 인원만 처리한다 + + foreach (var dr in userlist) + { + //var dr = item.First(); + cmbUser.Items.Add(String.Format("[{0}] {1}", dr.id, dr.name)); + } + + if (tbProcess.SelectedIndex > 0) + cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); + + if (cmbUser.SelectedIndex < 0) cmbUser.SelectedIndex = 0; //기본전체로 선택해준다. + } + + void refrehData() + { + + //근문일수,시간 + var vSD = dts.Value.ToShortDateString(); + var vED = dte.Value.ToShortDateString(); + + string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); + var taH = new dsReportTableAdapters.JobProjectTimesTableAdapter(); + + var username = cmbUser.Text.Trim(); + + var uid = username.Substring(1, username.IndexOf("]") - 1);// "395552"; + + taH.Fill(this.dsReport.JobProjectTimes, FCOMMON.info.Login.gcode, vSD, vED, uid); + //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); + //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; + //this.reportViewer1.RefreshReport(); + + //그리드뷰 생성 + this.dv1.Rows.Clear(); + this.dv1.Columns.Clear(); + + + var wekklist = new string[] { "일", "월", "화", "수", "목", "금", "토" }; + + //날짜에 해당하는 열을 먼저 생성한다 + + dv1.Columns.Add("dvcu_pidx", "*"); + dv1.Columns.Add("dvcu_title", "프로젝트"); + //dv1.Columns.Add("dvcu_hrs", "시간"); + + //ww컬럼생성 + var wwlist = dsReport.JobProjectTimes.GroupBy(t => t.ww).Select(t => int.Parse(t.Key)).OrderBy(t => t).ToList(); + var wwfont = new Font("Consolas", 8f); + dv1.ColumnHeadersDefaultCellStyle.Font = wwfont; + + foreach (var item in wwlist) + { + dv1.Columns.Add("dvcu_ww" + item, $"{item}(%)"); + dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.NullValue = ""; + dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Format = "N2"; + dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Font = wwfont; + } + + + + dv1.Columns.Add("dvcu_hrs", "합계(h)"); + dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.BackColor = Color.LightGray; + + dv1.Columns.Add("dvcu_hrs", "비율(%)"); + dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Format = "N2"; + + var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs); + + //데이터를 추가한다. + foreach (var dr in dsReport.JobProjectTimes.GroupBy(t => t.pidx)) + { + var pidx = dr.Key; + var fdr = dr.First(); + + List row = new List(); + row.Add(dr.Key); + if (dr.Key == -1) row.Add("Other"); + else row.Add(fdr.title); + //row.Add("--"); + + foreach (var item in wwlist) + { + var wwsum = dsReport.JobProjectTimes.Where(t => t.ww == item.ToString()).Sum(t => t.hrs); + var wwhrs = 0.0; + var hrsdata = dr.Where(t => t.ww == item.ToString()); + if (hrsdata.Any()) wwhrs = hrsdata.Sum(t => t.hrs); + + var perc = 0.0; + if (wwsum > 0) perc = (wwhrs / wwsum) * 100.0; + + if (perc == 0.0) row.Add(null); + else row.Add(perc); + } + + row.Add(dr.Sum(t => t.hrs)); + var tperc = 0.0; + if (TotHrs > 0) tperc = (dr.Sum(t => t.hrs) / TotHrs) * 100.0; + + row.Add(tperc); + + if (dr.Key == -1) + dv1.Rows.Insert(0, row.ToArray()); + else + dv1.Rows.Add(row.ToArray()); + + + } + + + + dv1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + dv1.Columns[0].DefaultCellStyle.BackColor = Color.LightGray; + dv1.Columns[1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft; + + + for (int i = 0; i < this.dv1.ColumnCount; i++) + { + var col = this.dv1.Columns[i]; + if (col.Name.StartsWith("dvcu_ww") == false) continue; + + foreach (DataGridViewRow dvrow in this.dv1.Rows) + { + var c = dvrow.Cells[col.Index]; + var v = c.Value; + double hrs = 0.0; + if (v != null) hrs = double.Parse(v.ToString()); + if (hrs > 0) + { + c.Style.BackColor = Color.Gold; + } + else + { + c.Style.BackColor = Color.White; + } + + } + + } + + //첫줄은 색상을 변경해준다. + if (dv1.RowCount > 0) + { + var dvrow = dv1.Rows[0]; + for (int i = 0; i < this.dv1.ColumnCount; i++) + { + var c = dvrow.Cells[i]; + c.Style.BackColor = Color.Gray; + } + + } + + + this.dv1.AutoResizeColumns(); + } + + + + private void btSave_Click(object sender, EventArgs e) + { + dv1.ExportData(string.Empty); + } + + private void btRefresh_Click(object sender, EventArgs e) + { + refrehData(); + } + + private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) + { + if (binit == false) return; + UpdateUserList(); + } + } +} diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrj.resx b/SubProject/FPJ0000/JobReport_/rJobReportPrj.resx new file mode 100644 index 0000000..d42e47f --- /dev/null +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrj.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 181, 17 + + + 17, 17 + + + 245, 17 + + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs index dfd95d4..267c1fa 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs @@ -23,12 +23,12 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { - this.tbProcess.Items.Clear(); + this.fpSpread1_Sheet2.AddSelection(2, 3, 4, 3); - // fpSpread1_Sheet2.Columns[1, 0].AllowAutoSort = true; + // fpSpread1_Sheet2.Columns[1, 0].AllowAutoSort = true; //this.fpSpread1_Sheet2.ColumnHeader.AutoTextIndex = 1; - + this.tbProcess.Items.Clear(); tbProcess.Items.Add("--전체--"); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index 028397f..744a480 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -36,6 +36,8 @@ namespace FPJ0000 { private vJobReportForUserDataTable tablevJobReportForUser; + private JobProjectTimesDataTable tableJobProjectTimes; + private PartSummaryDataTable tablePartSummary; private K5DailyFormDataTable tableK5DailyForm; @@ -86,6 +88,9 @@ namespace FPJ0000 { if ((ds.Tables["vJobReportForUser"] != null)) { base.Tables.Add(new vJobReportForUserDataTable(ds.Tables["vJobReportForUser"])); } + if ((ds.Tables["JobProjectTimes"] != null)) { + base.Tables.Add(new JobProjectTimesDataTable(ds.Tables["JobProjectTimes"])); + } if ((ds.Tables["PartSummary"] != null)) { base.Tables.Add(new PartSummaryDataTable(ds.Tables["PartSummary"])); } @@ -170,6 +175,16 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public JobProjectTimesDataTable JobProjectTimes { + get { + return this.tableJobProjectTimes; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -275,6 +290,9 @@ namespace FPJ0000 { if ((ds.Tables["vJobReportForUser"] != null)) { base.Tables.Add(new vJobReportForUserDataTable(ds.Tables["vJobReportForUser"])); } + if ((ds.Tables["JobProjectTimes"] != null)) { + base.Tables.Add(new JobProjectTimesDataTable(ds.Tables["JobProjectTimes"])); + } if ((ds.Tables["PartSummary"] != null)) { base.Tables.Add(new PartSummaryDataTable(ds.Tables["PartSummary"])); } @@ -350,6 +368,12 @@ namespace FPJ0000 { this.tablevJobReportForUser.InitVars(); } } + this.tableJobProjectTimes = ((JobProjectTimesDataTable)(base.Tables["JobProjectTimes"])); + if ((initTable == true)) { + if ((this.tableJobProjectTimes != null)) { + this.tableJobProjectTimes.InitVars(); + } + } this.tablePartSummary = ((PartSummaryDataTable)(base.Tables["PartSummary"])); if ((initTable == true)) { if ((this.tablePartSummary != null)) { @@ -384,6 +408,8 @@ namespace FPJ0000 { base.Tables.Add(this.tableHolidayLIst); this.tablevJobReportForUser = new vJobReportForUserDataTable(); base.Tables.Add(this.tablevJobReportForUser); + this.tableJobProjectTimes = new JobProjectTimesDataTable(); + base.Tables.Add(this.tableJobProjectTimes); this.tablePartSummary = new PartSummaryDataTable(); base.Tables.Add(this.tablePartSummary); this.tableK5DailyForm = new K5DailyFormDataTable(); @@ -426,6 +452,12 @@ namespace FPJ0000 { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeJobProjectTimes() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private bool ShouldSerializePartSummary() { @@ -511,6 +543,9 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void vJobReportForUserRowChangeEventHandler(object sender, vJobReportForUserRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void JobProjectTimesRowChangeEventHandler(object sender, JobProjectTimesRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void PartSummaryRowChangeEventHandler(object sender, PartSummaryRowChangeEvent e); @@ -2748,6 +2783,327 @@ namespace FPJ0000 { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class JobProjectTimesDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnww; + + private global::System.Data.DataColumn columnpidx; + + private global::System.Data.DataColumn columntitle; + + private global::System.Data.DataColumn columnhrs; + + private global::System.Data.DataColumn columnidx; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesDataTable() { + this.TableName = "JobProjectTimes"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal JobProjectTimesDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected JobProjectTimesDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn wwColumn { + get { + return this.columnww; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn pidxColumn { + get { + return this.columnpidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn titleColumn { + get { + return this.columntitle; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn hrsColumn { + get { + return this.columnhrs; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn idxColumn { + get { + return this.columnidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesRow this[int index] { + get { + return ((JobProjectTimesRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event JobProjectTimesRowChangeEventHandler JobProjectTimesRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event JobProjectTimesRowChangeEventHandler JobProjectTimesRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event JobProjectTimesRowChangeEventHandler JobProjectTimesRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event JobProjectTimesRowChangeEventHandler JobProjectTimesRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddJobProjectTimesRow(JobProjectTimesRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesRow AddJobProjectTimesRow(string ww, int pidx, string title, double hrs, int idx) { + JobProjectTimesRow rowJobProjectTimesRow = ((JobProjectTimesRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + ww, + pidx, + title, + hrs, + idx}; + rowJobProjectTimesRow.ItemArray = columnValuesArray; + this.Rows.Add(rowJobProjectTimesRow); + return rowJobProjectTimesRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesRow FindByidx(int idx) { + return ((JobProjectTimesRow)(this.Rows.Find(new object[] { + idx}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + JobProjectTimesDataTable cln = ((JobProjectTimesDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new JobProjectTimesDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnww = base.Columns["ww"]; + this.columnpidx = base.Columns["pidx"]; + this.columntitle = base.Columns["title"]; + this.columnhrs = base.Columns["hrs"]; + this.columnidx = base.Columns["idx"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnww = new global::System.Data.DataColumn("ww", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnww); + this.columnpidx = new global::System.Data.DataColumn("pidx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpidx); + this.columntitle = new global::System.Data.DataColumn("title", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columntitle); + this.columnhrs = new global::System.Data.DataColumn("hrs", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnhrs); + this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidx); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnidx}, true)); + this.columnww.ReadOnly = true; + this.columnww.MaxLength = 6; + this.columnpidx.ReadOnly = true; + this.columntitle.ReadOnly = true; + this.columntitle.MaxLength = 255; + this.columnhrs.ReadOnly = true; + this.columnidx.AllowDBNull = false; + this.columnidx.ReadOnly = true; + this.columnidx.Unique = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesRow NewJobProjectTimesRow() { + return ((JobProjectTimesRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new JobProjectTimesRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(JobProjectTimesRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.JobProjectTimesRowChanged != null)) { + this.JobProjectTimesRowChanged(this, new JobProjectTimesRowChangeEvent(((JobProjectTimesRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.JobProjectTimesRowChanging != null)) { + this.JobProjectTimesRowChanging(this, new JobProjectTimesRowChangeEvent(((JobProjectTimesRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.JobProjectTimesRowDeleted != null)) { + this.JobProjectTimesRowDeleted(this, new JobProjectTimesRowChangeEvent(((JobProjectTimesRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.JobProjectTimesRowDeleting != null)) { + this.JobProjectTimesRowDeleting(this, new JobProjectTimesRowChangeEvent(((JobProjectTimesRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveJobProjectTimesRow(JobProjectTimesRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsReport ds = new dsReport(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "JobProjectTimesDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents the strongly named DataTable class. /// @@ -4736,6 +5092,144 @@ namespace FPJ0000 { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class JobProjectTimesRow : global::System.Data.DataRow { + + private JobProjectTimesDataTable tableJobProjectTimes; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal JobProjectTimesRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableJobProjectTimes = ((JobProjectTimesDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ww { + get { + if (this.IswwNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableJobProjectTimes.wwColumn])); + } + } + set { + this[this.tableJobProjectTimes.wwColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int pidx { + get { + if (this.IspidxNull()) { + return 0; + } + else { + return ((int)(this[this.tableJobProjectTimes.pidxColumn])); + } + } + set { + this[this.tableJobProjectTimes.pidxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string title { + get { + if (this.IstitleNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableJobProjectTimes.titleColumn])); + } + } + set { + this[this.tableJobProjectTimes.titleColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double hrs { + get { + if (this.IshrsNull()) { + return 0D; + } + else { + return ((double)(this[this.tableJobProjectTimes.hrsColumn])); + } + } + set { + this[this.tableJobProjectTimes.hrsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int idx { + get { + return ((int)(this[this.tableJobProjectTimes.idxColumn])); + } + set { + this[this.tableJobProjectTimes.idxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswwNull() { + return this.IsNull(this.tableJobProjectTimes.wwColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwwNull() { + this[this.tableJobProjectTimes.wwColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IspidxNull() { + return this.IsNull(this.tableJobProjectTimes.pidxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetpidxNull() { + this[this.tableJobProjectTimes.pidxColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IstitleNull() { + return this.IsNull(this.tableJobProjectTimes.titleColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SettitleNull() { + this[this.tableJobProjectTimes.titleColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IshrsNull() { + return this.IsNull(this.tableJobProjectTimes.hrsColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SethrsNull() { + this[this.tableJobProjectTimes.hrsColumn] = global::System.Convert.DBNull; + } + } + /// ///Represents strongly named DataRow class. /// @@ -5294,6 +5788,40 @@ namespace FPJ0000 { } } + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class JobProjectTimesRowChangeEvent : global::System.EventArgs { + + private JobProjectTimesRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesRowChangeEvent(JobProjectTimesRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } + /// ///Row event argument class /// @@ -7094,6 +7622,233 @@ ORDER BY pdate"; } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class JobProjectTimesTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public JobProjectTimesTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "JobProjectTimes"; + tableMapping.ColumnMappings.Add("ww", "ww"); + tableMapping.ColumnMappings.Add("pidx", "pidx"); + tableMapping.ColumnMappings.Add("title", "title"); + tableMapping.ColumnMappings.Add("hrs", "hrs"); + tableMapping.ColumnMappings.Add("idx", "idx"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FPJ0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = @"SELECT MAX(idx) AS idx, dbo.getWorkWeek(pdate) AS ww, ISNULL(pidx, 0) AS pidx, MAX(projectName) AS title, ISNULL(SUM(hrs), 0) AS hrs +FROM JobReport +WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) AND (ISNULL(hrs, 0) > 0) +GROUP BY dbo.getWorkWeek(pdate), ISNULL(pidx, 0) +ORDER BY title, ww"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(dsReport.JobProjectTimesDataTable dataTable, string gcode, string sd, string ed, string uid) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); + } + if ((uid == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual dsReport.JobProjectTimesDataTable GetData(string gcode, string sd, string ed, string uid) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); + } + if ((uid == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid)); + } + dsReport.JobProjectTimesDataTable dataTable = new dsReport.JobProjectTimesDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/SubProject/FPJ0000/dsReport.cs b/SubProject/FPJ0000/dsReport.cs index 20b7dad..410dbea 100644 --- a/SubProject/FPJ0000/dsReport.cs +++ b/SubProject/FPJ0000/dsReport.cs @@ -2,10 +2,10 @@ { - partial class dsReport - { - partial class JobReportDayDataTable - { - } - } + partial class dsReport + { + partial class JobReportDayDataTable + { + } + } } diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index f88e9e8..a36a161 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -292,6 +292,35 @@ ORDER BY pdate + + + + + + SELECT MAX(idx) AS idx, dbo.getWorkWeek(pdate) AS ww, ISNULL(pidx, 0) AS pidx, MAX(projectName) AS title, ISNULL(SUM(hrs), 0) AS hrs +FROM JobReport +WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) AND (ISNULL(hrs, 0) > 0) +GROUP BY dbo.getWorkWeek(pdate), ISNULL(pidx, 0) +ORDER BY title, ww + + + + + + + + + + + + + + + + + + + @@ -343,7 +372,7 @@ ORDER BY pdate - + @@ -357,7 +386,7 @@ ORDER BY pdate - + @@ -610,6 +639,29 @@ ORDER BY pdate + + + + + + + + + + + + + + + + + + + + + + + @@ -645,5 +697,9 @@ ORDER BY pdate + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss index a04ca4d..f9c3487 100644 --- a/SubProject/FPJ0000/dsReport.xss +++ b/SubProject/FPJ0000/dsReport.xss @@ -6,14 +6,15 @@ --> - - - - - - - - + + + + + + + + + \ No newline at end of file