diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index b0fffc1..b7c14ba 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.12.31.1020")] -[assembly: AssemblyFileVersion("21.12.31.1020")] +[assembly: AssemblyVersion("22.01.03.1700")] +[assembly: AssemblyFileVersion("22.01.03.1700")] diff --git a/Project/_Common/fUserList.Designer.cs b/Project/_Common/fUserList.Designer.cs index 7c780eb..c68443b 100644 --- a/Project/_Common/fUserList.Designer.cs +++ b/Project/_Common/fUserList.Designer.cs @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserList)); - FarPoint.Win.Spread.DefaultFocusIndicatorRenderer defaultFocusIndicatorRenderer2 = new FarPoint.Win.Spread.DefaultFocusIndicatorRenderer(); - FarPoint.Win.Spread.DefaultScrollBarRenderer defaultScrollBarRenderer3 = new FarPoint.Win.Spread.DefaultScrollBarRenderer(); - FarPoint.Win.Spread.DefaultScrollBarRenderer defaultScrollBarRenderer4 = new FarPoint.Win.Spread.DefaultScrollBarRenderer(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.DefaultFocusIndicatorRenderer defaultFocusIndicatorRenderer1 = new FarPoint.Win.Spread.DefaultFocusIndicatorRenderer(); + FarPoint.Win.Spread.DefaultScrollBarRenderer defaultScrollBarRenderer1 = new FarPoint.Win.Spread.DefaultScrollBarRenderer(); + FarPoint.Win.Spread.DefaultScrollBarRenderer defaultScrollBarRenderer2 = new FarPoint.Win.Spread.DefaultScrollBarRenderer(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + 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.TextCellType textCellType11 = 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 Project.dsMSSQL(); @@ -59,6 +59,7 @@ this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btAdd = new System.Windows.Forms.ToolStripButton(); this.btEdit = new System.Windows.Forms.ToolStripButton(); + this.btDel = new System.Windows.Forms.ToolStripButton(); this.btSave = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.btDevel = new System.Windows.Forms.ToolStripDropDownButton(); @@ -80,7 +81,6 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.ta = new Project.dsMSSQLTableAdapters.vGroupUserTableAdapter(); - this.btDel = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -98,6 +98,7 @@ this.bn.CountItem = this.bindingNavigatorCountItem; this.bn.DeleteItem = null; this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.ImageScalingSize = new System.Drawing.Size(32, 32); this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, @@ -114,14 +115,14 @@ this.btSave, this.toolStripSeparator1, this.btDevel}); - this.bn.Location = new System.Drawing.Point(0, 788); + this.bn.Location = new System.Drawing.Point(0, 774); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1357, 25); + this.bn.Size = new System.Drawing.Size(1357, 39); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -138,7 +139,7 @@ // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 36); this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // @@ -148,7 +149,7 @@ this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(36, 36); this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; // // bindingNavigatorMovePreviousItem @@ -157,13 +158,13 @@ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(36, 36); this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 39); // // bindingNavigatorPositionItem // @@ -178,7 +179,7 @@ // bindingNavigatorSeparator1 // this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 39); // // bindingNavigatorMoveNextItem // @@ -186,7 +187,7 @@ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(36, 36); this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; // // bindingNavigatorMoveLastItem @@ -195,20 +196,20 @@ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(36, 36); this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; // // bindingNavigatorSeparator2 // this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 39); // // btAdd // this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image"))); this.btAdd.Name = "btAdd"; this.btAdd.RightToLeftAutoMirrorImage = true; - this.btAdd.Size = new System.Drawing.Size(67, 22); + this.btAdd.Size = new System.Drawing.Size(83, 36); this.btAdd.Text = "추가(&A)"; this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // @@ -217,16 +218,25 @@ this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image"))); this.btEdit.ImageTransparentColor = System.Drawing.Color.Magenta; this.btEdit.Name = "btEdit"; - this.btEdit.Size = new System.Drawing.Size(65, 22); + this.btEdit.Size = new System.Drawing.Size(81, 36); this.btEdit.Text = "편집(&E)"; this.btEdit.Click += new System.EventHandler(this.toolStripButton2_Click); // + // btDel + // + this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image"))); + this.btDel.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btDel.Name = "btDel"; + this.btDel.Size = new System.Drawing.Size(84, 36); + this.btDel.Text = "삭제(&D)"; + this.btDel.Click += new System.EventHandler(this.btDel_Click); + // // btSave // this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta; this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(66, 22); + this.btSave.Size = new System.Drawing.Size(82, 36); this.btSave.Text = "저장(&S)"; this.btSave.Visible = false; this.btSave.Click += new System.EventHandler(this.toolStripButton1_Click); @@ -234,7 +244,7 @@ // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39); // // btDevel // @@ -244,7 +254,7 @@ this.btDevel.Image = ((System.Drawing.Image)(resources.GetObject("btDevel.Image"))); this.btDevel.ImageTransparentColor = System.Drawing.Color.Magenta; this.btDevel.Name = "btDevel"; - this.btDevel.Size = new System.Drawing.Size(88, 22); + this.btDevel.Size = new System.Drawing.Size(104, 36); this.btDevel.Text = "developer"; // // 한글이름분리ToolStripMenuItem @@ -358,7 +368,7 @@ // this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true)); this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.textBox1.Location = new System.Drawing.Point(0, 767); + this.textBox1.Location = new System.Drawing.Point(0, 753); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(1357, 21); this.textBox1.TabIndex = 3; @@ -371,21 +381,21 @@ this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; this.fpSpread1.EnableCrossSheetReference = false; - this.fpSpread1.FocusRenderer = defaultFocusIndicatorRenderer2; + this.fpSpread1.FocusRenderer = defaultFocusIndicatorRenderer1; this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.HorizontalScrollBar.Name = ""; - this.fpSpread1.HorizontalScrollBar.Renderer = defaultScrollBarRenderer3; + this.fpSpread1.HorizontalScrollBar.Renderer = defaultScrollBarRenderer1; this.fpSpread1.Location = new System.Drawing.Point(0, 25); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.SelectionBlockOptions = ((FarPoint.Win.Spread.SelectionBlockOptions)((FarPoint.Win.Spread.SelectionBlockOptions.Rows | FarPoint.Win.Spread.SelectionBlockOptions.Sheet))); this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1357, 742); + this.fpSpread1.Size = new System.Drawing.Size(1357, 728); this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Classic; this.fpSpread1.TabIndex = 5; this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.VerticalScrollBar.Name = ""; - this.fpSpread1.VerticalScrollBar.Renderer = defaultScrollBarRenderer4; + this.fpSpread1.VerticalScrollBar.Renderer = defaultScrollBarRenderer2; this.fpSpread1.VisualStyles = FarPoint.Win.VisualStyles.Off; // // fpSpread1_Sheet1 @@ -421,71 +431,71 @@ this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "HeaderDefault"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 33F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "useUserState"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "인원\r\n포함"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "id"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "ID"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 95F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "state"; 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(2).Width = 56F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "processs"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "name"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 105F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "nameE"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 91F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "grade"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "직책"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 115F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "email"; 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 = 151F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "hp"; 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 = 111F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "입사일"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 79F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "outdate"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 65F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고"; @@ -514,15 +524,6 @@ // this.ta.ClearBeforeFill = true; // - // btDel - // - this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image"))); - this.btDel.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btDel.Name = "btDel"; - this.btDel.Size = new System.Drawing.Size(68, 22); - this.btDel.Text = "삭제(&D)"; - this.btDel.Click += new System.EventHandler(this.btDel_Click); - // // fUserList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/Project/_Common/fUserList.cs b/Project/_Common/fUserList.cs index 26cefbe..15e6546 100644 --- a/Project/_Common/fUserList.cs +++ b/Project/_Common/fUserList.cs @@ -45,7 +45,7 @@ namespace Project._Common //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account)); - btAdd.Enabled = curLevel > 5; + btAdd.Enabled = curLevel >= 5; //부서목록 업데이트 var db = new EEEntitiesMain(); @@ -239,7 +239,6 @@ namespace Project._Common void Func_Edit() { - //추가 var drv = this.bs.Current as DataRowView; if (drv == null) return; @@ -258,7 +257,6 @@ namespace Project._Common } - var f = new fAddNewUser(this.cmbdept.Text.Trim(), dr.id); if (f.ShowDialog() == DialogResult.OK) { @@ -276,13 +274,10 @@ namespace Project._Common int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account)); if (curLevel < 5) { - FCOMMON.Util.MsgE("계정 관리자만 사용할 수 있습니다"); return; - } - //추가 var drv = this.bs.Current as DataRowView; if (drv == null) return; diff --git a/Project/_Common/fUserList.resx b/Project/_Common/fUserList.resx index 9812c75..ead202d 100644 --- a/Project/_Common/fUserList.resx +++ b/Project/_Common/fUserList.resx @@ -239,9 +239,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 252, 17 diff --git a/Project/fMain.cs b/Project/fMain.cs index d01c632..b68378d 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -722,9 +722,10 @@ namespace Project private void 권한설정ToolStripMenuItem_Click(object sender, EventArgs e) { - if (FCOMMON.info.Login.level < 5) + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account)); + if (curLevel < 5) { - FCOMMON.Util.MsgE("관리자 이상 사용가능한 메뉴 입니다."); + FCOMMON.Util.MsgE("(관리자/계정담당자) 전용 메뉴 입니다"); return; }