diff --git a/Project/_Common/fAddNewUser.cs b/Project/_Common/fAddNewUser.cs
index e089a9c..38e7832 100644
--- a/Project/_Common/fAddNewUser.cs
+++ b/Project/_Common/fAddNewUser.cs
@@ -9,217 +9,222 @@ using System.Windows.Forms;
namespace Project._Common
{
- public partial class fAddNewUser : Form // FCOMMON.fBase
- {
- string p_dept = string.Empty;
- string p_id = string.Empty;
+ public partial class fAddNewUser : Form // FCOMMON.fBase
+ {
+ string p_dept = string.Empty;
+ string p_id = string.Empty;
- public fAddNewUser(string dept, string id)
- {
- InitializeComponent();
- p_dept = dept;
- p_id = id;
+ public fAddNewUser(string dept, string id)
+ {
+ InitializeComponent();
+ p_dept = dept;
+ p_id = id;
- this.tbDept.Text = dept;
- this.StartPosition = FormStartPosition.CenterScreen;
- this.tbId.Text = id;
+ this.tbDept.Text = dept;
+ this.StartPosition = FormStartPosition.CenterScreen;
+ this.tbId.Text = id;
- //자료를 불러와서 먼저 불러온다
- if (id.isEmpty() == false)
- {
- tbId.Enabled = false;
- button1.Enabled = false;
- textBox1.Enabled = false;
+ //자료를 불러와서 먼저 불러온다
+ if (id.isEmpty() == false)
+ {
+ tbId.Enabled = false;
+ button1.Enabled = false;
+ textBox1.Enabled = false;
- var db = new EEEntitiesMain();
- var db_user = db.Users.Where(t => t.id == id).FirstOrDefault();
- var db_guser = db.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == id).FirstOrDefault();
- if (db_user != null)
- {
- tbNameK.Text = db_user.name;
- tbNameE.Text = db_user.nameE;
- tbDept.Text = db_user.dept;
- tbEmail.Text = db_user.email;
- tbTel.Text = db_user.tel;
- tbHp.Text = db_user.hp;
- tbDateIn.Text = db_user.indate;
- tbDateO.Text = db_user.outdate;
- tbGrade.Text = db_user.grade;
- tbMemo.Text = db_user.memo;
-
- }
- if (db_guser != null)
- {
- tbProcess.Text = db_guser.Process;
- tbState.Text = db_guser.state;
+ var db = new EEEntitiesMain();
+ var db_user = db.Users.Where(t => t.id == id).FirstOrDefault();
+ var db_guser = db.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == id).FirstOrDefault();
+ if (db_user != null)
+ {
+ tbNameK.Text = db_user.name;
+ tbNameE.Text = db_user.nameE;
+ tbDept.Text = db_user.dept;
+ tbEmail.Text = db_user.email;
+ tbTel.Text = db_user.tel;
+ tbHp.Text = db_user.hp;
+ tbDateIn.Text = db_user.indate;
+ tbDateO.Text = db_user.outdate;
+ tbGrade.Text = db_user.grade;
+ tbMemo.Text = db_user.memo;
- //this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
- this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
- this.chkUseState.Checked = (db_guser.useUserState == null ? false : (bool)db_guser.useUserState);
- this.chkExceptHoly.Checked = (db_guser.exceptHoly == null ? false : (bool)db_guser.exceptHoly);
- }
+ }
+ if (db_guser != null)
+ {
+ tbProcess.Text = db_guser.Process;
+ tbState.Text = db_guser.state;
- this.Text = "사용자 정보 변경";
- }
- else this.Text = "사용자 정보 추가";
+ //this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
+ this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
+ this.chkUseState.Checked = (db_guser.useUserState == null ? false : (bool)db_guser.useUserState);
+ this.chkExceptHoly.Checked = (db_guser.exceptHoly == null ? false : (bool)db_guser.exceptHoly);
+ }
- }
+ this.Text = "사용자 정보 변경";
+ }
+ else this.Text = "사용자 정보 추가";
+
+ }
- private void fUserInfo_Load(object sender, EventArgs e)
- {
+ private void fUserInfo_Load(object sender, EventArgs e)
+ {
+ int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account));
+ chkExceptHoly.Enabled = curLevel > 4;
+ chkJobReport.Enabled = curLevel > 4;
+ chkUseState.Enabled = curLevel > 4;
+ }
+ private void button1_Click(object sender, EventArgs e)
+ {
+ //입력한 id확인해서 잇으면 해당 자료를 표시해준다.
+ var id = this.tbId.Text.Trim();
+ if (id.isEmpty())
+ {
+ FCOMMON.Util.MsgE("id를 입력하세요");
+ this.tbId.SelectAll();
+ this.tbId.Focus();
+ return;
+ }
- }
- private void button1_Click(object sender, EventArgs e)
- {
- //입력한 id확인해서 잇으면 해당 자료를 표시해준다.
- var id = this.tbId.Text.Trim();
- if (id.isEmpty())
- {
- FCOMMON.Util.MsgE("id를 입력하세요");
- this.tbId.SelectAll();
- this.tbId.Focus();
- return;
- }
+ var db = new EEEntitiesMain();
+ var dr_user = db.Users.Where(t => t.id == id).FirstOrDefault();
+ if (dr_user == null)
+ {
+ FCOMMON.Util.MsgE("등록된 자료가 없습니다");
+ tbNameK.Focus();
+ }
+ else
+ {
+ tbNameK.Text = dr_user.name;
+ tbNameE.Text = dr_user.nameE;
+ if (tbDept.Text.isEmpty()) tbDept.Text = dr_user.dept;
+ tbEmail.Text = dr_user.email;
+ tbTel.Text = dr_user.tel;
+ tbHp.Text = dr_user.hp;
+ tbDateIn.Text = dr_user.indate;
+ tbDateO.Text = dr_user.outdate;
+ tbGrade.Text = dr_user.grade;
+ tbMemo.Text = dr_user.memo;
+ tbProcess.Text = string.Empty;
- var db = new EEEntitiesMain();
- var dr_user = db.Users.Where(t => t.id == id).FirstOrDefault();
- if (dr_user == null)
- {
- FCOMMON.Util.MsgE("등록된 자료가 없습니다");
- tbNameK.Focus();
- }
- else
- {
- tbNameK.Text = dr_user.name;
- tbNameE.Text = dr_user.nameE;
- if (tbDept.Text.isEmpty()) tbDept.Text = dr_user.dept;
- tbEmail.Text = dr_user.email;
- tbTel.Text = dr_user.tel;
- tbHp.Text = dr_user.hp;
- tbDateIn.Text = dr_user.indate;
- tbDateO.Text = dr_user.outdate;
- tbGrade.Text = dr_user.grade;
- tbMemo.Text = dr_user.memo;
- tbProcess.Text = string.Empty;
+ //부서가잇다면 해당 부서에서 해당 사용자의 공정을 찾는다
+ if (tbDept.Text.isEmpty() == false)
+ {
+ var drGrp = db.vGroupUser.Where(t => t.id == id).FirstOrDefault();
+ if (drGrp != null)
+ {
+ tbProcess.Text = drGrp.processs;
+ }
+ }
+ }
+ }
- //부서가잇다면 해당 부서에서 해당 사용자의 공정을 찾는다
- if (tbDept.Text.isEmpty() == false)
- {
- var drGrp = db.vGroupUser.Where(t => t.id == id).FirstOrDefault();
- if (drGrp != null)
- {
- tbProcess.Text = drGrp.processs;
- }
- }
- }
- }
+ private void button2_Click(object sender, EventArgs e)
+ {
+ this.Validate();
+ var db = new EEEntitiesMain();
- private void button2_Click(object sender, EventArgs e)
- {
- this.Validate();
- var db = new EEEntitiesMain();
+ //해당 그룹에 데이터를 추가한다.
+ //var drDept = db.UserGroup.Where(t => t.dept == tbDept.Text).FirstOrDefault();
+ //if (drDept == null)
+ //{
+ // FCOMMON.Util.MsgE("해당 부서정보가 존재하지 않습니다\n\n부서를 신규로 추가할 수는 없습니다\n관리자에 문의하세요");
+ // return;
+ //}
- //해당 그룹에 데이터를 추가한다.
- //var drDept = db.UserGroup.Where(t => t.dept == tbDept.Text).FirstOrDefault();
- //if (drDept == null)
- //{
- // FCOMMON.Util.MsgE("해당 부서정보가 존재하지 않습니다\n\n부서를 신규로 추가할 수는 없습니다\n관리자에 문의하세요");
- // return;
- //}
+ //해당 그룹에 해당 사용자가 존재하는지 확이한다.
+ var gcode = FCOMMON.info.Login.gcode;
+ var uid = (p_id.isEmpty() ? tbId.Text.Trim() : p_id);
+ var drGuser = db.EETGW_GroupUser.Where(t => t.gcode == gcode && t.uid == uid).FirstOrDefault();
+ if (drGuser != null)
+ {
+ drGuser.Process = this.tbProcess.Text.Trim();
+ drGuser.state = this.tbState.Text.Trim();
+ drGuser.useJobReport = chkJobReport.Checked;
+ drGuser.useUserState = chkUseState.Checked;
+ drGuser.exceptHoly = chkExceptHoly.Checked;
+ }
+ else
+ {
+ //불러온경우
+ if (tbId.Enabled == false)
+ {
+ FCOMMON.Util.MsgE("사용자 ID정보가 없어 진행할 수 없습니다");
+ return;
+ }
- //해당 그룹에 해당 사용자가 존재하는지 확이한다.
- var gcode = FCOMMON.info.Login.gcode;
- var uid = (p_id.isEmpty() ? tbId.Text.Trim() : p_id);
- var drGuser = db.EETGW_GroupUser.Where(t => t.gcode == gcode && t.uid == uid).FirstOrDefault();
- if (drGuser != null)
- {
- drGuser.Process = this.tbProcess.Text.Trim();
- drGuser.state = this.tbState.Text.Trim();
- drGuser.useJobReport = chkJobReport.Checked;
- drGuser.useUserState = chkUseState.Checked;
- drGuser.exceptHoly = chkExceptHoly.Checked;
- }
- else
- {
- //불러온경우
- if (tbId.Enabled == false)
- {
- FCOMMON.Util.MsgE("사용자 ID정보가 없어 진행할 수 없습니다");
- return;
- }
-
- drGuser = new EETGW_GroupUser();
- drGuser.wuid = FCOMMON.info.Login.no;
- drGuser.wdate = DateTime.Now;
- drGuser.gcode = gcode;
- drGuser.level = 1;
- drGuser.uid = this.tbId.Text.Trim();
- drGuser.state = this.tbState.Text.Trim();
- drGuser.Process = this.tbProcess.Text.Trim();
- //drGuser.useJobReport = this.chkJobReport.Checked;
- drGuser.useJobReport = this.chkJobReport.Checked;
- drGuser.useUserState = this.chkUseState.Checked;
- drGuser.exceptHoly = this.chkExceptHoly.Checked;
- db.EETGW_GroupUser.Add(drGuser);
- }
+ drGuser = new EETGW_GroupUser();
+ drGuser.wuid = FCOMMON.info.Login.no;
+ drGuser.wdate = DateTime.Now;
+ drGuser.gcode = gcode;
+ drGuser.level = 1;
+ drGuser.uid = this.tbId.Text.Trim();
+ drGuser.state = this.tbState.Text.Trim();
+ drGuser.Process = this.tbProcess.Text.Trim();
+ //drGuser.useJobReport = this.chkJobReport.Checked;
+ drGuser.useJobReport = this.chkJobReport.Checked;
+ drGuser.useUserState = this.chkUseState.Checked;
+ drGuser.exceptHoly = this.chkExceptHoly.Checked;
+ db.EETGW_GroupUser.Add(drGuser);
+ }
- //사용자 목록에 없다면 추가한다
- var drUser = db.Users.SingleOrDefault(t => t.id == uid);
- if (drUser == null)
- {
- drUser = new Users();
- drUser.wuid = FCOMMON.info.Login.no;
- drUser.wdate = DateTime.Now;
- drUser.gcode = gcode;
- drUser.level = 1;
- drUser.id = tbId.Text.Trim();
- drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0
+ //사용자 목록에 없다면 추가한다
+ var drUser = db.Users.SingleOrDefault(t => t.id == uid);
+ if (drUser == null)
+ {
+ drUser = new Users();
+ drUser.wuid = FCOMMON.info.Login.no;
+ drUser.wdate = DateTime.Now;
+ drUser.gcode = gcode;
+ drUser.level = 1;
+ drUser.id = tbId.Text.Trim();
+ drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0
- drUser.name = tbNameK.Text.Trim();
- drUser.nameE = tbNameE.Text.Trim();
- drUser.dept = this.tbDept.Text.Trim();
- drUser.email = tbEmail.Text;
- drUser.tel = tbTel.Text;
- drUser.hp = tbHp.Text;
- drUser.indate = tbDateIn.Text;
- drUser.outdate = tbDateO.Text;
- drUser.memo = tbMemo.Text;
- drUser.processs = tbProcess.Text;
- db.Users.Add(drUser);
- }
+ drUser.name = tbNameK.Text.Trim();
+ drUser.nameE = tbNameE.Text.Trim();
+ drUser.dept = this.tbDept.Text.Trim();
+ drUser.email = tbEmail.Text;
+ drUser.tel = tbTel.Text;
+ drUser.hp = tbHp.Text;
+ drUser.indate = tbDateIn.Text;
+ drUser.outdate = tbDateO.Text;
+ drUser.memo = tbMemo.Text;
+ drUser.processs = tbProcess.Text;
+ drUser.grade = tbGrade.Text.Trim();
+ db.Users.Add(drUser);
+ }
- else
- {
- if (drUser.password.isEmpty()) drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
- drUser.name = tbNameK.Text.Trim();
- drUser.nameE = tbNameE.Text.Trim();
- drUser.dept = this.tbDept.Text.Trim();
- drUser.email = tbEmail.Text;
- drUser.tel = tbTel.Text;
- drUser.hp = tbHp.Text;
- drUser.indate = tbDateIn.Text;
- drUser.outdate = tbDateO.Text;
- drUser.memo = tbMemo.Text;
- drUser.processs = tbProcess.Text;
+ else
+ {
+ if (drUser.password.isEmpty()) drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
+ drUser.name = tbNameK.Text.Trim();
+ drUser.nameE = tbNameE.Text.Trim();
+ drUser.dept = this.tbDept.Text.Trim();
+ drUser.email = tbEmail.Text;
+ drUser.tel = tbTel.Text;
+ drUser.hp = tbHp.Text;
+ drUser.indate = tbDateIn.Text;
+ drUser.outdate = tbDateO.Text;
+ drUser.memo = tbMemo.Text;
+ drUser.processs = tbProcess.Text;
+ drUser.grade = tbGrade.Text.Trim();
- }
+ }
- db.SaveChanges();
- this.DialogResult = DialogResult.OK;
+ db.SaveChanges();
+ this.DialogResult = DialogResult.OK;
- }
+ }
- private void chkUserSt_CheckedChanged(object sender, EventArgs e)
- {
+ private void chkUserSt_CheckedChanged(object sender, EventArgs e)
+ {
- }
+ }
- private void chkJobReport_CheckedChanged(object sender, EventArgs e)
- {
- }
- }
+ private void chkJobReport_CheckedChanged(object sender, EventArgs e)
+ {
+ }
+ }
}
diff --git a/Project/_Common/fUserList.Designer.cs b/Project/_Common/fUserList.Designer.cs
index 2f355bd..0afe487 100644
--- a/Project/_Common/fUserList.Designer.cs
+++ b/Project/_Common/fUserList.Designer.cs
@@ -30,21 +30,6 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserList));
- 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();
@@ -78,17 +63,30 @@
this.tbProcess = new System.Windows.Forms.ToolStripTextBox();
this.btRef = new System.Windows.Forms.ToolStripButton();
this.textBox1 = new System.Windows.Forms.TextBox();
- this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
- this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.ta = new Project.dsMSSQLTableAdapters.vGroupUserTableAdapter();
+ this.arDatagridView1 = new arCtl.arDatagridView();
+ this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.nameE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.gradeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.emailDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.indateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.outdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.hpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.processsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.stateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.useUserStateDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.useJobReportDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.exceptHolyDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.cm1.SuspendLayout();
this.toolStrip1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -170,7 +168,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
- this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -349,7 +346,6 @@
// tbProcess
//
this.tbProcess.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(100, 25);
this.tbProcess.Text = "%";
@@ -373,163 +369,159 @@
this.textBox1.Size = new System.Drawing.Size(1234, 21);
this.textBox1.TabIndex = 3;
//
- // fpSpread1
- //
- this.fpSpread1.AccessibleDescription = "";
- this.fpSpread1.AutoClipboard = false;
- this.fpSpread1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.fpSpread1.EditModeReplace = true;
- this.fpSpread1.EnableCrossSheetReference = false;
- this.fpSpread1.FocusRenderer = defaultFocusIndicatorRenderer1;
- this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton");
- this.fpSpread1.HorizontalScrollBar.Name = "";
- 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(1234, 626);
- 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 = defaultScrollBarRenderer2;
- this.fpSpread1.VisualStyles = FarPoint.Win.VisualStyles.Off;
- //
- // 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 = 12;
- this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
- this.fpSpread1_Sheet1.ActiveRowIndex = -1;
- this.fpSpread1_Sheet1.AlternatingRows.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.fpSpread1_Sheet1.AutoGenerateColumns = false;
- this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.Parent = "HeaderDefault";
- this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.Parent = "RowHeaderDefault";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "업무일지";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "ID";
- 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.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- 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 = checkBoxCellType1;
- this.fpSpread1_Sheet1.Columns.Get(0).DataField = "useJobReport";
- this.fpSpread1_Sheet1.Columns.Get(0).Label = "업무일지";
- this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
- 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = "비고";
- this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(11).Width = 151F;
- this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
- this.fpSpread1_Sheet1.DataSource = this.bs;
- this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBar.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBar.DefaultStyle.Parent = "FilterBarDefault";
- this.fpSpread1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "RowHeaderDefault";
- this.fpSpread1_Sheet1.Protect = false;
- this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
- this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.RowHeader.DefaultStyle.Parent = "RowHeaderDefault";
- this.fpSpread1_Sheet1.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row;
- this.fpSpread1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.SheetCornerStyle.Parent = "RowHeaderDefault";
- this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
- //
// ta
//
this.ta.ClearBeforeFill = true;
//
+ // arDatagridView1
+ //
+ this.arDatagridView1.A_DelCurrentCell = true;
+ this.arDatagridView1.A_EnterToTab = true;
+ this.arDatagridView1.A_KoreanField = null;
+ this.arDatagridView1.A_UpperField = null;
+ this.arDatagridView1.A_ViewRownumOnHeader = true;
+ this.arDatagridView1.AllowUserToAddRows = false;
+ this.arDatagridView1.AllowUserToDeleteRows = false;
+ this.arDatagridView1.AutoGenerateColumns = false;
+ this.arDatagridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.idDataGridViewTextBoxColumn,
+ this.nameDataGridViewTextBoxColumn,
+ this.nameE,
+ this.gradeDataGridViewTextBoxColumn,
+ this.emailDataGridViewTextBoxColumn,
+ this.telDataGridViewTextBoxColumn,
+ this.indateDataGridViewTextBoxColumn,
+ this.outdateDataGridViewTextBoxColumn,
+ this.hpDataGridViewTextBoxColumn,
+ this.processsDataGridViewTextBoxColumn,
+ this.stateDataGridViewTextBoxColumn,
+ this.memoDataGridViewTextBoxColumn,
+ this.useUserStateDataGridViewCheckBoxColumn,
+ this.useJobReportDataGridViewCheckBoxColumn,
+ this.exceptHolyDataGridViewCheckBoxColumn});
+ this.arDatagridView1.DataSource = this.bs;
+ this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.arDatagridView1.Location = new System.Drawing.Point(0, 25);
+ this.arDatagridView1.Name = "arDatagridView1";
+ this.arDatagridView1.ReadOnly = true;
+ this.arDatagridView1.RowTemplate.Height = 23;
+ this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+ this.arDatagridView1.Size = new System.Drawing.Size(1234, 626);
+ this.arDatagridView1.TabIndex = 6;
+ //
+ // idDataGridViewTextBoxColumn
+ //
+ this.idDataGridViewTextBoxColumn.DataPropertyName = "id";
+ this.idDataGridViewTextBoxColumn.HeaderText = "사번";
+ this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
+ this.idDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // nameDataGridViewTextBoxColumn
+ //
+ this.nameDataGridViewTextBoxColumn.DataPropertyName = "name";
+ this.nameDataGridViewTextBoxColumn.HeaderText = "성명";
+ this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
+ this.nameDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // nameE
+ //
+ this.nameE.DataPropertyName = "nameE";
+ this.nameE.HeaderText = "영문명";
+ this.nameE.Name = "nameE";
+ this.nameE.ReadOnly = true;
+ //
+ // gradeDataGridViewTextBoxColumn
+ //
+ this.gradeDataGridViewTextBoxColumn.DataPropertyName = "grade";
+ this.gradeDataGridViewTextBoxColumn.HeaderText = "직책";
+ this.gradeDataGridViewTextBoxColumn.Name = "gradeDataGridViewTextBoxColumn";
+ this.gradeDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // emailDataGridViewTextBoxColumn
+ //
+ this.emailDataGridViewTextBoxColumn.DataPropertyName = "email";
+ this.emailDataGridViewTextBoxColumn.HeaderText = "이메일";
+ this.emailDataGridViewTextBoxColumn.Name = "emailDataGridViewTextBoxColumn";
+ this.emailDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // telDataGridViewTextBoxColumn
+ //
+ this.telDataGridViewTextBoxColumn.DataPropertyName = "tel";
+ this.telDataGridViewTextBoxColumn.HeaderText = "전화";
+ this.telDataGridViewTextBoxColumn.Name = "telDataGridViewTextBoxColumn";
+ this.telDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // indateDataGridViewTextBoxColumn
+ //
+ this.indateDataGridViewTextBoxColumn.DataPropertyName = "indate";
+ this.indateDataGridViewTextBoxColumn.HeaderText = "입사";
+ this.indateDataGridViewTextBoxColumn.Name = "indateDataGridViewTextBoxColumn";
+ this.indateDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // outdateDataGridViewTextBoxColumn
+ //
+ this.outdateDataGridViewTextBoxColumn.DataPropertyName = "outdate";
+ this.outdateDataGridViewTextBoxColumn.HeaderText = "퇴사";
+ this.outdateDataGridViewTextBoxColumn.Name = "outdateDataGridViewTextBoxColumn";
+ this.outdateDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // hpDataGridViewTextBoxColumn
+ //
+ this.hpDataGridViewTextBoxColumn.DataPropertyName = "hp";
+ this.hpDataGridViewTextBoxColumn.HeaderText = "휴대전환";
+ this.hpDataGridViewTextBoxColumn.Name = "hpDataGridViewTextBoxColumn";
+ this.hpDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // processsDataGridViewTextBoxColumn
+ //
+ this.processsDataGridViewTextBoxColumn.DataPropertyName = "processs";
+ this.processsDataGridViewTextBoxColumn.HeaderText = "공정";
+ this.processsDataGridViewTextBoxColumn.Name = "processsDataGridViewTextBoxColumn";
+ this.processsDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // stateDataGridViewTextBoxColumn
+ //
+ this.stateDataGridViewTextBoxColumn.DataPropertyName = "state";
+ this.stateDataGridViewTextBoxColumn.HeaderText = "상태";
+ this.stateDataGridViewTextBoxColumn.Name = "stateDataGridViewTextBoxColumn";
+ this.stateDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // memoDataGridViewTextBoxColumn
+ //
+ this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo";
+ this.memoDataGridViewTextBoxColumn.HeaderText = "비고";
+ this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn";
+ this.memoDataGridViewTextBoxColumn.ReadOnly = true;
+ //
+ // useUserStateDataGridViewCheckBoxColumn
+ //
+ this.useUserStateDataGridViewCheckBoxColumn.DataPropertyName = "useUserState";
+ this.useUserStateDataGridViewCheckBoxColumn.HeaderText = "게정사용";
+ this.useUserStateDataGridViewCheckBoxColumn.Name = "useUserStateDataGridViewCheckBoxColumn";
+ this.useUserStateDataGridViewCheckBoxColumn.ReadOnly = true;
+ //
+ // useJobReportDataGridViewCheckBoxColumn
+ //
+ this.useJobReportDataGridViewCheckBoxColumn.DataPropertyName = "useJobReport";
+ this.useJobReportDataGridViewCheckBoxColumn.HeaderText = "업무일지";
+ this.useJobReportDataGridViewCheckBoxColumn.Name = "useJobReportDataGridViewCheckBoxColumn";
+ this.useJobReportDataGridViewCheckBoxColumn.ReadOnly = true;
+ //
+ // exceptHolyDataGridViewCheckBoxColumn
+ //
+ this.exceptHolyDataGridViewCheckBoxColumn.DataPropertyName = "exceptHoly";
+ this.exceptHolyDataGridViewCheckBoxColumn.HeaderText = "휴가제외";
+ this.exceptHolyDataGridViewCheckBoxColumn.Name = "exceptHolyDataGridViewCheckBoxColumn";
+ this.exceptHolyDataGridViewCheckBoxColumn.ReadOnly = true;
+ //
// fUserList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1234, 711);
- this.Controls.Add(this.fpSpread1);
+ this.Controls.Add(this.arDatagridView1);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
@@ -544,8 +536,7 @@
this.cm1.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -583,11 +574,25 @@
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripTextBox tbProcess;
- private FarPoint.Win.Spread.FpSpread fpSpread1;
private dsMSSQLTableAdapters.vGroupUserTableAdapter ta;
private System.Windows.Forms.ToolStripButton btEdit;
private System.Windows.Forms.ToolStripButton btSave;
private System.Windows.Forms.ToolStripButton btDel;
- private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
- }
+ private arCtl.arDatagridView arDatagridView1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn idDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn nameE;
+ private System.Windows.Forms.DataGridViewTextBoxColumn gradeDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn emailDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn telDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn indateDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn outdateDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn hpDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn processsDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn stateDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn useUserStateDataGridViewCheckBoxColumn;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn useJobReportDataGridViewCheckBoxColumn;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn exceptHolyDataGridViewCheckBoxColumn;
+ }
}
\ No newline at end of file
diff --git a/Project/_Common/fUserList.cs b/Project/_Common/fUserList.cs
index 15e6546..02741e2 100644
--- a/Project/_Common/fUserList.cs
+++ b/Project/_Common/fUserList.cs
@@ -61,7 +61,7 @@ namespace Project._Common
this.cmbdept.Text = FCOMMON.info.Login.dept;
btRef.PerformClick();
- fpSpread1.EditMode = false;
+ //fpSpread1.EditMode = false;
//화면좌표문제 복구 - 211221
if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
@@ -174,6 +174,7 @@ namespace Project._Common
this.ta.Fill(this.dsMSSQL.vGroupUser, FCOMMON.info.Login.gcode, tbProcess.Text.Trim());
this.dsMSSQL.Users.AcceptChanges();
this.bs.Sort = "useuserstate desc,usejobreport desc";
+ arDatagridView1.AutoResizeColumns();
}
private void autoResizeColumnToolStripMenuItem_Click(object sender, EventArgs e)
{
diff --git a/Project/_Common/fUserList.resx b/Project/_Common/fUserList.resx
index ead202d..3878163 100644
--- a/Project/_Common/fUserList.resx
+++ b/Project/_Common/fUserList.resx
@@ -257,10 +257,10 @@
BRhVTtsAAAAASUVORK5CYII=
-
- 495, 17
-
433, 17
+
+ True
+
\ No newline at end of file
diff --git a/Project/fMain.cs b/Project/fMain.cs
index 2e2e599..df147e7 100644
--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -517,7 +517,8 @@ namespace Project
private void userAccountToolStripMenuItem_Click(object sender, EventArgs e)
{
- var f = new _Common.fUserInfo();
+ var f = new _Common.fAddNewUser(FCOMMON.info.Login.dept, FCOMMON.info.Login.no);//.fUserInfo();
+
f.ShowDialog();
}