diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 77659ee..bed2735 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.14.1700")]
-[assembly: AssemblyFileVersion("21.09.14.1700")]
+[assembly: AssemblyVersion("21.09.24.1000")]
+[assembly: AssemblyFileVersion("21.09.24.1000")]
diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
index 205e1fb..7e95ed4 100644
--- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
@@ -93,6 +93,7 @@
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
this.dtSD = new System.Windows.Forms.ToolStripTextBox();
@@ -110,15 +111,14 @@
this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
- this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.cm.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
- this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
+ this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// bn
@@ -544,6 +544,150 @@
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 2;
//
+ // fpSpread1_Sheet1
+ //
+ this.fpSpread1_Sheet1.Reset();
+ this.fpSpread1_Sheet1.SheetName = "Sheet1";
+ // Formulas and custom names must be loaded with R1C1 reference style
+ this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+ this.fpSpread1_Sheet1.ColumnCount = 17;
+ this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+ this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+ this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2;
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위";
+ 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).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).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).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).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).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).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).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).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).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).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;
+ 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;
+ 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;
+ 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).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;
+ 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;
+ 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).DataField = "tag";
+ this.fpSpread1_Sheet1.Columns.Get(16).Label = "#";
+ this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.DataAutoCellTypes = false;
+ this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+ this.fpSpread1_Sheet1.DataSource = this.bs;
+ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+ this.fpSpread1_Sheet1.ShowRowSelector = true;
+ this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+ //
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -699,150 +843,7 @@
this.richTextBox1.Size = new System.Drawing.Size(1364, 60);
this.richTextBox1.TabIndex = 5;
this.richTextBox1.Text = "";
- //
- // fpSpread1_Sheet1
- //
- this.fpSpread1_Sheet1.Reset();
- this.fpSpread1_Sheet1.SheetName = "Sheet1";
- // Formulas and custom names must be loaded with R1C1 reference style
- this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
- this.fpSpread1_Sheet1.ColumnCount = 17;
- this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
- this.fpSpread1_Sheet1.ActiveRowIndex = -1;
- this.fpSpread1_Sheet1.AutoGenerateColumns = false;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위";
- 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).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).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).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).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).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).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).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).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).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).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;
- 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;
- 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;
- 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).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, 7, 28, 22, 53, 4, 0);
- this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1;
- 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, 7, 28, 22, 53, 4, 0);
- this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2;
- 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).DataField = "tag";
- this.fpSpread1_Sheet1.Columns.Get(16).Label = "#";
- this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.DataAutoCellTypes = false;
- this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
- this.fpSpread1_Sheet1.DataSource = this.bs;
- this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
- this.fpSpread1_Sheet1.ShowRowSelector = true;
- this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+ this.richTextBox1.Visible = false;
//
// fJobReport
//
@@ -864,9 +865,9 @@
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
this.cm.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs
index 9a5c749..536d4c1 100644
--- a/SubProject/FPJ0000/JobReport_/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs
@@ -464,23 +464,26 @@ namespace FPJ0000
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.JobReportRow;
+
+ bool ReadMod = false;
if (dr.uid != FCOMMON.info.Login.no && FCOMMON.info.Login.level < 5)
{
- FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
- return;
+ ReadMod = true;
+ //FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
+ //return;
}
- var f = new JobReport_.fJobReport_Add(dr);
+ var f = new JobReport_.fJobReport_Add(dr,false,ReadMod);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
- if (dr.RowState != DataRowState.Unchanged)
+ if (dr.RowState != DataRowState.Unchanged && ReadMod == false)
{
int cnt = this.ta.Update(dr);
dr.AcceptChanges();
FormattingData();
}
}
- else dr.RejectChanges();
+ else if (ReadMod == false) dr.RejectChanges();
}
private void exportListToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx
index 3643dbe..baef7cb 100644
--- a/SubProject/FPJ0000/JobReport_/fJobReport.resx
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx
@@ -260,20 +260,20 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZJZTxNRGIZ7pT/BoBdekhgFtUaNXijIUsAE
- NwSiKEspBGQTajARIQUjshiQAIkaAtF4oQZUoCwFpJRCG4oRQQRkLUugtCxdZqAz5fXMtFpNSPySJ+fi
- zPtkvndGwI3/A2X0xWKNIrREsxaQp6HISfOUcqeWDi3up4OfqEfOSlXlh8Le7uFDf0/Qo16VwUwb9ctG
- 1mTdgsnixmjmoPFjyYycT3pElozZRCnyva6oc0IK1YYlwxrbP2uHdo6BVs9AM8tAPbMN5c8ttI5ascUA
- TWMUcj7MIe7ZCPWPJCC3ndq0bWNwnsWXeYacDAZ4yTZ6JrfQPmojAgcGl1hoF+0okOvhe7/rDR+OKPWZ
- vp4XtiOpuoq4ymuobKtDfn0pfHO94EMQFZyBv+wkyprK+FUsNIOVdRv87/YwvCC82Pd913AzmideolKT
- xUtuVwQj63UUUusiIa6+hNjqWDQNraB5xILGb5vYID0FyHppXiAqF+0NzE1jNePdeDUsQ5EyhZdEV4WQ
- 8GUkPk+AatLKr9I5QUFBeli32hGQ3+cUcBNU2ENn1MRAN6lGtfYeHndkIqL0AqIrwqCbtUFHiuUKVk05
- OzERgb/sL8G5h7n2U9kHEVUuwuBUPwq6kyCTZyDyqR/qlB/xdYGBjhTbP2NHH8FgtsM3zyU4LvWQCKUH
- kFp7AzergnCjLJCXZMijIK1PIG/iB+5+UM9igPvEBDMpUpiudgqE0n0LQul+8pAHhFkeuFLkh+QXMVCN
- KlCgyEbSuxiIq8KhIwIt+Tc0REDbHfBOU7pXOJ/eSy9t0BhaYHl6xheRXpOIeBKUVEcis/bOnzsO2zZL
- BI1uwVFimze5Bf/DSlbwTmhwC05nfLYNz6zs7PbwbhjXNx1HbjdZXHFSZGLH9NymzTw8u+qYXqUwbaAw
- 6WLVYufhmrfQLJaNGw6KojY8b7V8d8UFghOJbcne4taOYxKFyVvSQP8h3onXb8QNtKe4Zf1wbEunV4w8
- TiAQCH4BkPChBKRJ4EwAAAAASUVORK5CYII=
+ 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
@@ -361,7 +361,7 @@
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
- AAD/////AQgAAP////8AAQgAAAs=
+ AAD///////////////8A/////ws=
@@ -371,7 +371,7 @@
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
- AAD/////AQgAAP////8AAQgAAAs=
+ AAD///////////////8A/////ws=
diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
index 822b596..eebdbaf 100644
--- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
@@ -14,10 +14,12 @@ namespace FPJ0000.JobReport_
dsPRJ.JobReportRow dr;
Boolean copyMOde = false;
Boolean bInit = false;
- public fJobReport_Add(dsPRJ.JobReportRow dr_, Boolean copy = false)
+ bool ReadMode = false;
+ public fJobReport_Add(dsPRJ.JobReportRow dr_, Boolean copy = false, Boolean read = false)
{
InitializeComponent();
dr = dr_;
+ ReadMode = read;
this.KeyPreview = true;
this.StartPosition = FormStartPosition.CenterScreen;
this.KeyDown += (s1, e1) =>
@@ -197,7 +199,12 @@ namespace FPJ0000.JobReport_
//ed.DisplayEditForm(this.panel1);
//ed.AllowRtf = true;
-
+ if(ReadMode)
+ {
+ panel1.Enabled = false;
+ this.Text += "(읽기전용)";
+
+ }
bInit = true;