diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 05cc44f..254edb3 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -163,6 +163,7 @@ namespace Project.Dialog FCOMMON.info.Login.hp = userdr.hp; FCOMMON.info.Login.tel = userdr.tel; FCOMMON.info.Login.title = userdr.ads_title; + FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); FCOMMON.info.Login.gcode = gCode;// gcode; diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index bed2735..789b786 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.09.24.1000")] -[assembly: AssemblyFileVersion("21.09.24.1000")] +[assembly: AssemblyVersion("21.09.30.1100")] +[assembly: AssemblyFileVersion("21.09.30.1100")] diff --git a/Project/Setting.cs b/Project/Setting.cs index b0a26fa..19be4eb 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -60,6 +60,8 @@ namespace Project [Category("구매"),DisplayName("오류항목표시")] public Boolean Showbuyerror { get; set; } + [DisplayName("업무일지 미리보기 창 숨김")] + public Boolean NotShowJobreportPRewView { get; set; } [Category("Barcode"), DisplayName("Port Name")] public string Barcode { get; set; } diff --git a/Project/fMain.cs b/Project/fMain.cs index 2fd2b6b..b0da100 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -325,6 +325,7 @@ namespace Project //환율재적용 - 210711 FCOMMON.info.dollertowon = Pub.setting.wondoller; + FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; } #endregion diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index ca3daa5..24cab59 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -50,6 +50,7 @@ namespace FCOMMON public int permission; } + public static Boolean NotShowJobReportview = false; public static double dollertowon = 1200; public static Boolean ShowBuyerror = true; public static sUserInfo Login; diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 7e95ed4..232bda3 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -30,23 +30,23 @@ { 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 textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType9 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType10 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType60 = 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(); @@ -111,6 +111,8 @@ this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -119,6 +121,10 @@ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); this.SuspendLayout(); // // bn @@ -210,7 +216,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -302,7 +307,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -536,11 +540,11 @@ this.fpSpread1.ContextMenuStrip = this.cm; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.fpSpread1.Location = new System.Drawing.Point(0, 37); + this.fpSpread1.Location = new System.Drawing.Point(0, 0); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1364, 633); + this.fpSpread1.Size = new System.Drawing.Size(1364, 592); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -573,111 +577,111 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).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 = textCellType49; 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 = textCellType50; 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 = textCellType51; 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 = textCellType52; 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 = textCellType53; 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 = textCellType54; 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 = textCellType55; 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 = textCellType56; 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 = textCellType57; 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 = textCellType58; 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; + numberCellType13.DecimalPlaces = 0; + numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType13.MaximumValue = 2147483647D; + numberCellType13.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType13; 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; + numberCellType14.MaximumValue = 999999999999999D; + numberCellType14.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType14; 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; + numberCellType15.MaximumValue = 999999999999999D; + numberCellType15.MinimumValue = -999999999999999D; + numberCellType15.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType15; 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 = textCellType59; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2021, 9, 24, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; + dateTimeCellType9.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType9.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType9.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType9.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType9.TimeDefault = new System.DateTime(2021, 9, 30, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType9; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType2.TimeDefault = new System.DateTime(2021, 9, 24, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; + dateTimeCellType10.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType10.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType10.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType10.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType10.TimeDefault = new System.DateTime(2021, 9, 30, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType10; 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 = textCellType60; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "tag"; this.fpSpread1_Sheet1.Columns.Get(16).Label = "#"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -705,7 +709,8 @@ this.toolStripLabel3, this.cmbUser, this.btSearch, - this.toolStripButton2}); + this.toolStripButton2, + this.toolStripButton6}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1364, 37); @@ -724,7 +729,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -748,7 +752,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -774,7 +777,6 @@ // tbProcess // this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); - this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbProcess.Name = "tbProcess"; this.tbProcess.Size = new System.Drawing.Size(200, 37); // @@ -836,22 +838,48 @@ // this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true)); - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.richTextBox1.Location = new System.Drawing.Point(0, 670); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(1364, 60); + this.richTextBox1.Size = new System.Drawing.Size(1364, 91); this.richTextBox1.TabIndex = 5; this.richTextBox1.Text = ""; - this.richTextBox1.Visible = false; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 37); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.fpSpread1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); + this.splitContainer1.Size = new System.Drawing.Size(1364, 693); + this.splitContainer1.SplitterDistance = 592; + this.splitContainer1.SplitterWidth = 10; + this.splitContainer1.TabIndex = 6; + // + // toolStripButton6 + // + 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(101, 34); + this.toolStripButton6.Text = "미리보기창"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); // // fJobReport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1364, 755); - this.Controls.Add(this.fpSpread1); - this.Controls.Add(this.richTextBox1); + this.Controls.Add(this.splitContainer1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fJobReport"; @@ -868,6 +896,10 @@ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -939,5 +971,7 @@ private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.ToolStripButton btOpenFolder; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.ToolStripButton toolStripButton6; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index 536d4c1..6525377 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -142,6 +142,11 @@ namespace FPJ0000 col.Locked = true; } + + //210930- + if (FCOMMON.info.NotShowJobReportview) + this.splitContainer1.Panel2Collapsed = true; + refreshData(); binit = true; @@ -702,5 +707,11 @@ namespace FPJ0000 } else FCOMMON.Util.MsgE("자료가 저장되기 전에는 폴더를 확인할 수 없습니다.\r\n자료를 저장한 후 다시 시도하세요"); } + + private void toolStripButton6_Click(object sender, EventArgs e) + { + this.splitContainer1.Panel2Collapsed = !this.splitContainer1.Panel2Collapsed; + richTextBox1.Visible = true; + } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index baef7cb..d77b12a 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -260,20 +260,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVDhPhZLrS1NhHMf3Kv+EsF70UohS0qioF6XpmhrY - zVLMvM0pmtrQhUG1mEblJTRRoUKUohcVWqZTm5pzTjeckZeszOZdc3NNdzlHd8769pyz5QyEfvDhefGc - 74fz+54j4Cbipjr5dKlOFVOm+yWU6yhy0jzl3KmnY0oH6KgH2rFjMk3l3tiXO/jQ1om826cx2eiVmSUz - a3Gsw2L3sWLjoPFl0YZbzbOIL/vqFOUo/bxRz0Tf15oWli3swLQL+hkG+lkGumkG2qkNqL+vo33cgXUG - aPlK4dabGaQ9GqP+kQjlHdSacwNDcyw+zjHkZDDISzbQO7mO9+NOInBjaJGFfsGFYuUswm50v+DDceWh - xovy2N+SmvNIq76A6o4GFDWWI0weiFCCqPgoIhSHUNFSwa9ipxksW52IkPYyvOBSadjr7tFWtE48RbWu - gJckVUWh4HkichviIa49g9TaVLQML6N1zI53I2tYJT0JFX00LxBVivyE8jxW960Hz0YVKFHn8JLkmmgS - PovMxxnQTDr4VbomKKhID1aHC8Kifo+Am8j7vbS0LgWGSS1q9ddxrzMfceUnkVwVC8O0EwZSLFew5oen - EwsRRCi2CI7flrsOF+5BYqUIQz8GUNyTBYVSiviH4WhQv8WneQYGUuzAlAv9BJPNhbA7XkGwzF8SItuN - 3PoEXK6JRELFKV4iVSZC1phB3iQc3P3QLItB7hMTbKTI4DytRxAi2zkfIttFHvJHSIE/zpWEI/tJCjTj - KhSrCpH1KgXimkswEIGe/Bs6IqBdbgTlqX0rnMjroxdXaQzPszy93xZwrS4T6SQoqY1Hfv3VzTsO5wZL - BM0+AWebs/gE/8NBVgjKaPIJjkg/OEeMP39v9/B2mH+tuvcntdi9cVJkZqdxZs1pG5kyuY1mCkYThUkv - ZruLh2veTrNYMlvdFEWtBlxp++yNCwQHMzuyg8TtnQckKkuQpIneJN1D4F/ETXSAuM26L7WtKzBFmSYQ - CAR/AF7/oOjSHDLtAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALzSURBVDhPhZLdT1JhHMe5qj+hWRddurXSFa1aXVQmhNXW + q6kzSxSRVWouabVVNLL1ojbNiVu1lqt1US17QdTQEpCEBb2avREqIhlKKnDOAc7Bb885UNrW1m/77Ll4 + zvez8/ueI+JHctJUuK3GZtxea/sp1dhocjICdfxpZ7bX9DFbLlr716ktDUuy784TQnMn61yvxR9kJtze + MS4QjiAQmmUiyMPgoy+IU489yKv9RMnKDPOT0cRsvWD1e3x+rm8oBvswC7uHhW2IhXUwCtPXCDoGwoiw + gP4TjVMPh1F8pZ/+SyLVdNDTVBTOEQ6vRlhysngpSKIwuyJ4OkARQRxOHwf7aAzVBg8yTjy7I4Rz6za6 + 92qyZ5S63Shu2oOmzhacfVCHDE0aNhJk1Wsh0a5Cvb5eWCXEsPgxSUFSbmYFQU5Nxv1n79vQ9uU6mmxV + guRA4xZU3S5AeUseFM07UNRcBP3bH2jrD+HJu2lMkZ6k2l5GEMgaZPM3aSo42+ce3HqvxSVTmSAp1G0l + 4Z1QXS2FxRUWVun+QsNIepgMxyA9+yIh4CfrgpmpvCGHw2VFs/0YzncdRW7dJhQ2ZsMxRMFBiuULtnxL + dBIgAol2jmD9aU1s9fHFKGiQwfmtD9U9B6E1VCLvciZaTI/wxsvCQYrtG4zhBcEfjCHjTFKwQp2iFKsX + ofxmPvbpspBfv1mQVBoKoH5QSt4kE/y908PhJf+JCUFSZHqFNSEQqxd4xeqF5KEUiKtSsOtSJg5dk8My + YES18TgO3pNDocuBgwjs5N+wEQETixOBaXaFDRW9jG+KwVsvJ2D+PIojN1QoIUFlcx6O3jz8546HinJE + 0Dor4G0jgVnB/wjzK5TOEaypfE69/jo686+H/8XYeCC+7IA+lIyTIlVd7uFpKvja9T3uHqfh9tNwJRkP + xQT45kMMB+/YRJym6anU/e0fknGRaKWq81C6oqNrudIYSFe2Mn8oSZD2G0Urk6pon1xa1N6dJjcUi0Qi + 0S/wFqClj/a46gAAAABJRU5ErkJggg== @@ -303,6 +303,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 17, 17 + 325, 17 @@ -354,24 +357,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= @@ -396,6 +399,21 @@ zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC + + + + + 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== \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index b6c176b..f0a62a4 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -623,7 +623,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; @@ -653,7 +653,6 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; @@ -682,7 +681,6 @@ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; numberCellType2.DecimalPlaces = 0; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 291f7aa..2db1bb6 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,33 +231,33 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigpL15TLXClrrcWoLLd0MjV1aUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6LYwl9o1Fd78jSYu+jCMyuMLofhkEl07+Qq3rayYkZCYw7+j3X - S532tsDg0UE/osUJVyP5WWd6BjEjocf9lcz756+A8V+GefYiKOQgGA5dmluzwDQcJvNsKIsnhGwJhoMX - fJKCKotCVcHsQlmXHOpuhcRPWceDYleGcDwNzdmplYIqS6lKSZdwzcNNaBttRvm5HSQoMDAWzBTYJ0Ow - TwThnA7i7ZcE9nZMkAJ1X6lKQW/ntPfqscdUjuJTBZC3bsGgNwSroHH27w1ef4qjotULFbOzsoyWc43O - OsjoQq6IzttmvL2IeGoZtkmWeO38lxSQLfgNbLxqrAeg7ClB9fV9OOo4jM30Bm4jvX6rsFGb7QNiyWU4 - pljcmc6IGnrCIpFafVnN1Uro3VocsdegmC7g8psyYYGWwXdY+vYTd32ZDR7M8ofknGGRLXWXErL2QhTp - 85B/fN1KWEB3Y4EUDPFBIUwKbvIPkc2LQAwao3fNO9Bee4koX+B6GiZet58vEAK52tTh/i1mJDQwzxFJ - /AAbS+NzJIUAmwS12+BBrmQN9+1iRsIx8/xYbac/Wds5h+rzPuw/s3ov/whF/QEbjSy5FJnJcwAAAABJ + SKESs3bThpqMigpL15TLXClrrcmoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq3p6iBMzEhh39Huu + lzrtbYHBo4N+VIsTrkbys870DGJGQo/7K5n3z18B478M8+xFUMhBMBy6NLdmgWkkTObZUBZPCNkSDAcv + +CQFVRaFqoLZhbIuOdTdComfsk4Exa4M4XgamrPTKwVVllKVki7hmkea0DbWjPJzO0hQYGA8mCmwT4Vg + nwzCORPE2y8J7O2YJAXqvlKVgt7Oae/WY4+pHMWnCiBv3YJBbwhWQRPs3xu8/hRHRasXKmZnZRkt5xqd + dZDRhVwRnbfNeHsR8dQybFMs8dr5LykgW/Ab2HjVWA9A2VOC6uv7cNRxGJvpDdxGev1WYaM22wfEkstw + TLMYmsmIGn7CIpFafVnN1Uro3VocsdegmC7g8psyYYGWwXdY+vYTd3yZDe7P8ofkfMwiW+ouJWTthSjS + 5yH/+LqVsIDuxgIpGOaDQpgU3OQfIpsXgRg0Ru+ad6C99hJRvsD1NEy8bj9fIARytanD/VvMSGhgniOS + +AE2lsbnSAoBNglqt8GDXMka7tnFjIRj5vnx2k5/srZzDtXnfdh/ZvVe/hGK+gMUnyy3R9QCzwAAAABJ RU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78O7NuwcvIhJFpjcOJiYmHjwZ - Eg8mGi9gosGEgwcmEXBoguGhJEgwCvIWlCFhM2RiYBsgDNnAMrbZjTHpBDra9bGu69f/RhU1MfHxTb/p - I//P9/co9d9aHilcCA+fUyO/eHX0VDDw4uiBYF/h/p/8pnC/w1G8z8Apyt1hUnQ9A0AnV9a7z2k5jqij - NLXmuqh8c2zuuhx2lYfpV8cvGDhF+YaKEromQ4nWQww1QGSeQAoPQE9zJCsJXROId3bf09tgWTZFD5p8 - Bk5R/q5jfEbdIXAzkoEm8EtV2JopRXz2GjhvDbjF2+AWbmHbU0FcTjpj4R88IRg4CegvUtPSBjhfM7bn - LWAnbkJip0lV3qievSe+d5Adz9NfIBt4toOTam7+jEIsAZqYAzWJhhJ7CJ+vF1anG+3jDLon12H3RJDd - m4GTgGZTStckaLwbac4GdXMAqY02yGv34V3swMgci9XPIj5tKpgO8hhb+IJhq0UzcPIXWk1KRuWhblmR - YjtzVeVIDaRQBfqcMSxHBcwwEpwhEVPE3piCnncMDJyiPA8KZF3lCPwUynoD5HAVgcsh+q/k2g7EFTiD - SUwGkhinBcxFFHRORPcCVuryY1LCl1hydGeSq+0Q/I8g0PUQPtaih8y8vC5iwr8LZ/1+TUHr6MpeAF2b - d4O2HOny3T0c91jy5R/9eqhOmw7wmCeQi5ExS6pbPwgwVzfptsrTl4yI36vRxhxstTPmfrKL3qkYHtvf - ZszVLbp3rA3uphL+eVleiXH0z/Wy8uxVV8tlLmRrxOidYtH4/Hd6VnaoZMx8RrLfO7+3i38TRX0FCkcj - 7mnIM8EAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFLTNNwHMd78O7NuwcvIhJFpjcOJiYmHjwZ + Eg8mGi9gosGEgwcmGB5qguGlCRKMgrwFZUjYDFkwsA0QhqxiGdvsxph0Ah3t+ljX9et/o4qamPj4pt/0 + kf/n+3uU+m8tjxYuhkfOaZFfvDp2Khh4cfRAsL9w/09+U7jf6SzeZ+IU5em0qIaRAWCQK+vd57QSR9RZ + mlpzX1S/OTZ/XQm7y8PMq+MXTJyi6OGihKErUKMNkEKNkNgnkMODMNI8yUrC0EXind339DY4jksxQxba + xCnK331MyGg7BG5BMtAM4UMVtmZLEZ+7Bt5XA37pNvjFW9j2VhCXk844+IdOiCZOAgaKtLS8AZ5uwfZC + PbjJm5C5GVJVMKtn74nvHWTH8w4UKCae7eCklps/oxLLgC7lQF1moMZaQdN9sLk86Jhg0TO1Doc3guze + TJwEtFhShi5DFzxI83Zom4NIbbRDWbsP31InRuc5rH6W8GlTxUxQwPjiF4zYanUTJ3+hzaJmNAHalg0p + ritXVYnUQA5VoN8Vw3JUxCwrwxWSME3si6nofcvCxCnK+6BAMTSewE+hrjdCCVcRuByS/0qu7UBchSuY + xFQgiQlGxHxERddkdC9g5W5+TE7QCZ+zJ5Nc7YDofwiRaYD4sRa9ZObldQmT/l0463drKtrGVvYCmNq8 + G0z9kW667nDcW5+v/OjXw3X6TEDAAoHcrII5Ut32XoS1utGwV56+ZEb8Xk129mCbg7UOkF30Tcfw2OHM + WKtbDd94OzzNJcLzsrwS8+if62Xl2avuR5f5kL0JY3eKJfPz3+lZ2aGScesZ2XHv/N4u/k0U9RX4eSPf + uXvpVgAAAABJRU5ErkJggg==