diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 8a27ba6..3465bf5 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.01.16.2250")] -[assembly: AssemblyFileVersion("23.01.16.2250")] +[assembly: AssemblyVersion("23.01.17.2130")] +[assembly: AssemblyFileVersion("23.01.17.2130")] diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index a53b723..fd7be30 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(); @@ -80,6 +80,7 @@ this.toolStripButton13 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton14 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.개인별프로젝트스케쥴현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -122,7 +123,6 @@ this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.개인별프로젝트스케쥴현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -427,6 +427,14 @@ this.toolStripButton1.Text = "개인별 프로젝트 점유율(%) 현황"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); // + // 개인별프로젝트스케쥴현황ToolStripMenuItem + // + this.개인별프로젝트스케쥴현황ToolStripMenuItem.Image = global::FPJ0000.Properties.Resources.copy; + this.개인별프로젝트스케쥴현황ToolStripMenuItem.Name = "개인별프로젝트스케쥴현황ToolStripMenuItem"; + this.개인별프로젝트스케쥴현황ToolStripMenuItem.Size = new System.Drawing.Size(261, 22); + this.개인별프로젝트스케쥴현황ToolStripMenuItem.Text = "개인별 프로젝트 스케쥴 현황"; + this.개인별프로젝트스케쥴현황ToolStripMenuItem.Click += new System.EventHandler(this.개인별프로젝트스케쥴현황ToolStripMenuItem_Click); + // // toolStripButton3 // this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); @@ -625,131 +633,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(2023, 1, 15, 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(2023, 1, 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(2023, 1, 15, 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(2023, 1, 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; @@ -973,13 +981,6 @@ this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; // - // 개인별프로젝트스케쥴현황ToolStripMenuItem - // - this.개인별프로젝트스케쥴현황ToolStripMenuItem.Name = "개인별프로젝트스케쥴현황ToolStripMenuItem"; - this.개인별프로젝트스케쥴현황ToolStripMenuItem.Size = new System.Drawing.Size(261, 22); - this.개인별프로젝트스케쥴현황ToolStripMenuItem.Text = "개인별 프로젝트 스케쥴 현황"; - this.개인별프로젝트스케쥴현황ToolStripMenuItem.Click += new System.EventHandler(this.개인별프로젝트스케쥴현황ToolStripMenuItem_Click); - // // fJobReport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index 3057168..668ae51 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -243,20 +243,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqiwF6WpTQ3s - Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc05Nzeckde8zE3nBbwsdZdzdOfMb885W2og9IMPz4vn - fD+c3/ccATfBD5UJV0q1iogy7e8QqZYiJ81Tzp06OqK0jw57ph45L1FVHot8f4AP7Z3QJ72qZSu9Ojpl - Yi32TVhsu6xaOWj8WrSi4IsZMWXjDmGm/KAn6p7wYvXyxPQs2zfjhG6Wgc7MQDvDQG3agnJqE21jdmwy - QPM4hYJPs0h+MUL9IwmRtlEbji0MzLH4MceQk0E/L9lCj2ET38YcRODCwCIL3YITRXIzAh90vePD0eUB - xlvSyG1xzQ0kV99EdXsDChvLESj1QQBBWOSPYNkZVDRX8KvYaAZLaw4Ep/QwvCCqNPBj13ALWiZfo1qb - x0viq8KQ9zYOWQ0xENVeRVJtEpoHl9AyYsPXoQ2sk55CZL00LxBWCg/6S7NZ7UQ33gzLUKLM5CUJNeEk - fA1pL1OhMtj5VTonKShID2t2J0IKNW4BN6HFPXROXSL0BjVqdffxtCMX0eWXkFAVCf2MA3pSLFewatrd - iYUIgmV7BBceSZ1n848irlKIgek+FHWnQybPQczzIDQoP+PnPAM9KbbP5ISGsGx1IvCxR3BK4iX2kxxB - Vn0sbteEIrbiMi/JkcdB0phK3iQI3P2AmUU/94kJVlKkb7baLfCTHJr3kxwmD3nBL88L10uCkPEqEaox - BYoU+Uj/kAhRTRT0RKAj/4aWCGiniwiUuytczO6lF9dpDM6zPD0TC7hXl4YUEhTXxiC3/u7OHYdjiyWC - pl0BZ5uz7Ar+h51bIXWP4FzOd4dmyLC938P7YTLPu07EN9s8cVJkWodxdsNh1QwbXcYVCsZlCgYPKzYn - D9e8jWYxZZpzURS17n2nddQTFwhOp7Vn+IraOk6KFRZfcRO9Q4obn7+ImmhvUeva8aTWTp9EebJAIBD8 - AcSjn/E9z3PXAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZJZTxNRGIZ7JT/BoBdekhiFaI3rhYKABUxw + QyCIbKUQEJBADSZiTcGILAYkQKKGQDReqAEXKGABKaXQhtbIIrKUAmVJWCrQZQY6U17PTCtgQuKXPDkX + Z94n870zAm6CHqjiL5doleGl2t/BMi1FTpqnjDt1dHhJHx36VDN8TqquOBzxbh8f2j0hj3vUS1Z6ZXjc + xFrsG7DYdlixctD4tWBF/mczoktHHaIMhZcn6p6wIs3SqHGa7Zt2QjfDQGdmoJ1moJnahGpiA60jdmww + QNMohfyPM0h6Pkz9IwmWtVLrjk0YZll8n2XIyaCfl2yi27iBryMOInDBsMBCN+9EocKMgPudb/lwVJm/ + 6aYsYktSfR1JVTdQ1VaPgoYyBMh84U8QFZ5FkPwkypvK+VVsNIPFVQeCxN0ML4gsCfjQOdSM5vFXqNLm + 8pK4ylDkvolFZn00xDVXkFiTiKaBRTQP2/BlcB1rpKdgeQ/NC0QVIq8zsixWO9aF10NyFKsyeEl8dRgJ + X0XqixSojXZ+lY5xCkrSw6rdieCCXreAm5Cibjq7NgF6owY1unt40p6DqLKLiK+MgH7aAT0plitYPenu + xEIEQfJdgvMPZc5TeYcQWyGCYbIPhV1pkCuyEf0sEPWqT/gxx0BPiu2bcqKXsGR1IuCRR3Bc6i0RSg8i + sy4Gt6pDEFN+iZdkK2IhbUghbxII7t5gZtHPfWKClRTpl6VxC4TS/XNC6QHykDeEud64VhyI9JcJUI8o + UajMQ9r7BIirI6EnAh35N7REQDtdRKDaWeFCVg+9sEZjYI7l6R6bx93aVCSToKQmGjl1d7bvOBybLBE0 + 7gg426xlR/A/7NwKKbsEp7O/OTQDE1t7PbwXpplZ19G4JpsnTopMbTfNrDusmsFJl2mZgmmJgtHDss3J + wzVvo1mMm8wuiqLWfG63/PTEBYITqW3pfuLW9mMSpcVP0khvk+zG9y/iRtpH3LJ6JLGlwzdBkSQQCAR/ + AKNfn92xxqiIAAAAAElFTkSuQmCC @@ -340,6 +340,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 17, 17 + 325, 17 @@ -391,24 +394,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= @@ -417,41 +420,41 @@ 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 diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs index 70e8684..ba4d46d 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs @@ -66,19 +66,13 @@ 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(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsReport = new FPJ0000.dsReport(); this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter(); this.fp1 = new FarPoint.Win.Spread.FpSpread(); this.fp1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.tbWW = new System.Windows.Forms.TextBox(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fp1)).BeginInit(); @@ -88,6 +82,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.tbWW); this.panel1.Controls.Add(this.btSave); this.panel1.Controls.Add(this.cmbUser); this.panel1.Controls.Add(this.label4); @@ -121,6 +116,7 @@ this.cmbUser.Name = "cmbUser"; this.cmbUser.Size = new System.Drawing.Size(180, 20); this.cmbUser.TabIndex = 11; + this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); // // label4 // @@ -161,60 +157,6 @@ 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.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column1, - this.Column2, - this.Column3, - this.Column4, - this.Column5}); - this.dv1.Dock = System.Windows.Forms.DockStyle.Top; - 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, 219); - this.dv1.TabIndex = 1; - // - // Column1 - // - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - // - // Column2 - // - this.Column2.HeaderText = "Column2"; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - // - // Column3 - // - this.Column3.HeaderText = "Column3"; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - // - // Column4 - // - this.Column4.HeaderText = "Column4"; - this.Column4.Name = "Column4"; - this.Column4.ReadOnly = true; - // - // Column5 - // - this.Column5.HeaderText = "Column5"; - this.Column5.Name = "Column5"; - this.Column5.ReadOnly = true; - // // bs // this.bs.DataMember = "JobReportDay"; @@ -237,11 +179,11 @@ this.fp1.Dock = System.Windows.Forms.DockStyle.Fill; this.fp1.EditModeReplace = true; this.fp1.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.fp1.Location = new System.Drawing.Point(0, 277); + this.fp1.Location = new System.Drawing.Point(0, 58); this.fp1.Name = "fp1"; this.fp1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fp1_Sheet1}); - this.fp1.Size = new System.Drawing.Size(1114, 422); + this.fp1.Size = new System.Drawing.Size(1114, 641); this.fp1.StatusBarVisible = true; this.fp1.TabIndex = 8; // @@ -255,10 +197,6 @@ this.fp1_Sheet1.ActiveColumnIndex = -1; this.fp1_Sheet1.ActiveRowIndex = -1; this.fp1_Sheet1.AutoGenerateColumns = false; - this.fp1_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8; this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info"; @@ -462,31 +400,30 @@ this.fp1_Sheet1.Columns.Get(29).Width = 26F; this.fp1_Sheet1.DataAutoSizeColumns = false; this.fp1_Sheet1.DataSource = this.bs; - this.fp1_Sheet1.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty; this.fp1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fp1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fp1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fp1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // tbWW + // + this.tbWW.Location = new System.Drawing.Point(243, 9); + this.tbWW.Name = "tbWW"; + this.tbWW.ReadOnly = true; + this.tbWW.Size = new System.Drawing.Size(62, 21); + this.tbWW.TabIndex = 13; + this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // rJobReportPrjSche // 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.fp1); - this.Controls.Add(this.dv1); this.Controls.Add(this.panel1); this.Name = "rJobReportPrjSche"; this.Text = "개인별 프로젝트 스케쥴 현황"; this.Load += new System.EventHandler(this.rJobReport_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fp1)).EndInit(); @@ -499,7 +436,6 @@ 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.Button btSave; private System.Windows.Forms.ComboBox cmbUser; @@ -507,12 +443,8 @@ private System.Windows.Forms.ComboBox tbProcess; private System.Windows.Forms.Label label1; private System.Windows.Forms.Button btRefresh; - private System.Windows.Forms.DataGridViewTextBoxColumn Column1; - private System.Windows.Forms.DataGridViewTextBoxColumn Column2; - private System.Windows.Forms.DataGridViewTextBoxColumn Column3; - private System.Windows.Forms.DataGridViewTextBoxColumn Column4; - private System.Windows.Forms.DataGridViewTextBoxColumn Column5; private FarPoint.Win.Spread.FpSpread fp1; private FarPoint.Win.Spread.SheetView fp1_Sheet1; + private System.Windows.Forms.TextBox tbWW; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs index 249e6a0..6350169 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs @@ -20,6 +20,16 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + + var myCI = new System.Globalization.CultureInfo("ko-KR"); + var myCal = myCI.Calendar; + var myCWR = myCI.DateTimeFormat.CalendarWeekRule; + DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek; + var dat = myCal.GetWeekOfYear(DateTime.Now, myCWR, myFirstDOW); + tbWW.Tag = dat; + tbWW.Text = $"ww{dat:00}"; + + this.tbProcess.Items.Clear(); tbProcess.Items.Add("--전체--"); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); @@ -68,7 +78,7 @@ namespace FPJ0000.JobReport_ 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; //기본전체로 선택해준다. + if (cmbUser.SelectedIndex < 0 && cmbUser.Items.Count > 0) cmbUser.SelectedIndex = 0; //기본전체로 선택해준다. } void refrehData() @@ -77,6 +87,7 @@ namespace FPJ0000.JobReport_ //근문일수,시간 // var vSD = dts.Value.ToShortDateString(); //var vED = dte.Value.ToShortDateString(); + var curww = int.Parse(DateTime.Now.ToString("yy") + "00") + int.Parse(tbWW.Tag.ToString()); string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); var taH = new dsReportTableAdapters.UserScheduleTableTableAdapter(); @@ -91,22 +102,12 @@ namespace FPJ0000.JobReport_ //this.reportViewer1.RefreshReport(); //그리드뷰 생성 - this.dv1.Rows.Clear(); - this.dv1.Columns.Clear(); - fp1.ActiveSheet.RowCount = 0; - fp1.ActiveSheet.Columns.Clear(); - var wekklist = new string[] { "일", "월", "화", "수", "목", "금", "토" }; - //날짜에 해당하는 열을 먼저 생성한다 - dv1.Columns.Add("dvcu_pidx", "*"); - dv1.Columns.Add("dvcu_title", "프로젝트"); - dv1.Columns.Add("dvcu_title", "시작"); - dv1.Columns.Add("dvcu_title", "만료"); var colidx = 0; fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "*"; @@ -116,17 +117,17 @@ namespace FPJ0000.JobReport_ //dv1.Columns.Add("dvcu_hrs", "시간"); //오늘의WW추가 - var myCI = new System.Globalization.CultureInfo("ko-KR"); - var myCal = myCI.Calendar; - var myCWR = myCI.DateTimeFormat.CalendarWeekRule; - DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek; - var dat = myCal.GetWeekOfYear(DateTime.Now, myCWR, myFirstDOW); - var curwwstr = (DateTime.Now.Year - 2000).ToString() + dat.ToString("00"); + //var myCI = new System.Globalization.CultureInfo("ko-KR"); + //var myCal = myCI.Calendar; + //var myCWR = myCI.DateTimeFormat.CalendarWeekRule; + //DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek; + //var dat = myCal.GetWeekOfYear(DateTime.Now, myCWR, myFirstDOW); + //var curwwstr = (DateTime.Now.Year - 2000).ToString() + dat.ToString("00"); //ww컬럼생성 List wwlist = new List(); - wwlist.Add(int.Parse(curwwstr)); + wwlist.Add(curww); int ww = 0; foreach (dsReport.UserScheduleTableRow dr in dsReport.UserScheduleTable.Rows) { @@ -155,24 +156,31 @@ namespace FPJ0000.JobReport_ //var wwlist = dsReport.UserScheduleTable.GroupBy(t => t.ww).Select(t => int.Parse(t.Key)).OrderBy(t => t).ToList(); var wwfont = new Font("Consolas", 8f); - dv1.ColumnHeadersDefaultCellStyle.Font = wwfont; + var curyystr = DateTime.Now.ToString("yy"); foreach (var item in wwlist.OrderBy(t => t)) { var wwname = item.ToString("0000"); var yy1 = wwname.Substring(0, 2); var ww1 = wwname.Substring(2); - dv1.Columns.Add("dvcu_ww" + item, $"w{ww1}\ny{yy1}"); - dv1.Columns[dv1.Columns.Count - 1].Tag = 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[dv1.Columns.Count - 1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; - - fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = $"w{ww1}\ny{yy1}"; + fp1.ActiveSheet.Columns.Add(colidx, 1); + fp1.ActiveSheet.Columns[colidx].Tag = item; + if (item == curww) //이번주라면? + { + fp1.ActiveSheet.Columns[colidx].Label = $"(ww{ww1:00})"; + fp1.ActiveSheet.Columns[colidx].BackColor = Color.LightSlateGray; + } + else + { + if (curyystr.Equals(yy1)) + fp1.ActiveSheet.Columns[colidx].Label = $"ww{ww1:00}"; //같은년도 + else + fp1.ActiveSheet.Columns[colidx].Label = $"ww{ww1:00}\ny{yy1}"; //다른년도 + } + colidx += 1; } //프로젝트별로 데이터를 표시한다. @@ -180,22 +188,18 @@ namespace FPJ0000.JobReport_ var ridx = 0; - - - - foreach (var grp in grp_list) { var prjname = grp.Key; var sdate = grp.Max(t => t.sdate); var ddate = grp.Max(t => t.ddate); - string[] columns = new string[dv1.ColumnCount]; + //string[] columns = new string[dv1.ColumnCount]; var row = 0; - columns[row++] = grp.Max(t => t.idx).ToString(); - columns[row++] = prjname; - columns[row++] = sdate; - columns[row++] = ddate; + //columns[row++] = grp.Max(t => t.idx).ToString(); + //columns[row++] = prjname; + //columns[row++] = sdate; + //columns[row++] = ddate; var cidx = 0; @@ -206,10 +210,10 @@ namespace FPJ0000.JobReport_ ctdef.Multiline = true; - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = grp.Max(t => t.idx); - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = prjname; - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = sdate; - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = ddate; + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = grp.Max(t => t.idx); + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = prjname; + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = sdate; + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = ddate; @@ -227,14 +231,14 @@ namespace FPJ0000.JobReport_ bool first = true; int startcol = -1; int endcol = -1; - for (int i = row; i < dv1.ColumnCount; i++) + for (int i = 4; i < fp1.ActiveSheet.ColumnCount; i++) { - var col = dv1.Columns[i]; + var col = fp1.ActiveSheet.Columns[i]; if (col.Tag == null) continue; var colno = int.Parse(col.Tag.ToString()); if (colno >= isw && colno <= iew) { - columns[i] = "O"; + // columns[i] = "O"; if (dr.complete || dr.progress > 99) fp1.ActiveSheet.Cells[ridx, i].BackColor = Color.Lime; @@ -269,7 +273,7 @@ namespace FPJ0000.JobReport_ } } - dv1.Rows.Add(columns); + // dv1.Rows.Add(columns); ridx += 1; } @@ -284,145 +288,21 @@ namespace FPJ0000.JobReport_ fp1.ActiveSheet.Columns[1].Width = 250; fp1.ActiveSheet.Columns[2].Width = 75; fp1.ActiveSheet.Columns[3].Width = 75; - - //cell formation - foreach (DataGridViewRow dr in this.dv1.Rows) - { - for (int i = 4; i < dv1.ColumnCount; i++) - { - var cell = dr.Cells[i]; - if (cell.Value == null) - { - cell.Style.BackColor = Color.White; - continue; - } - if (cell.Value.ToString().Equals("O")) cell.Style.BackColor = Color.Green; - else cell.Style.BackColor = Color.White; - } - } - - dv1.AutoResizeColumns(); - return; - - 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.OrderByDescending(t => t.PrjStatus + t.PrjName).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("--"); - row.Add("비 프로젝트 업무"); - } - else - { - row.Add(fdr.PrjStatus); - if (fdr.PrjName.isEmpty()) - { - row.Add($"{fdr.title}"); - } - else - { - row.Add($"{fdr.PrjName}"); - } - - } - //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[2].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.LightGray; - } - - } - - - this.dv1.AutoResizeColumns(); } - - private void btSave_Click(object sender, EventArgs e) { - dv1.ExportData(string.Empty); + //dv1.ExportData(string.Empty); + var sd = new SaveFileDialog(); + sd.Filter = "excel file|*.xlsx"; + if (sd.ShowDialog() != DialogResult.OK) return; + fp1.SaveExcel(sd.FileName); + + if (FCOMMON.Util.MsgQ("저장된 파일을 열까요?") == DialogResult.Yes) + FCOMMON.Util.RunExplorer(sd.FileName); } private void btRefresh_Click(object sender, EventArgs e) @@ -436,46 +316,11 @@ namespace FPJ0000.JobReport_ UpdateUserList(); } - private void button1_Click(object sender, EventArgs e) + + private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) { - var newsize = dv1.Columns[2].Width < 10 ? 100 : 5; - this.dv1.SuspendLayout(); - for (int i = 3; i < this.dv1.ColumnCount - 2; i++) - { - this.dv1.Columns[i].Width = newsize; - } - this.dv1.ResumeLayout(); - } - - private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - - } - - private void linkLabel13_Click(object sender, EventArgs e) - { - //var lnk = sender as LinkLabel; - //if (lnk.Text.Equals("상반기")) - //{ - // dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01"); - // dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-05-31"); - //} - //else if (lnk.Text.Equals("하반기")) - //{ - // dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-01"); - // dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-12-31"); - //} - //else - //{ - // if (int.TryParse(lnk.Text.Substring(0, 2), out int mon) == false) return; - // dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00" + "-01")); - // dte.Value = dts.Value.AddMonths(1).AddDays(-1); - //} - } - - private void linkLabel14_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - + if (binit == false) return; + refrehData(); } } } diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.resx b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.resx index fd23c58..e80a9ce 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.resx +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.resx @@ -117,21 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - 181, 17 diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index afb7c0f..09c4c90 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -75,7 +75,7 @@ namespace FPJ0000 this.cmbState.DataSource = dt_status; //파트 - var dt_part = FCOMMON.DBM.getCodeTable("11"); + var dt_part = FCOMMON.DBM.getCodeTable("13"); this.cmbReqTeam.DisplayMember = "Value"; this.cmbReqTeam.ValueMember = "Value"; this.cmbReqTeam.DataSource = dt_part; diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 219c46a..e35e641 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,36 +30,36 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType 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.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.TextCellType textCellType11 = 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.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.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.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType26 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType67 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType68 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType69 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType70 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType71 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType72 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType73 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType27 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType28 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType74 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType75 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType76 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType77 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType78 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType79 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType80 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType88 = 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(); @@ -172,6 +172,7 @@ this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -222,7 +223,8 @@ this.btFind, this.toolStripSeparator6, this.sbCount, - this.toolStripButton2}); + this.toolStripButton2, + this.toolStripButton5}); this.bn.Location = new System.Drawing.Point(0, 837); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -431,11 +433,13 @@ // toolStripButton2 // this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.ForeColor = System.Drawing.Color.Red; this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(103, 22); this.toolStripButton2.Text = "프로젝트 요약"; + this.toolStripButton2.Visible = false; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // // cm @@ -695,174 +699,174 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; this.fpSpread1_Sheet1.Columns.Get(0).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(0).CellType = numberCellType1; + numberCellType25.DecimalPlaces = 0; + numberCellType25.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType25.MaximumValue = 2147483647D; + numberCellType25.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType25; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2; + numberCellType26.DecimalPlaces = 0; + numberCellType26.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType26.MaximumValue = 2147483647D; + numberCellType26.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType26; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType67; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment"; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType68; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType69; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType70; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG"; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType71; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line"; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType72; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team"; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType73; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; + numberCellType27.DecimalPlaces = 0; + numberCellType27.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType27.MaximumValue = 2147483647D; + numberCellType27.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType27; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수율(%)"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; + numberCellType28.DecimalPlaces = 0; + numberCellType28.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType28.MaximumValue = 2147483647D; + numberCellType28.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType28; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Progress(%)"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType74; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType75; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "Start Date"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType76; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "ddate"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "Due Date"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType77; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "Done Date"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; + numberCellType29.DecimalPlaces = 0; + numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType29.MaximumValue = 2147483647D; + numberCellType29.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType29; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "Q\'ty"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Width = 42F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; + numberCellType30.MaximumValue = 999999999999999D; + numberCellType30.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType30; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "Outsourced Cost ($K)/Set\r\n"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType7; + numberCellType31.MaximumValue = 999999999999999D; + numberCellType31.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType31; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "In-house Cost ($K/Set)"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; + numberCellType32.MaximumValue = 999999999999999D; + numberCellType32.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType32; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Label = "Cost Save ($k)/Set"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 67F; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType78; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(19).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType79; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "name_software"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType80; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_design"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "Design"; this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType81; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_assembly"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Label = "Assembly"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType82; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_epanel"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "ePanel"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType83; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_champion"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Label = "Champion"; this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType84; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory"; this.fpSpread1_Sheet1.Columns.Get(25).Label = "History"; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType85; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType86; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset"; this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType87; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#"; this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType88; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#"; @@ -1619,6 +1623,16 @@ this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // 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(143, 22); + this.toolStripButton5.Text = "프로젝트 스케쥴 현황"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1772,5 +1786,6 @@ private System.Windows.Forms.Label label17; private System.Windows.Forms.ToolStripButton toolStripButton2; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton5; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 478d0e6..d560b5e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -830,5 +830,11 @@ namespace FPJ0000 but.ForeColor = but.Checked ? Color.Blue : Color.Black; but.Font = but.Checked ? new Font("맑은 고딕", 10, FontStyle.Bold) : new Font("맑은 고딕", 10); } + + private void toolStripButton5_Click(object sender, EventArgs e) + { + var f = new JobReport_.rJobReportPrjSche(); + f.Show(); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 737f472..838966d 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,17 +230,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpoMiwpL15TLXClrrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9psBGKzvoR9cwMmBN9Ayrx6JYwn9Y1Fd3+jSYt/DCMyuMHoehEEl07+Qq3q6kxMzEhh39Huu - lzrtbYHBo4N+VIsTrkbys870DGJGQq/7K5kPzF8G478E8+wFUMhBMBy6OLdmgWkkTObZUBZPCNkSDAfP - +yQFVRaFqoLZhbJuOdQ9Comfsk4Exa4M4XgamjPTKwVVllKVki7hmkea0DbWjPKzO0hQYHA8mCmwT4Vg - nwzCORPE2y8J7O2YJAXq/lKVgt7Oae/WY4+pHMWnCiBv3YIhbwhWQRPs3xu8/hRHRasXKmZnZRkt5xqd - dZDRhVwRnbfNeGsR8dQybFMs8dr5LykgW/Ab2HjVWA9A2VuC6mv7cNRxGJvpDdxGev1WYaM22wfEkstw - TLO4PZMRNfyERSK1+rKaK5XQu7U4Yq9BMV3A5TdlwgItQ++w9O0n7vgyG9yf5Q/J+ZhFttTdSsjaC1Gk - z0P+8XUrYQHd9QVSMMwHhTApuME/RDYvAjFojN4170B79SWifIHraZh43X6+QAjkalOH+7eYkdDAPEck - 8QNsLI3PkRQCbBLUboMHuZI13LOLGQnHzPPjtV3+ZG3XHKrP+bC/c/Ve/hGK+gOUXSyS4UWzQgAAAABJ - RU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF + SKESs3bThpqsL1RYuqZc5kpZay1GZbmlk6lpS1vSV/sy+7Ld2tzW2sronu4+O3S3/Kle8HBw7+d5ePPh + Tf03RsdHtN8MwGB9D/3API73v4GWefVIHEvoG43qekcWF3ofRmB2hdH9IAwqmf6FXNXTpzgxI4FxR7/n + eqmT3hYYPDroR7Q45mokP+tMzyBmJPS4v5J5/9xlMP5LMM9cAIUcBMOBi7OrFpiGw2SeDWXxhJAtwbD/ + vE9SUGVRqCqYHSjrkkPdrZD4Ket4UOzKEI6noTkztVxQZSlVKekSrnm4CW2jzSg/u40EBQbGgpkC+2QI + 9okgnNNBvP2SwO6OCVKg7itVKeitnPZuPXaZylF8ogDy1k0Y9IZgFTTO/r3B609xVLR6oWK2V5bRcq7R + WQcZXcgV0XlbjLcWEE8twTbJEq+d/5ICsgW/gY1XjXUflD0lqL62B4cdB7GRXsetp9duFjZqs31ALLkE + xxSL29MZUUNPWCRSKy+ruVIJvVuLQ/YaFNMFXH5TJizQMvgOi99+4o4vs8H9Gf6QnI9ZZEvdpYSsvRBF + +jzkH12zHBbQXZ8nBUN8UAiTghv8Q2TzIhCDxuhd9Q60V18iyhe4noaJ1+3nC4RArjZ0uH+LGQkNzHNE + Ej/AxtL4HEkhwCZB7TR4kCtZwz27mJFwxDw3VtvpT9Z2zqL6nA97T6/cyz9CUX8AkOYskbmj6aQAAAAA + SUVORK5CYII= @@ -275,6 +275,24 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + 17, 17 + 387, 17 @@ -332,12 +350,18 @@ 561, 17 + + 561, 17 + 731, 17 647, 17 + + 731, 17 + 828, 17