diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 84fa3d0..0757c57 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.08.23.0930")] -[assembly: AssemblyFileVersion("21.08.23.0930")] +[assembly: AssemblyVersion("21.09.07.1000")] +[assembly: AssemblyFileVersion("21.09.07.1000")] diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index cf99fba..f99c36b 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -30,18 +30,19 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType4 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - 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.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + 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 numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -66,6 +67,7 @@ this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.dsMSSQL = new FBS0000.dsMSSQL(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); this.tbSD = new System.Windows.Forms.ToolStripTextBox(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.tbED = new System.Windows.Forms.ToolStripTextBox(); @@ -76,10 +78,6 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); - this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); this.cmO = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); @@ -88,15 +86,18 @@ this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.현재사원원장보기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.lbStt = new System.Windows.Forms.ToolStripLabel(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); + this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.cmO.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -173,6 +174,7 @@ // 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"; @@ -326,9 +328,19 @@ this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // + // lbStt + // + this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbStt.ForeColor = System.Drawing.Color.Blue; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(31, 28); + this.lbStt.Text = "기간"; + this.lbStt.Click += new System.EventHandler(this.lbStt_Click); + // // tbSD // this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbSD.Name = "tbSD"; this.tbSD.Size = new System.Drawing.Size(100, 31); this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -343,6 +355,7 @@ // tbED // this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbED.Name = "tbED"; this.tbED.Size = new System.Drawing.Size(100, 31); this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -411,166 +424,7 @@ this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown); this.fpSpread1.SetViewportLeftColumn(0, 0, 1); - this.fpSpread1.SetActiveViewport(0, -1, -1); - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "WorkTable"; - // 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 = 14; - 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 = "요일"; - 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 = "사용(H)"; - 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 = "발생(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "잔량(일)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "잔량(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "전일(일)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - dateTimeCellType4.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType4.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType4.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType4.TimeDefault = new System.DateTime(2020, 9, 8, 12, 47, 57, 76); - this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType4; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "sdate"; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "일자"; - this.fpSpread1_Sheet1.Columns.Get(0).Tag = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 71F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(1).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "요일"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "uid"; - 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).Tag = "empno"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - textCellType18.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "성명"; - this.fpSpread1_Sheet1.Columns.Get(3).Tag = "name"; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType19.MaximumValue = 999999999999999D; - numberCellType19.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType19; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "term"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "사용(일)"; - this.fpSpread1_Sheet1.Columns.Get(4).Tag = "dr"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType20.MaximumValue = 999999999999999D; - numberCellType20.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType20; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "CrTime"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(H)"; - this.fpSpread1_Sheet1.Columns.Get(5).Tag = "drh"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "contents"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "내용"; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "tag"; - 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 = 40F; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType21.MaximumValue = 999999999999999D; - numberCellType21.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType21; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "termDr"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "발생(일)"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "cr"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType22.MaximumValue = 999999999999999D; - numberCellType22.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType22; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "DrTime"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(H)"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "crh"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType23.DecimalPlaces = 1; - numberCellType23.MaximumValue = 999999999999999D; - numberCellType23.MinimumValue = -999999999999999D; - numberCellType23.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType23; - this.fpSpread1_Sheet1.Columns.Get(10).Formula = "RC[2]+RC[-2]-RC[-6]"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "잔량(일)"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "jand"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType23; - this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(H)"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "janh"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType24.DecimalPlaces = 1; - numberCellType24.MaximumValue = 999999999999999D; - numberCellType24.MinimumValue = -999999999999999D; - numberCellType24.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType24; - this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Gray; - 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).Tag = "yjand"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType24; - this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(H)"; - this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjanh"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.FrozenColumnCount = 1; - this.fpSpread1_Sheet1.LockBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ShowEditingRowSelector = true; - this.fpSpread1_Sheet1.ShowRowSelector = true; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // - // bs - // - this.bs.DataMember = "Holyday"; - this.bs.DataSource = this.dsMSSQL; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // taUser - // - this.taUser.ClearBeforeFill = true; + this.fpSpread1.SetActiveViewport(0, 0, -1); // // cmO // @@ -637,14 +491,170 @@ this.현재사원원장보기ToolStripMenuItem.Text = "현재 사원 원장 보기"; this.현재사원원장보기ToolStripMenuItem.Click += new System.EventHandler(this.현재사원원장보기ToolStripMenuItem_Click); // - // lbStt + // bs // - this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbStt.ForeColor = System.Drawing.Color.Blue; - this.lbStt.Name = "lbStt"; - this.lbStt.Size = new System.Drawing.Size(31, 28); - this.lbStt.Text = "기간"; - this.lbStt.Click += new System.EventHandler(this.lbStt_Click); + this.bs.DataMember = "Holyday"; + this.bs.DataSource = this.dsMSSQL; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // taUser + // + this.taUser.ClearBeforeFill = true; + // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "WorkTable"; + // 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 = 15; + 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 = "일자"; + 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 = "사용(H)"; + 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 = "발생(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "잔량(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "잔량(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate"; + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분"; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType2.TimeDefault = new System.DateTime(2021, 9, 7, 9, 38, 59, 393); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate"; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "일자"; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; + 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).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "사번"; + this.fpSpread1_Sheet1.Columns.Get(3).Tag = "empno"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + textCellType10.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명"; + this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name"; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(일)"; + this.fpSpread1_Sheet1.Columns.Get(5).Tag = "dr"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)"; + this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents"; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용"; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + 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 = 40F; + this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + numberCellType9.MaximumValue = 999999999999999D; + numberCellType9.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr"; + 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).Tag = "cr"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + numberCellType10.MaximumValue = 999999999999999D; + numberCellType10.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType11.DecimalPlaces = 1; + numberCellType11.MaximumValue = 999999999999999D; + numberCellType11.MinimumValue = -999999999999999D; + numberCellType11.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType11; + this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + numberCellType12.DecimalPlaces = 1; + numberCellType12.MaximumValue = 999999999999999D; + numberCellType12.MinimumValue = -999999999999999D; + numberCellType12.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType12; + this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)"; + this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType12; + this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)"; + this.fpSpread1_Sheet1.Columns.Get(14).Tag = "yjanh"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.FrozenColumnCount = 1; + this.fpSpread1_Sheet1.LockBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ShowEditingRowSelector = true; + this.fpSpread1_Sheet1.ShowRowSelector = true; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // // fHolyday // @@ -665,9 +675,9 @@ this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.cmO.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -712,7 +722,6 @@ private System.Windows.Forms.ToolStripComboBox cmbGrp; private System.Windows.Forms.ToolStripButton toolStripButton6; private dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter taUser; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ContextMenuStrip cmO; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; @@ -722,5 +731,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem 현재사원원장보기ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel lbStt; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 98a3655..1150a06 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -41,7 +41,7 @@ namespace FBS0000 im.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap); im2.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap); - tbSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01"; + tbSD.Text = DateTime.Now.ToString("yyyy-01") + "-01"; tbED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString(); //현재 사용자의 그룹명을 가져옴 @@ -134,6 +134,8 @@ namespace FBS0000 seluid = GetUIDValue(); var sd = DateTime.Parse(tbSD.Text + " 00:00:00"); var ed = DateTime.Parse(tbED.Text + " 23:59:59"); + sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00")); + this.tbSD.Text = sd.ToShortDateString(); try { @@ -183,7 +185,7 @@ namespace FBS0000 var fistdate = dr.sdate.ToString("yyyy-01-01"); //이 사용자의 이전까지의 잔량을 가져온다 - var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(),dr.idx.ToString("000000")); + var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000")); var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000")); var jand = yjand + dr.termDr - dr.term; var janh = yjanh + dr.DrTime - dr.CrTime; @@ -193,6 +195,30 @@ namespace FBS0000 //this.fpSpread1.ActiveSheet.Cells[i, col_janh].Value = janh; } + var sb = new System.Text.StringBuilder(); + + var grplist = dsMSSQL.Holyday.GroupBy(t => t.cate).ToList(); + foreach (var grp in grplist) + { + //일년치합산을 넣는다 + var totalJanH = grp.Sum(t => t.DrTime) - grp.Sum(t => t.CrTime); + var totalJanD = grp.Sum(t => t.termDr) - grp.Sum(t => t.term); + if (sb.Length > 0) sb.Append(" "); + sb.Append($"[{grp.Key}] {totalJanD}:{totalJanH}"); + } + var tUseH = dsMSSQL.Holyday.Sum(t => t.CrTime); + var tUseD = dsMSSQL.Holyday.Sum(t => t.term); + + var tGenH = dsMSSQL.Holyday.Sum(t => t.DrTime); + var tGenD = dsMSSQL.Holyday.Sum(t => t.termDr); + + this.sbUse.Text = $"{tUseD}:{tUseH}"; + this.sbGen.Text = $"{tGenD}:{tGenH}"; + this.sbJan.Text = sb.ToString(); + + sbUse.ForeColor = Color.Blue; + sbGen.ForeColor = Color.Black; + sbJan.ForeColor = Color.DarkMagenta; } private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) { @@ -233,7 +259,7 @@ namespace FBS0000 var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index; var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index; - var drUser= this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault(); + var drUser = this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault(); var username = drUser == null ? string.Empty : drUser.name; fpSpread1.ActiveSheet.Cells[rowindex, col_name].Value = username; @@ -243,7 +269,7 @@ namespace FBS0000 var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToShortDateString(), "999999"); - + //var jand = yjand + dr.termDr - dr.term; //var janh = yjanh + dr.DrTime - dr.CrTime; this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjand].Value = yjand; @@ -487,14 +513,14 @@ namespace FBS0000 } } - + private void 현재사원원장보기ToolStripMenuItem_Click(object sender, EventArgs e) { var drv = this.bs.Current as DataRowView; var dr = drv.Row as dsMSSQL.HolydayRow; this.tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01"; this.tbED.Text = DateTime.Now.Year.ToString("0000") + "-12-31"; - var username = string.Format("[{0}] {1}",dr.uid,dr.UserName); + var username = string.Format("[{0}] {1}", dr.uid, dr.UserName); this.cmbUser.Text = username; RefreshData(); } diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index fd80762..0f03913 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -197,23 +197,6 @@ - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqqsoU2cXEUQU3QUFoSjR - BwURfYhz0lXUxCyjkV0EdRFIVM4h5pIsTZlT9xFzO7YP/DjRPrClR7elWzqXwnZOO9scT+85y2PDXfjC - j8N74P+8v/Occ3YIi6bpirHncow2VcJccxDk1vFtsl8YPuxwONgJlx20i4LxRjnW19e3hRiiUql26nS6 - m6an9XCo62G8Xo5kMpkHx3FgWVYiHo8jk8nkAvINbDBclW0J2AjZIJFIIJ1O5xsYntTD3qaA4YoMPM+L - POgOoUkbwj1CY1cQjZ1BNBAECylAMnDmDIYvy5BKpUSEYa0tii7CW2sUnaNR3OkIiAGCVZ7BcIsCX17V - YehSmZgu8P+pSjJ4V8PgdjsjdhAOh7MFDQYvlIkFCQE8nwTlCaHPOYNOawjv7WGM0AtY+72M1dVVlgQc - 3TRQ1WHspRyD50v/DfPossxiiF7G7C8OgRiP8bk4jN9WYJqYRywWK9CB0wbd2RIxQOjgozOC6cUEJoJ/ - 4Jzn4CB4Izx6xoJwu90oKio6IRnoH8pBtdZioKpEKrHDEgQT5eGcY2FnWFj8CdA/ebyjFrG0tLTVYIoY - 9FcekErsIc88HeZAzeSGBaYWeKhHfmz9EvX3a2F9UYP+M5sBNncE40wcX8mQK5jEJDld706gTTuIBdpQ - 2KDvdDGy2az4JlbWOLi+R9FLuvjgiEBjDuC1dgReowaTagUaq/c1iwZKpbK4u+oQBq4dQ++pYjAMA7/f - D5/PB4/HIxbm9XrFK/XpDcbbb2He1IqBlookscitmtJdJx8d2fO4VrZbTraFfl2Jhuq9zZ9VF3nzs3P4 - C1QYyCost3OuAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7GF3XVVdRS51dRBBRdBcUhKJE @@ -228,6 +211,23 @@ N+g5LUUulxPexPIqC8/3OLpJFx9cMbQPzuG13oKArR3jGgUaqvc1CQYqlUraWXUIhmvH0H1KCpqmEQqF EAwG4ff7hcICgYBwdXx6g7G2W5gdaIGhuSJNLPKrpnTXyUdH9jyule2Wk22xX1ekvnpv02f1RW7w2Tn8 BU0oyCcGs6xoAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi + Dwoi+hCno6uoiVlGI7sI6iKQqJxDbEuyNMem7ivmNtsHfpxoH9jSo25Nl86lsJ3Tzpzj6T1neWy4C1/4 + cXgP/J/3d55zzg5+URRVOfJchuHmKlhrD4LcOr5N9vPDh91uNzPmdYHyOmG+UYH19fVtIYQolcqder3+ + puWpHG6VHObrFUin0wWwLAuGYUSSySSy2Ww+oNDAAdNV6ZaAjZANUqkU1tbWCg1MT+RwtTfAdEUKjuME + HnRH0KyN4B6hSRNGU1cYjQTeQgwQDTx5g6HLUmQyGQF+WOuIQ0N4a4+jaziOO51zQgBvVWAw1NqAL6/q + MXipXEjn+f9UBRm8q6Zxu4MWOohGo7miBoYL5UJBfADHpeH0R9DnmUKXPYL3rgUYqShWfy9hZWWFIQFH + Nw2U9Rh5KYPhfNm/YQ4a2zQGqSVM/2Ixl+AwOpOE+dsyLGOzSCQSRTrwOKA/WyoE8B189MQwOZ/CWPgP + PLMs3IRAjEPPSBg+nw8lJSUnRIOBhzI42+qgqy4VS+y0hUHHOXhmGLhoBrZQCtRPDu+c81hcXNxqMEEM + +qsOiCX2kGeeXGDhnMoP80xEOaiMP7Z+iQP362B/UYv+M5sBDl8Mo3QSX8mQN5zGODl9wJdCu9aAKGUq + btB3WoJcLie8ieVVFt7vcfSSLj64Y1Bb5/Baa0TArMa4qgFNNftaBAOFQiHprj4E3bVj6D0lAU3TCIVC + CAaD8Pv9QmGBQEC4Oj+9wWjHLcxa2qBrrUwTi/yqLdt18tGRPY/rpLtlZFvs1xVprNnb8ll5kbM+O4e/ + RjjIJC1kw30AAAAASUVORK5CYII= @@ -255,9 +255,9 @@ 659, 17 - 507, 17 + 737, 17 - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 @@ -270,12 +270,6 @@ 294, 17 - - 358, 17 - - - 420, 17 - R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ @@ -315,4 +309,10 @@ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== + + 358, 17 + + + 420, 17 + \ No newline at end of file diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs index 47fb6e8..a21f616 100644 --- a/SubProject/FBS0000/dsMSSQL.Designer.cs +++ b/SubProject/FBS0000/dsMSSQL.Designer.cs @@ -1704,8 +1704,8 @@ namespace FBS0000 { this.columnidx.AllowDBNull = false; this.columnidx.ReadOnly = true; this.columnidx.Unique = true; - this.columncate.MaxLength = 2; - this.columnresult.MaxLength = 2; + this.columncate.MaxLength = 20; + this.columnresult.MaxLength = 20; this.columntitle.MaxLength = 255; this.columncontents.MaxLength = 2147483647; this.columnuid.MaxLength = 20; @@ -6095,8 +6095,8 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM VALUES (@cate,@result,@sdate,@edate,@term,@title,@contents,@uid,@tolist,@mail,@mailsend,@reason,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag); SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6140,8 +6140,8 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail "wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, ta" + "g FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6161,9 +6161,9 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_result", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_result", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd index d346f0b..e302335 100644 --- a/SubProject/FBS0000/dsMSSQL.xsd +++ b/SubProject/FBS0000/dsMSSQL.xsd @@ -240,14 +240,14 @@ WHERE (idx = @Original_idx) - + INSERT INTO Holyday (cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, tag) VALUES (@cate,@result,@sdate,@edate,@term,@title,@contents,@uid,@tolist,@mail,@mailsend,@reason,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag); SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid - - + + @@ -283,7 +283,7 @@ ORDER BY sdate, edate, uid - + UPDATE Holyday SET cate = @cate, result = @result, sdate = @sdate, edate = @edate, term = @term, title = @title, contents = @contents, uid = @uid, tolist = @tolist, mail = @mail, mailsend = @mailsend, reason = @reason, wuid = @wuid, wdate = @wdate, termDr = @termDr, gcode = @gcode, DrTime = @DrTime, CrTime = @CrTime, tag = @tag @@ -303,8 +303,8 @@ WHERE (idx = @Original_idx) AND (@IsNull_cate = 1 AND cate IS NULL OR tag = @Original_tag); SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid - - + + @@ -324,9 +324,9 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail - + - + @@ -659,7 +659,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -719,7 +719,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -771,21 +771,21 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + - + - + @@ -864,7 +864,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -909,7 +909,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -922,7 +922,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - +