From 3df038909e96501fdf3cff422672302ada8c33b3 Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 2 Jan 2023 09:22:15 +0900 Subject: [PATCH] =?UTF-8?q?=ED=83=80=20=EB=B6=80=EC=84=9C=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EA=B0=80=EB=8A=A5=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/AdoNetEFMain.Designer.cs | 2 +- Project/AdoNetEFMain.edmx | 87 +- Project/Dialog/fLogin.cs | 684 ++++++------ Project/EETGW.csproj | 2 +- Project/EETGW_GroupUser.cs | 1 + Project/JobReport.cs | 9 + Project/Projects.cs | 7 + Project/ProjectsPart.cs | 3 + Project/Properties/AssemblyInfo.cs | 4 +- Project/UserGroup.cs | 3 + Project/_Common/fAddNewUser.Designer.cs | 825 +++++++-------- Project/_Common/fAddNewUser.cs | 4 + Project/_Common/fUserInfo.Designer.cs | 12 +- Project/_Common/fUserInfo.cs | 4 +- Project/_Common/fUserInfo.resx | 6 + Project/_Common/fUserList.Designer.cs | 984 +++++++++--------- Project/dsMSSQL.Designer.cs | 62 +- Project/dsMSSQL.cs | 6 +- Project/dsMSSQL.xsd | 42 +- Project/dsMSSQL.xss | 2 +- Project/vGroupUser.cs | 2 + SubProject/FBS0000/dsReport.Designer.cs | 3 +- SubProject/FBS0000/dsReport.cs | 6 +- SubProject/FBS0000/dsReport.xsd | 9 +- .../OtConfirm/fHolyRequestAdd.Designer.cs | 5 - .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 39 +- .../FPJ0000/Project/fPartBuyStatus.resx | 28 +- 27 files changed, 1501 insertions(+), 1340 deletions(-) diff --git a/Project/AdoNetEFMain.Designer.cs b/Project/AdoNetEFMain.Designer.cs index fa76703..0db299c 100644 --- a/Project/AdoNetEFMain.Designer.cs +++ b/Project/AdoNetEFMain.Designer.cs @@ -1,4 +1,4 @@ -// 모델 'D:\Source\##### 완료아이템\(014) GroupWare\Source\Project\AdoNetEFMain.edmx'에 대해 T4 코드 생성이 사용됩니다. +// 모델 'D:\Source\##### 완료아이템\(0014) GroupWare\Source\Project\AdoNetEFMain.edmx'에 대해 T4 코드 생성이 사용됩니다. // 레거시 코드 생성을 사용하려면 '코드 생성 전략' 디자이너 속성의 값을 // 'Legacy ObjectContext'로 변경하십시오. 이 속성은 모델이 디자이너에서 열릴 때 // 속성 창에서 사용할 수 있습니다. diff --git a/Project/AdoNetEFMain.edmx b/Project/AdoNetEFMain.edmx index 152347f..da5747d 100644 --- a/Project/AdoNetEFMain.edmx +++ b/Project/AdoNetEFMain.edmx @@ -17,6 +17,7 @@ + @@ -90,12 +91,21 @@ + + + + + + + + + @@ -128,6 +138,9 @@ + + + @@ -141,9 +154,12 @@ + + + @@ -153,6 +169,7 @@ + @@ -231,6 +248,9 @@ + + + @@ -251,6 +271,7 @@ + @@ -280,6 +301,9 @@ + + + @@ -335,6 +359,7 @@ + @@ -352,11 +377,13 @@ - + + + @@ -410,7 +437,9 @@ [vGroupUser].[id] AS [id], [vGroupUser].[state] AS [state], [vGroupUser].[useJobReport] AS [useJobReport], - [vGroupUser].[useUserState] AS [useUserState] + [vGroupUser].[useUserState] AS [useUserState], + [vGroupUser].[password] AS [password], + [vGroupUser].[exceptHoly] AS [exceptHoly] FROM [dbo].[vGroupUser] AS [vGroupUser] @@ -427,6 +456,9 @@ + + + @@ -497,6 +529,7 @@ + @@ -518,11 +551,13 @@ - + + + @@ -577,6 +612,15 @@ + + + + + + + + + @@ -655,6 +699,13 @@ + + + + + + + @@ -733,6 +784,9 @@ + + + @@ -772,6 +826,7 @@ + @@ -793,6 +848,9 @@ + + + @@ -844,6 +902,7 @@ + @@ -860,6 +919,8 @@ + + @@ -916,6 +977,15 @@ + + + + + + + + + @@ -961,6 +1031,13 @@ + + + + + + + @@ -1063,6 +1140,9 @@ + + + @@ -1101,6 +1181,7 @@ + diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 8684e8c..45b67f9 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -11,393 +11,401 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fLogin : Form - { - public fLogin() - { - InitializeComponent(); - this.tbID.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) tbPW.Focus(); }; - this.tbPW.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) btLogin.PerformClick(); }; - this.KeyPreview = true; - this.KeyDown += (s1, e1) => - { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - this.Text = string.Format("사용자 확인(v{0})", Application.ProductVersion); - } - private void fLogin_Load(object sender, EventArgs e) - { - var list = Pub.setting.lastid.Split(';'); - foreach (var item in list) - if (item != "") tbID.Items.Add(item); - if (tbID.Items.Count > 0) tbID.SelectedIndex = 0; + public partial class fLogin : Form + { + public fLogin() + { + InitializeComponent(); + this.tbID.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) tbPW.Focus(); }; + this.tbPW.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) btLogin.PerformClick(); }; + this.KeyPreview = true; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + this.Text = string.Format("사용자 확인(v{0})", Application.ProductVersion); + } + private void fLogin_Load(object sender, EventArgs e) + { + var list = Pub.setting.lastid.Split(';'); + foreach (var item in list) + if (item != "") tbID.Items.Add(item); + if (tbID.Items.Count > 0) tbID.SelectedIndex = 0; - //S1 사용자 그룹목록 확인 - //var tas1 = new S1ACCESS300Entities(); - //var deptlist = tas1.VIEW_CARD_PERSON - // .Where(t => t.CardStatusID == 0 && string.IsNullOrEmpty(t.CardUser2) == false) - // .GroupBy(t => t.PersonUser2) - // .OrderBy(t => t.Key) - // .ToList(); + //S1 사용자 그룹목록 확인 + //var tas1 = new S1ACCESS300Entities(); + //var deptlist = tas1.VIEW_CARD_PERSON + // .Where(t => t.CardStatusID == 0 && string.IsNullOrEmpty(t.CardUser2) == false) + // .GroupBy(t => t.PersonUser2) + // .OrderBy(t => t.Key) + // .ToList(); - //this.cmbDept.Items.Clear(); - //foreach (var dept in deptlist) - // cmbDept.Items.Add(dept); + //this.cmbDept.Items.Clear(); + //foreach (var dept in deptlist) + // cmbDept.Items.Add(dept); - //그룹목록가져오기 - var tagrp = new dsMSSQLTableAdapters.UserGroupTableAdapter(); - var grplist = tagrp.GetData(); - this.cmbDept.DataSource = grplist; - this.cmbDept.DisplayMember = "dept"; - this.cmbDept.ValueMember = "gcode"; + //그룹목록가져오기 + var tagrp = new dsMSSQLTableAdapters.UserGroupTableAdapter(); + var grplist = tagrp.GetData(); + this.cmbDept.DataSource = grplist; + this.cmbDept.DisplayMember = "dept"; + this.cmbDept.ValueMember = "gcode"; - //마지막으로사용한 부서이름 - if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1; - else this.cmbDept.Text = Pub.setting.lastdpt; - //foreach (var item in dlist) - // if (item != "") this.cmbDept.Items.Add(item); - //if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0; + //마지막으로사용한 부서이름 + if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1; + else this.cmbDept.Text = Pub.setting.lastdpt; + //foreach (var item in dlist) + // if (item != "") this.cmbDept.Items.Add(item); + //if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0; - this.Show(); - Application.DoEvents(); + this.Show(); + Application.DoEvents(); - if (this.tbID.Text.isEmpty() == false) tbPW.Focus(); - else tbID.Focus(); - } - private void button1_Click(object sender, EventArgs e) - { + if (this.tbID.Text.isEmpty() == false) tbPW.Focus(); + else tbID.Focus(); + } + private void button1_Click(object sender, EventArgs e) + { - if (this.tbID.Text.isEmpty()) - { - tbID.Focus(); - return; - } - if (this.tbPW.Text.isEmpty()) - { - tbPW.Focus(); - return; - } - if (cmbDept.SelectedIndex < 0) - { - FCOMMON.Util.MsgE("소속 부서를 선택하세요"); - cmbDept.Focus(); - return; - } + if (this.tbID.Text.isEmpty()) + { + tbID.Focus(); + return; + } + if (this.tbPW.Text.isEmpty()) + { + tbPW.Focus(); + return; + } + if (cmbDept.SelectedIndex < 0) + { + FCOMMON.Util.MsgE("소속 부서를 선택하세요"); + cmbDept.Focus(); + return; + } - List idlist = new List(); - idlist.Add(tbID.Text.Trim()); - foreach (var item in this.tbID.Items) - if (idlist.Contains(item) == false) idlist.Add(item.ToString()); + List idlist = new List(); + idlist.Add(tbID.Text.Trim()); + foreach (var item in this.tbID.Items) + if (idlist.Contains(item) == false) idlist.Add(item.ToString()); - //List deptlist = new List(); - //deptlist.Add(cmbDept.Text.Trim()); - //foreach (var item in this.cmbDept.Items) - // if (deptlist.Contains(item) == false) deptlist.Add(item.ToString()); + //List deptlist = new List(); + //deptlist.Add(cmbDept.Text.Trim()); + //foreach (var item in this.cmbDept.Items) + // if (deptlist.Contains(item) == false) deptlist.Add(item.ToString()); - //180605 - var vuserlist = ""; - foreach (var item in idlist) - vuserlist += ";" + item; + //180605 + var vuserlist = ""; + foreach (var item in idlist) + vuserlist += ";" + item; - //var vdeptlist = ""; - //foreach(var item in deptlist) - // vdeptlist += ";" + item; + //var vdeptlist = ""; + //foreach(var item in deptlist) + // vdeptlist += ";" + item; - var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow; + var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow; - Pub.setting.lastid = vuserlist;// tbID.Text.Trim(); - Pub.setting.lastdpt = cmbDept.Text; //부서저장 201006 - Pub.setting.Save(); + Pub.setting.lastid = vuserlist;// tbID.Text.Trim(); + Pub.setting.lastdpt = cmbDept.Text; //부서저장 201006 + Pub.setting.Save(); - var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); - var id = tbID.Text.Trim(); - //var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter(); - try - { - var userGcode=FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{id}','{encpass}')"); - //var userGcode = ta.GetUserLoginCheck(id, encpass).ToString(); - if (String.IsNullOrEmpty(userGcode)) - { - Util.MsgE("입력한 사용자 계정이 존재하지 않습니다\n관리자에 문의 하세요"); - tbPW.SelectAll(); - tbPW.Focus(); - return; - } - else if (userGcode.StartsWith("@ERR")) - { - Util.MsgE("접속실패\n\n" + userGcode.Substring(3)); - return; - } + var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); + var id = tbID.Text.Trim(); + //var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter(); + try + { + var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')"); + //var userGcode = ta.GetUserLoginCheck(id, encpass).ToString(); + if (String.IsNullOrEmpty(userGcode)) + { + Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요"); + tbPW.SelectAll(); + tbPW.Focus(); + return; + } + else if (userGcode.StartsWith("@ERR")) + { + Util.MsgE("접속실패\n\n" + userGcode.Substring(3)); + return; + } - //이사용자의 부서 코드확인 - var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter(); - var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow; + //이사용자의 부서 코드확인 + var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter(); + var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow; - //var userdr = users.Rows[0] as dsMSSQL.UsersRow; - //var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter(); - //var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0; - //if (userdr.level < 9 && Exist == false) - //{ - // Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); - // return; - //} + //var deptname = cmbDept.Text.Trim(); + //var seldeptcode = cmbDept.SelectedValue.ToString(); + //if (deptname.Equals(userdr.dept) == false) + //{ + // Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); + // return; + //} - //if (userdr.outdate.isEmpty() == false) - //{ - // if (DateTime.TryParse(userdr.outdate, out DateTime dtout)) - // { - // if (DateTime.Now > dtout) - // { - // Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다"); - // return; - // } - // } - // else - // { - // Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다"); - // return; - // } - //} + //var userdr = users.Rows[0] as dsMSSQL.UsersRow; + //var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter(); + //var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0; + //if (userdr.level < 9 && Exist == false) + //{ + // Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); + // return; + //} + + //if (userdr.outdate.isEmpty() == false) + //{ + // if (DateTime.TryParse(userdr.outdate, out DateTime dtout)) + // { + // if (DateTime.Now > dtout) + // { + // Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다"); + // return; + // } + // } + // else + // { + // Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다"); + // return; + // } + //} - var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); - if (MaxVerstion.isEmpty() == false) - { - var curversion = Application.ProductVersion; - var verchk = curversion.CompareTo(MaxVerstion); - if (verchk < 0) - { - //내버젼이 낮다 - Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다"); - } - } + var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); + if (MaxVerstion.isEmpty() == false) + { + var curversion = Application.ProductVersion; + var verchk = curversion.CompareTo(MaxVerstion); + if (verchk < 0) + { + //내버젼이 낮다 + Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다"); + } + } - FCOMMON.info.Login.no = userdr.id; - FCOMMON.info.Login.nameK = userdr.name; - FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; - FCOMMON.info.Login.level = userdr.level; - FCOMMON.info.Login.email = userdr.email; - FCOMMON.info.Login.nameE = userdr.nameE; - FCOMMON.info.Login.hp = userdr.hp; - FCOMMON.info.Login.tel = userdr.tel; - FCOMMON.info.Login.title = userdr.ads_title; - FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; - //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); - var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); - FCOMMON.info.Login.gcode = gCode;// gcode; - FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자": userdr.processs; - FCOMMON.info.Login.permission = 0; - FCOMMON.info.Login.gpermission = int.Parse(gperm); - FCOMMON.info.datapath = Pub.setting.SharedDataPath; - FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 + FCOMMON.info.Login.no = userdr.id; + FCOMMON.info.Login.nameK = userdr.name; + FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; + FCOMMON.info.Login.level = userdr.level; + FCOMMON.info.Login.email = userdr.email; + FCOMMON.info.Login.nameE = userdr.nameE; + FCOMMON.info.Login.hp = userdr.hp; + FCOMMON.info.Login.tel = userdr.tel; + FCOMMON.info.Login.title = userdr.ads_title; + FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; + //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); + FCOMMON.info.Login.gcode = gCode;// gcode; + FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자" : userdr.processs; + FCOMMON.info.Login.permission = 0; + FCOMMON.info.Login.gpermission = int.Parse(gperm); + FCOMMON.info.datapath = Pub.setting.SharedDataPath; + FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 - if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524 - FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$"; + if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524 + FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$"; - //using (var dbEnity = new EEEntitiesMain()) - //{ - // var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault(); - // if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : ""); - // else FCOMMON.info.Login.process = drGrpUser.Process; - //} + //using (var dbEnity = new EEEntitiesMain()) + //{ + // var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault(); + // if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : ""); + // else FCOMMON.info.Login.process = drGrpUser.Process; + //} - //로그인정보 기록 - AddLoginInfo(); + //로그인정보 기록 + AddLoginInfo(); - //210221 - MakeAutoJobReportbyLogin(); + //210221 + MakeAutoJobReportbyLogin(); - //210613 - MakeAutoJobReportByAuto(); + //210613 + MakeAutoJobReportByAuto(); - DialogResult = DialogResult.OK; - } - catch (Exception ex) - { - Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요"); - DialogResult = System.Windows.Forms.DialogResult.Cancel; - } - } + DialogResult = DialogResult.OK; + } + catch (Exception ex) + { + Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요"); + DialogResult = System.Windows.Forms.DialogResult.Cancel; + } + } - /// - /// 무조건 업무일지를 자동으로 작성하는 경우 - /// - void MakeAutoJobReportByAuto() - { - //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다. + /// + /// 무조건 업무일지를 자동으로 작성하는 경우 + /// + void MakeAutoJobReportByAuto() + { + //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다. - var dbi = new EEEntitiesMain(); - var db = new EEEntitiesMain(); - var nd = DateTime.Now.ToShortDateString(); + var dbi = new EEEntitiesMain(); + var db = new EEEntitiesMain(); + var nd = DateTime.Now.ToShortDateString(); - //이 날짜가 휴일인지 체크한다. - var Holyinfo = db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault(); - if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) return; + //이 날짜가 휴일인지 체크한다. + var Holyinfo = db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault(); + if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) return; - //토,일은 처리하지 않음 - if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return; + //토,일은 처리하지 않음 + if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return; - var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); - foreach (var dr in rows) - { - //퇴사자 확인 - var userdata = db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault(); - if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; + var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); + foreach (var dr in rows) + { + //퇴사자 확인 + var userdata = db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault(); + if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; - //오늘자 자동생성된 데이터가 있다면 처리하지 않는다 - if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any()) continue; + //오늘자 자동생성된 데이터가 있다면 처리하지 않는다 + if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any()) continue; - //이데이터를 그대로 생성해준다. - var newdr = new JobReport(); - newdr.gcode = FCOMMON.info.Login.gcode; - newdr.wuid = dr.uid;// FCOMMON.info.Login.no; - newdr.wdate = DateTime.Now; - newdr.pdate = nd; - newdr.import = false; - newdr.hrs = dr.hrs; - newdr.type = dr.type;//210305 누락분 추가 - newdr.ot = dr.ot; - newdr.process = dr.process; - newdr.projectName = dr.projectName; - newdr.pidx = dr.pidx; - newdr.package = dr.package; - newdr.autoinput = true; - newdr.description = dr.description; - newdr.description2 = dr.description2; - newdr.remark = dr.remark; - newdr.requestpart = dr.requestpart; - newdr.status = dr.status; - newdr.tag = dr.tag; - newdr.uid = dr.uid; - dbi.JobReport.Add(newdr); - dbi.SaveChanges(); - } - dbi.Dispose(); - db.Dispose(); + //이데이터를 그대로 생성해준다. + var newdr = new JobReport(); + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.wuid = dr.uid;// FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = nd; + newdr.import = false; + newdr.hrs = dr.hrs; + newdr.type = dr.type;//210305 누락분 추가 + newdr.ot = dr.ot; + newdr.process = dr.process; + newdr.projectName = dr.projectName; + newdr.pidx = dr.pidx; + newdr.package = dr.package; + newdr.autoinput = true; + newdr.description = dr.description; + newdr.description2 = dr.description2; + newdr.remark = dr.remark; + newdr.requestpart = dr.requestpart; + newdr.status = dr.status; + newdr.tag = dr.tag; + newdr.uid = dr.uid; + dbi.JobReport.Add(newdr); + dbi.SaveChanges(); + } + dbi.Dispose(); + db.Dispose(); - } + } - /// - /// 로그인으로 업무일지를 작성하는 경우 - /// - void MakeAutoJobReportbyLogin() - { - //자동로그인 업무일지 기록 기능 추가 = 210220 - //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L' - var db = new EEEntitiesMain(); - var nd = DateTime.Now.ToShortDateString(); - if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && - t.autoinput == true && - t.uid == FCOMMON.info.Login.no && - t.pdate == nd).Any() == false) - { - var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); - foreach (var dr in rows) - { - //이데이터를 그대로 생성해준다. - var newdr = new JobReport(); - newdr.gcode = FCOMMON.info.Login.gcode; - newdr.wuid = FCOMMON.info.Login.no; - newdr.wdate = DateTime.Now; - newdr.pdate = nd; - newdr.import = false; - newdr.hrs = dr.hrs; - newdr.type = dr.type;//210305 누락분 추가 - newdr.ot = dr.ot; - newdr.process = dr.process; - newdr.projectName = dr.projectName; - newdr.pidx = dr.pidx; - newdr.package = dr.package; - newdr.autoinput = true; - newdr.description = dr.description; - newdr.description2 = dr.description2; - newdr.remark = dr.remark; - newdr.requestpart = dr.requestpart; - newdr.status = dr.status; - newdr.tag = dr.tag; - newdr.uid = dr.uid; - db.JobReport.Add(newdr); - } - if (rows.Count() > 0) - { - db.SaveChanges(); - Util.MsgI($"{rows.Count()} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" + - "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다"); - } - } - } + /// + /// 로그인으로 업무일지를 작성하는 경우 + /// + void MakeAutoJobReportbyLogin() + { + //자동로그인 업무일지 기록 기능 추가 = 210220 + //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L' + var db = new EEEntitiesMain(); + var nd = DateTime.Now.ToShortDateString(); + if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && + t.autoinput == true && + t.uid == FCOMMON.info.Login.no && + t.pdate == nd).Any() == false) + { + var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); + foreach (var dr in rows) + { + //이데이터를 그대로 생성해준다. + var newdr = new JobReport(); + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = nd; + newdr.import = false; + newdr.hrs = dr.hrs; + newdr.type = dr.type;//210305 누락분 추가 + newdr.ot = dr.ot; + newdr.process = dr.process; + newdr.projectName = dr.projectName; + newdr.pidx = dr.pidx; + newdr.package = dr.package; + newdr.autoinput = true; + newdr.description = dr.description; + newdr.description2 = dr.description2; + newdr.remark = dr.remark; + newdr.requestpart = dr.requestpart; + newdr.status = dr.status; + newdr.tag = dr.tag; + newdr.uid = dr.uid; + db.JobReport.Add(newdr); + } + if (rows.Count() > 0) + { + db.SaveChanges(); + Util.MsgI($"{rows.Count()} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" + + "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다"); + } + } + } - void AddLoginInfo() - { - string ip = string.Empty; - string hostname = Dns.GetHostName(); - string fullname = System.Net.Dns.GetHostEntry("").HostName; + void AddLoginInfo() + { + string ip = string.Empty; + string hostname = Dns.GetHostName(); + string fullname = System.Net.Dns.GetHostEntry("").HostName; - var nif = NetworkInterface.GetAllNetworkInterfaces(); - var host = Dns.GetHostEntry(hostname); - foreach (IPAddress r in host.AddressList) - { - string str = r.ToString(); + var nif = NetworkInterface.GetAllNetworkInterfaces(); + var host = Dns.GetHostEntry(hostname); + foreach (IPAddress r in host.AddressList) + { + string str = r.ToString(); - if (str != "" && str.Substring(0, 3) == "10.") - { - ip = str; - break; - } - } + if (str != "" && str.Substring(0, 3) == "10.") + { + ip = str; + break; + } + } - if (ip == "" || hostname == "") return; + if (ip == "" || hostname == "") return; - try - { - var db = new EEEntitiesMain(); - db.EETGW_LoginInfo.Add(new EETGW_LoginInfo - { - uid = FCOMMON.info.Login.no, - hostname = fullname, - ip = ip, - login = DateTime.Now, - wuid = FCOMMON.info.Login.no, - wdate = DateTime.Now - }); - db.SaveChanges(); - } - catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - Console.WriteLine(ex.Message); - } - } - private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); - } + try + { + var db = new EEEntitiesMain(); + db.EETGW_LoginInfo.Add(new EETGW_LoginInfo + { + uid = FCOMMON.info.Login.no, + hostname = fullname, + ip = ip, + login = DateTime.Now, + wuid = FCOMMON.info.Login.no, + wdate = DateTime.Now + }); + db.SaveChanges(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + Console.WriteLine(ex.Message); + } + } + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); + } - private void cmbDept_SelectedIndexChanged(object sender, EventArgs e) - { - //부서명이 변경되었다 - label4.Text = "문의) 정보없음(?)"; - var sel = cmbDept.SelectedItem as DataRowView; - if (sel == null) return; - var dr = sel.Row as dsMSSQL.UserGroupRow; - if (dr == null) return; + private void cmbDept_SelectedIndexChanged(object sender, EventArgs e) + { + //부서명이 변경되었다 + label4.Text = "문의) 정보없음(?)"; + var sel = cmbDept.SelectedItem as DataRowView; + if (sel == null) return; + var dr = sel.Row as dsMSSQL.UserGroupRow; + if (dr == null) return; - var admin = dr.managerinfo; - if (string.IsNullOrEmpty(admin)) - admin = "--"; + var admin = dr.managerinfo; + if (string.IsNullOrEmpty(admin)) + admin = "--"; - var dev = dr.devinfo; - if (string.IsNullOrEmpty(dev)) - dev = "chikyun.kim@amkor.co.kr(T8567)"; + var dev = dr.devinfo; + if (string.IsNullOrEmpty(dev)) + dev = "chikyun.kim@amkor.co.kr(T8567)"; - label4.Text = $"문의) 관리:{admin},개발:{dev}"; + label4.Text = $"문의) 관리:{admin},개발:{dev}"; - } - } + } + } } diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 57a3dcf..9dae970 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -452,7 +452,7 @@ AdoNetEFMain.tt - ModelPurchase.tt + AdoNetEFMain.tt diff --git a/Project/EETGW_GroupUser.cs b/Project/EETGW_GroupUser.cs index 956dfce..d7ad1db 100644 --- a/Project/EETGW_GroupUser.cs +++ b/Project/EETGW_GroupUser.cs @@ -24,5 +24,6 @@ namespace Project public Nullable useUserState { get; set; } public string wuid { get; set; } public System.DateTime wdate { get; set; } + public Nullable exceptHoly { get; set; } } } diff --git a/Project/JobReport.cs b/Project/JobReport.cs index 1db67f5..e3a0bdf 100644 --- a/Project/JobReport.cs +++ b/Project/JobReport.cs @@ -35,5 +35,14 @@ namespace Project public string description2 { get; set; } public string tag { get; set; } public Nullable autoinput { get; set; } + public Nullable otStart { get; set; } + public Nullable otEnd { get; set; } + public string kisullv { get; set; } + public string kisuldiv { get; set; } + public Nullable kisulamt { get; set; } + public Nullable ot2 { get; set; } + public string otReason { get; set; } + public string otwuid { get; set; } + public Nullable ottime { get; set; } } } diff --git a/Project/Projects.cs b/Project/Projects.cs index c64da86..8f6f525 100644 --- a/Project/Projects.cs +++ b/Project/Projects.cs @@ -66,5 +66,12 @@ namespace Project public Nullable EB_ConstNew { get; set; } public string EB_BoardName { get; set; } public Nullable bAlert { get; set; } + public string bdate { get; set; } + public string qdate { get; set; } + public string cdate { get; set; } + public string CMP_After2 { get; set; } + public string model { get; set; } + public string serial { get; set; } + public string championid { get; set; } } } diff --git a/Project/ProjectsPart.cs b/Project/ProjectsPart.cs index 05b69b0..08276a4 100644 --- a/Project/ProjectsPart.cs +++ b/Project/ProjectsPart.cs @@ -46,5 +46,8 @@ namespace Project public Nullable bbuy { get; set; } public Nullable bconfirm { get; set; } public Nullable bCancel { get; set; } + public string reqUser { get; set; } + public string recvUser { get; set; } + public string recvDate { get; set; } } } diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index ba149fd..86c36fc 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("22.12.15.0900")] -[assembly: AssemblyFileVersion("22.12.15.0900")] +[assembly: AssemblyVersion("23.01.02.0900")] +[assembly: AssemblyFileVersion("23.01.02.0900")] diff --git a/Project/UserGroup.cs b/Project/UserGroup.cs index 5edb34f..3e9876a 100644 --- a/Project/UserGroup.cs +++ b/Project/UserGroup.cs @@ -19,5 +19,8 @@ namespace Project public string path_kj { get; set; } public Nullable advpurchase { get; set; } public Nullable permission { get; set; } + public Nullable advkisul { get; set; } + public string managerinfo { get; set; } + public string devinfo { get; set; } } } diff --git a/Project/_Common/fAddNewUser.Designer.cs b/Project/_Common/fAddNewUser.Designer.cs index 7193de0..859398e 100644 --- a/Project/_Common/fAddNewUser.Designer.cs +++ b/Project/_Common/fAddNewUser.Designer.cs @@ -28,411 +28,423 @@ /// private void InitializeComponent() { - System.Windows.Forms.Label idLabel; - System.Windows.Forms.Label passwordLabel; - System.Windows.Forms.Label nameLabel; - System.Windows.Forms.Label deptLabel; - System.Windows.Forms.Label gradeLabel; - System.Windows.Forms.Label emailLabel; - System.Windows.Forms.Label levelLabel; - System.Windows.Forms.Label indateLabel; - System.Windows.Forms.Label outdateLabel; - System.Windows.Forms.Label memoLabel; - System.Windows.Forms.Label label1; - System.Windows.Forms.Label label2; - System.Windows.Forms.Label label3; - System.Windows.Forms.Label label4; - System.Windows.Forms.Label label5; - System.Windows.Forms.Label label6; - this.tbId = new System.Windows.Forms.TextBox(); - this.tbNameK = new System.Windows.Forms.TextBox(); - this.tbDept = new System.Windows.Forms.TextBox(); - this.tbGrade = new System.Windows.Forms.TextBox(); - this.tbEmail = new System.Windows.Forms.TextBox(); - this.tbLevel = new System.Windows.Forms.TextBox(); - this.tbDateIn = new System.Windows.Forms.TextBox(); - this.tbDateO = new System.Windows.Forms.TextBox(); - this.tbMemo = new System.Windows.Forms.TextBox(); - this.button2 = new System.Windows.Forms.Button(); - this.tbTel = new System.Windows.Forms.TextBox(); - this.tbHp = new System.Windows.Forms.TextBox(); - this.tbNameE = new System.Windows.Forms.TextBox(); - this.tbKJPath = new System.Windows.Forms.TextBox(); - this.tbProcess = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); - this.tbState = new System.Windows.Forms.TextBox(); - this.chkJobReport = new System.Windows.Forms.CheckBox(); - this.chkUseState = new System.Windows.Forms.CheckBox(); - idLabel = new System.Windows.Forms.Label(); - passwordLabel = new System.Windows.Forms.Label(); - nameLabel = new System.Windows.Forms.Label(); - deptLabel = new System.Windows.Forms.Label(); - gradeLabel = new System.Windows.Forms.Label(); - emailLabel = new System.Windows.Forms.Label(); - levelLabel = new System.Windows.Forms.Label(); - indateLabel = new System.Windows.Forms.Label(); - outdateLabel = new System.Windows.Forms.Label(); - memoLabel = new System.Windows.Forms.Label(); - label1 = new System.Windows.Forms.Label(); - label2 = new System.Windows.Forms.Label(); - label3 = new System.Windows.Forms.Label(); - label4 = new System.Windows.Forms.Label(); - label5 = new System.Windows.Forms.Label(); - label6 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // idLabel - // - idLabel.AutoSize = true; - idLabel.Location = new System.Drawing.Point(26, 15); - idLabel.Name = "idLabel"; - idLabel.Size = new System.Drawing.Size(74, 21); - idLabel.TabIndex = 0; - idLabel.Text = "사원번호"; - // - // passwordLabel - // - passwordLabel.AutoSize = true; - passwordLabel.Location = new System.Drawing.Point(26, 49); - passwordLabel.Name = "passwordLabel"; - passwordLabel.Size = new System.Drawing.Size(74, 21); - passwordLabel.TabIndex = 2; - passwordLabel.Text = "비밀번호"; - // - // nameLabel - // - nameLabel.AutoSize = true; - nameLabel.Location = new System.Drawing.Point(58, 86); - nameLabel.Name = "nameLabel"; - nameLabel.Size = new System.Drawing.Size(42, 21); - nameLabel.TabIndex = 4; - nameLabel.Text = "이름"; - // - // deptLabel - // - deptLabel.AutoSize = true; - deptLabel.Location = new System.Drawing.Point(58, 123); - deptLabel.Name = "deptLabel"; - deptLabel.Size = new System.Drawing.Size(42, 21); - deptLabel.TabIndex = 8; - deptLabel.Text = "부서"; - // - // gradeLabel - // - gradeLabel.AutoSize = true; - gradeLabel.Location = new System.Drawing.Point(360, 123); - gradeLabel.Name = "gradeLabel"; - gradeLabel.Size = new System.Drawing.Size(42, 21); - gradeLabel.TabIndex = 10; - gradeLabel.Text = "직책"; - // - // emailLabel - // - emailLabel.AutoSize = true; - emailLabel.Location = new System.Drawing.Point(26, 159); - emailLabel.Name = "emailLabel"; - emailLabel.Size = new System.Drawing.Size(74, 21); - emailLabel.TabIndex = 12; - emailLabel.Text = "전자메일"; - // - // levelLabel - // - levelLabel.AutoSize = true; - levelLabel.Location = new System.Drawing.Point(360, 229); - levelLabel.Name = "levelLabel"; - levelLabel.Size = new System.Drawing.Size(42, 21); - levelLabel.TabIndex = 18; - levelLabel.Text = "권한"; - // - // indateLabel - // - indateLabel.AutoSize = true; - indateLabel.Location = new System.Drawing.Point(344, 15); - indateLabel.Name = "indateLabel"; - indateLabel.Size = new System.Drawing.Size(58, 21); - indateLabel.TabIndex = 20; - indateLabel.Text = "입사일"; - // - // outdateLabel - // - outdateLabel.AutoSize = true; - outdateLabel.Location = new System.Drawing.Point(344, 49); - outdateLabel.Name = "outdateLabel"; - outdateLabel.Size = new System.Drawing.Size(58, 21); - outdateLabel.TabIndex = 22; - outdateLabel.Text = "퇴사일"; - // - // memoLabel - // - memoLabel.AutoSize = true; - memoLabel.Location = new System.Drawing.Point(360, 156); - memoLabel.Name = "memoLabel"; - memoLabel.Size = new System.Drawing.Size(42, 21); - memoLabel.TabIndex = 24; - memoLabel.Text = "비고"; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new System.Drawing.Point(10, 193); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(90, 21); - label1.TabIndex = 14; - label1.Text = "사무실전화"; - // - // label2 - // - label2.AutoSize = true; - label2.Location = new System.Drawing.Point(26, 229); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(74, 21); - label2.TabIndex = 16; - label2.Text = "휴대전화"; - // - // label3 - // - label3.AutoSize = true; - label3.Location = new System.Drawing.Point(318, 86); - label3.Name = "label3"; - label3.Size = new System.Drawing.Size(84, 21); - label3.TabIndex = 6; - label3.Text = "이름(영문)"; - // - // label4 - // - label4.AutoSize = true; - label4.Location = new System.Drawing.Point(106, 361); - label4.Name = "label4"; - label4.Size = new System.Drawing.Size(96, 21); - label4.TabIndex = 27; - label4.Text = "견적서 위치"; - // - // label5 - // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(360, 193); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(42, 21); - label5.TabIndex = 29; - label5.Text = "공정"; - // - // label6 - // - label6.AutoSize = true; - label6.Location = new System.Drawing.Point(58, 264); - label6.Name = "label6"; - label6.Size = new System.Drawing.Size(42, 21); - label6.TabIndex = 33; - label6.Text = "상태"; - // - // tbId - // - this.tbId.Location = new System.Drawing.Point(105, 11); - this.tbId.Name = "tbId"; - this.tbId.Size = new System.Drawing.Size(145, 29); - this.tbId.TabIndex = 1; - // - // tbNameK - // - this.tbNameK.Location = new System.Drawing.Point(105, 82); - this.tbNameK.Name = "tbNameK"; - this.tbNameK.Size = new System.Drawing.Size(200, 29); - this.tbNameK.TabIndex = 5; - // - // tbDept - // - this.tbDept.Location = new System.Drawing.Point(105, 119); - this.tbDept.Name = "tbDept"; - this.tbDept.Size = new System.Drawing.Size(200, 29); - this.tbDept.TabIndex = 9; - // - // tbGrade - // - this.tbGrade.Location = new System.Drawing.Point(407, 119); - this.tbGrade.Name = "tbGrade"; - this.tbGrade.Size = new System.Drawing.Size(189, 29); - this.tbGrade.TabIndex = 11; - // - // tbEmail - // - this.tbEmail.Location = new System.Drawing.Point(105, 156); - this.tbEmail.Name = "tbEmail"; - this.tbEmail.Size = new System.Drawing.Size(200, 29); - this.tbEmail.TabIndex = 13; - // - // tbLevel - // - this.tbLevel.Location = new System.Drawing.Point(407, 225); - this.tbLevel.Name = "tbLevel"; - this.tbLevel.ReadOnly = true; - this.tbLevel.Size = new System.Drawing.Size(189, 29); - this.tbLevel.TabIndex = 19; - // - // tbDateIn - // - this.tbDateIn.Location = new System.Drawing.Point(407, 11); - this.tbDateIn.Name = "tbDateIn"; - this.tbDateIn.Size = new System.Drawing.Size(189, 29); - this.tbDateIn.TabIndex = 21; - // - // tbDateO - // - this.tbDateO.Location = new System.Drawing.Point(407, 45); - this.tbDateO.Name = "tbDateO"; - this.tbDateO.Size = new System.Drawing.Size(189, 29); - this.tbDateO.TabIndex = 23; - // - // tbMemo - // - this.tbMemo.Location = new System.Drawing.Point(407, 156); - this.tbMemo.Name = "tbMemo"; - this.tbMemo.Size = new System.Drawing.Size(189, 29); - this.tbMemo.TabIndex = 25; - // - // button2 - // - this.button2.Location = new System.Drawing.Point(105, 295); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(491, 54); - this.button2.TabIndex = 26; - this.button2.Text = "저장(&S)"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // tbTel - // - this.tbTel.Location = new System.Drawing.Point(105, 190); - this.tbTel.Name = "tbTel"; - this.tbTel.Size = new System.Drawing.Size(200, 29); - this.tbTel.TabIndex = 15; - // - // tbHp - // - this.tbHp.Location = new System.Drawing.Point(105, 225); - this.tbHp.Name = "tbHp"; - this.tbHp.Size = new System.Drawing.Size(200, 29); - this.tbHp.TabIndex = 17; - // - // tbNameE - // - this.tbNameE.Location = new System.Drawing.Point(407, 82); - this.tbNameE.Name = "tbNameE"; - this.tbNameE.Size = new System.Drawing.Size(189, 29); - this.tbNameE.TabIndex = 7; - // - // tbKJPath - // - this.tbKJPath.Location = new System.Drawing.Point(184, 358); - this.tbKJPath.Name = "tbKJPath"; - this.tbKJPath.ReadOnly = true; - this.tbKJPath.Size = new System.Drawing.Size(177, 29); - this.tbKJPath.TabIndex = 28; - // - // tbProcess - // - this.tbProcess.Location = new System.Drawing.Point(407, 190); - this.tbProcess.Name = "tbProcess"; - this.tbProcess.Size = new System.Drawing.Size(189, 29); - this.tbProcess.TabIndex = 30; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(105, 45); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(200, 29); - this.textBox1.TabIndex = 31; - this.textBox1.Text = "기본값 0"; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // button1 - // - this.button1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.button1.Location = new System.Drawing.Point(256, 11); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(49, 29); - this.button1.TabIndex = 32; - this.button1.Text = "조회"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // tbState - // - this.tbState.Location = new System.Drawing.Point(105, 260); - this.tbState.Name = "tbState"; - this.tbState.Size = new System.Drawing.Size(200, 29); - this.tbState.TabIndex = 34; - // - // chkUserSt - // - this.chkJobReport.AutoSize = true; - this.chkJobReport.Location = new System.Drawing.Point(407, 262); - this.chkJobReport.Name = "chkUserSt"; - this.chkJobReport.Size = new System.Drawing.Size(93, 25); - this.chkJobReport.TabIndex = 36; - this.chkJobReport.Text = "업무일지"; - this.chkJobReport.UseVisualStyleBackColor = true; - this.chkJobReport.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged); - // - // chkUseSta - // - this.chkUseState.AutoSize = true; - this.chkUseState.Location = new System.Drawing.Point(503, 260); - this.chkUseState.Name = "chkUseSta"; - this.chkUseState.Size = new System.Drawing.Size(93, 25); - this.chkUseState.TabIndex = 37; - this.chkUseState.Text = "계정사용"; - this.chkUseState.UseVisualStyleBackColor = true; - // - // fAddNewUser - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(601, 355); - this.Controls.Add(this.chkUseState); - this.Controls.Add(this.chkJobReport); - this.Controls.Add(label6); - this.Controls.Add(this.tbState); - this.Controls.Add(this.button1); - this.Controls.Add(this.textBox1); - this.Controls.Add(label5); - this.Controls.Add(this.tbProcess); - this.Controls.Add(label4); - this.Controls.Add(this.tbKJPath); - this.Controls.Add(label3); - this.Controls.Add(this.tbNameE); - this.Controls.Add(label2); - this.Controls.Add(this.tbHp); - this.Controls.Add(label1); - this.Controls.Add(this.tbTel); - this.Controls.Add(this.button2); - this.Controls.Add(idLabel); - this.Controls.Add(this.tbId); - this.Controls.Add(passwordLabel); - this.Controls.Add(nameLabel); - this.Controls.Add(this.tbNameK); - this.Controls.Add(deptLabel); - this.Controls.Add(this.tbDept); - this.Controls.Add(gradeLabel); - this.Controls.Add(this.tbGrade); - this.Controls.Add(emailLabel); - this.Controls.Add(this.tbEmail); - this.Controls.Add(levelLabel); - this.Controls.Add(this.tbLevel); - this.Controls.Add(indateLabel); - this.Controls.Add(this.tbDateIn); - this.Controls.Add(outdateLabel); - this.Controls.Add(this.tbDateO); - this.Controls.Add(memoLabel); - this.Controls.Add(this.tbMemo); - this.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "fAddNewUser"; - this.Text = "사용자추가"; - this.Load += new System.EventHandler(this.fUserInfo_Load); - this.ResumeLayout(false); - this.PerformLayout(); + System.Windows.Forms.Label idLabel; + System.Windows.Forms.Label passwordLabel; + System.Windows.Forms.Label nameLabel; + System.Windows.Forms.Label deptLabel; + System.Windows.Forms.Label gradeLabel; + System.Windows.Forms.Label emailLabel; + System.Windows.Forms.Label levelLabel; + System.Windows.Forms.Label indateLabel; + System.Windows.Forms.Label outdateLabel; + System.Windows.Forms.Label memoLabel; + System.Windows.Forms.Label label1; + System.Windows.Forms.Label label2; + System.Windows.Forms.Label label3; + System.Windows.Forms.Label label4; + System.Windows.Forms.Label label5; + System.Windows.Forms.Label label6; + this.tbId = new System.Windows.Forms.TextBox(); + this.tbNameK = new System.Windows.Forms.TextBox(); + this.tbDept = new System.Windows.Forms.TextBox(); + this.tbGrade = new System.Windows.Forms.TextBox(); + this.tbEmail = new System.Windows.Forms.TextBox(); + this.tbLevel = new System.Windows.Forms.TextBox(); + this.tbDateIn = new System.Windows.Forms.TextBox(); + this.tbDateO = new System.Windows.Forms.TextBox(); + this.tbMemo = new System.Windows.Forms.TextBox(); + this.button2 = new System.Windows.Forms.Button(); + this.tbTel = new System.Windows.Forms.TextBox(); + this.tbHp = new System.Windows.Forms.TextBox(); + this.tbNameE = new System.Windows.Forms.TextBox(); + this.tbKJPath = new System.Windows.Forms.TextBox(); + this.tbProcess = new System.Windows.Forms.TextBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.tbState = new System.Windows.Forms.TextBox(); + this.chkJobReport = new System.Windows.Forms.CheckBox(); + this.chkUseState = new System.Windows.Forms.CheckBox(); + this.chkExceptHoly = new System.Windows.Forms.CheckBox(); + idLabel = new System.Windows.Forms.Label(); + passwordLabel = new System.Windows.Forms.Label(); + nameLabel = new System.Windows.Forms.Label(); + deptLabel = new System.Windows.Forms.Label(); + gradeLabel = new System.Windows.Forms.Label(); + emailLabel = new System.Windows.Forms.Label(); + levelLabel = new System.Windows.Forms.Label(); + indateLabel = new System.Windows.Forms.Label(); + outdateLabel = new System.Windows.Forms.Label(); + memoLabel = new System.Windows.Forms.Label(); + label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); + label6 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // idLabel + // + idLabel.AutoSize = true; + idLabel.Location = new System.Drawing.Point(26, 15); + idLabel.Name = "idLabel"; + idLabel.Size = new System.Drawing.Size(74, 21); + idLabel.TabIndex = 0; + idLabel.Text = "사원번호"; + // + // passwordLabel + // + passwordLabel.AutoSize = true; + passwordLabel.Location = new System.Drawing.Point(26, 49); + passwordLabel.Name = "passwordLabel"; + passwordLabel.Size = new System.Drawing.Size(74, 21); + passwordLabel.TabIndex = 2; + passwordLabel.Text = "비밀번호"; + // + // nameLabel + // + nameLabel.AutoSize = true; + nameLabel.Location = new System.Drawing.Point(58, 86); + nameLabel.Name = "nameLabel"; + nameLabel.Size = new System.Drawing.Size(42, 21); + nameLabel.TabIndex = 4; + nameLabel.Text = "이름"; + // + // deptLabel + // + deptLabel.AutoSize = true; + deptLabel.Location = new System.Drawing.Point(58, 123); + deptLabel.Name = "deptLabel"; + deptLabel.Size = new System.Drawing.Size(42, 21); + deptLabel.TabIndex = 8; + deptLabel.Text = "부서"; + // + // gradeLabel + // + gradeLabel.AutoSize = true; + gradeLabel.Location = new System.Drawing.Point(360, 123); + gradeLabel.Name = "gradeLabel"; + gradeLabel.Size = new System.Drawing.Size(42, 21); + gradeLabel.TabIndex = 10; + gradeLabel.Text = "직책"; + // + // emailLabel + // + emailLabel.AutoSize = true; + emailLabel.Location = new System.Drawing.Point(26, 159); + emailLabel.Name = "emailLabel"; + emailLabel.Size = new System.Drawing.Size(74, 21); + emailLabel.TabIndex = 12; + emailLabel.Text = "전자메일"; + // + // levelLabel + // + levelLabel.AutoSize = true; + levelLabel.Location = new System.Drawing.Point(360, 229); + levelLabel.Name = "levelLabel"; + levelLabel.Size = new System.Drawing.Size(42, 21); + levelLabel.TabIndex = 18; + levelLabel.Text = "권한"; + // + // indateLabel + // + indateLabel.AutoSize = true; + indateLabel.Location = new System.Drawing.Point(344, 15); + indateLabel.Name = "indateLabel"; + indateLabel.Size = new System.Drawing.Size(58, 21); + indateLabel.TabIndex = 20; + indateLabel.Text = "입사일"; + // + // outdateLabel + // + outdateLabel.AutoSize = true; + outdateLabel.Location = new System.Drawing.Point(344, 49); + outdateLabel.Name = "outdateLabel"; + outdateLabel.Size = new System.Drawing.Size(58, 21); + outdateLabel.TabIndex = 22; + outdateLabel.Text = "퇴사일"; + // + // memoLabel + // + memoLabel.AutoSize = true; + memoLabel.Location = new System.Drawing.Point(360, 156); + memoLabel.Name = "memoLabel"; + memoLabel.Size = new System.Drawing.Size(42, 21); + memoLabel.TabIndex = 24; + memoLabel.Text = "비고"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(10, 193); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(90, 21); + label1.TabIndex = 14; + label1.Text = "사무실전화"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(26, 229); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(74, 21); + label2.TabIndex = 16; + label2.Text = "휴대전화"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(318, 86); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(84, 21); + label3.TabIndex = 6; + label3.Text = "이름(영문)"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(106, 361); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(96, 21); + label4.TabIndex = 27; + label4.Text = "견적서 위치"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(360, 193); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(42, 21); + label5.TabIndex = 29; + label5.Text = "공정"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new System.Drawing.Point(58, 264); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(42, 21); + label6.TabIndex = 33; + label6.Text = "상태"; + // + // tbId + // + this.tbId.Location = new System.Drawing.Point(105, 11); + this.tbId.Name = "tbId"; + this.tbId.Size = new System.Drawing.Size(145, 29); + this.tbId.TabIndex = 1; + // + // tbNameK + // + this.tbNameK.Location = new System.Drawing.Point(105, 82); + this.tbNameK.Name = "tbNameK"; + this.tbNameK.Size = new System.Drawing.Size(200, 29); + this.tbNameK.TabIndex = 5; + // + // tbDept + // + this.tbDept.Location = new System.Drawing.Point(105, 119); + this.tbDept.Name = "tbDept"; + this.tbDept.Size = new System.Drawing.Size(200, 29); + this.tbDept.TabIndex = 9; + // + // tbGrade + // + this.tbGrade.Location = new System.Drawing.Point(407, 119); + this.tbGrade.Name = "tbGrade"; + this.tbGrade.Size = new System.Drawing.Size(189, 29); + this.tbGrade.TabIndex = 11; + // + // tbEmail + // + this.tbEmail.Location = new System.Drawing.Point(105, 156); + this.tbEmail.Name = "tbEmail"; + this.tbEmail.Size = new System.Drawing.Size(200, 29); + this.tbEmail.TabIndex = 13; + // + // tbLevel + // + this.tbLevel.Location = new System.Drawing.Point(407, 225); + this.tbLevel.Name = "tbLevel"; + this.tbLevel.ReadOnly = true; + this.tbLevel.Size = new System.Drawing.Size(189, 29); + this.tbLevel.TabIndex = 19; + // + // tbDateIn + // + this.tbDateIn.Location = new System.Drawing.Point(407, 11); + this.tbDateIn.Name = "tbDateIn"; + this.tbDateIn.Size = new System.Drawing.Size(189, 29); + this.tbDateIn.TabIndex = 21; + // + // tbDateO + // + this.tbDateO.Location = new System.Drawing.Point(407, 45); + this.tbDateO.Name = "tbDateO"; + this.tbDateO.Size = new System.Drawing.Size(189, 29); + this.tbDateO.TabIndex = 23; + // + // tbMemo + // + this.tbMemo.Location = new System.Drawing.Point(407, 156); + this.tbMemo.Name = "tbMemo"; + this.tbMemo.Size = new System.Drawing.Size(189, 29); + this.tbMemo.TabIndex = 25; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(105, 295); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(491, 54); + this.button2.TabIndex = 26; + this.button2.Text = "저장(&S)"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // tbTel + // + this.tbTel.Location = new System.Drawing.Point(105, 190); + this.tbTel.Name = "tbTel"; + this.tbTel.Size = new System.Drawing.Size(200, 29); + this.tbTel.TabIndex = 15; + // + // tbHp + // + this.tbHp.Location = new System.Drawing.Point(105, 225); + this.tbHp.Name = "tbHp"; + this.tbHp.Size = new System.Drawing.Size(200, 29); + this.tbHp.TabIndex = 17; + // + // tbNameE + // + this.tbNameE.Location = new System.Drawing.Point(407, 82); + this.tbNameE.Name = "tbNameE"; + this.tbNameE.Size = new System.Drawing.Size(189, 29); + this.tbNameE.TabIndex = 7; + // + // tbKJPath + // + this.tbKJPath.Location = new System.Drawing.Point(184, 358); + this.tbKJPath.Name = "tbKJPath"; + this.tbKJPath.ReadOnly = true; + this.tbKJPath.Size = new System.Drawing.Size(177, 29); + this.tbKJPath.TabIndex = 28; + // + // tbProcess + // + this.tbProcess.Location = new System.Drawing.Point(407, 190); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(189, 29); + this.tbProcess.TabIndex = 30; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(105, 45); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(200, 29); + this.textBox1.TabIndex = 31; + this.textBox1.Text = "기본값 0"; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.button1.Location = new System.Drawing.Point(256, 11); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(49, 29); + this.button1.TabIndex = 32; + this.button1.Text = "조회"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // tbState + // + this.tbState.Location = new System.Drawing.Point(105, 260); + this.tbState.Name = "tbState"; + this.tbState.Size = new System.Drawing.Size(200, 29); + this.tbState.TabIndex = 34; + // + // chkJobReport + // + this.chkJobReport.AutoSize = true; + this.chkJobReport.Location = new System.Drawing.Point(407, 262); + this.chkJobReport.Name = "chkJobReport"; + this.chkJobReport.Size = new System.Drawing.Size(93, 25); + this.chkJobReport.TabIndex = 36; + this.chkJobReport.Text = "업무일지"; + this.chkJobReport.UseVisualStyleBackColor = true; + this.chkJobReport.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged); + // + // chkUseState + // + this.chkUseState.AutoSize = true; + this.chkUseState.Location = new System.Drawing.Point(503, 260); + this.chkUseState.Name = "chkUseState"; + this.chkUseState.Size = new System.Drawing.Size(93, 25); + this.chkUseState.TabIndex = 37; + this.chkUseState.Text = "계정사용"; + this.chkUseState.UseVisualStyleBackColor = true; + // + // checkBox1 + // + this.chkExceptHoly.AutoSize = true; + this.chkExceptHoly.Location = new System.Drawing.Point(311, 260); + this.chkExceptHoly.Name = "checkBox1"; + this.chkExceptHoly.Size = new System.Drawing.Size(93, 25); + this.chkExceptHoly.TabIndex = 38; + this.chkExceptHoly.Text = "휴가제외"; + this.chkExceptHoly.UseVisualStyleBackColor = true; + // + // fAddNewUser + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(601, 355); + this.Controls.Add(this.chkExceptHoly); + this.Controls.Add(this.chkUseState); + this.Controls.Add(this.chkJobReport); + this.Controls.Add(label6); + this.Controls.Add(this.tbState); + this.Controls.Add(this.button1); + this.Controls.Add(this.textBox1); + this.Controls.Add(label5); + this.Controls.Add(this.tbProcess); + this.Controls.Add(label4); + this.Controls.Add(this.tbKJPath); + this.Controls.Add(label3); + this.Controls.Add(this.tbNameE); + this.Controls.Add(label2); + this.Controls.Add(this.tbHp); + this.Controls.Add(label1); + this.Controls.Add(this.tbTel); + this.Controls.Add(this.button2); + this.Controls.Add(idLabel); + this.Controls.Add(this.tbId); + this.Controls.Add(passwordLabel); + this.Controls.Add(nameLabel); + this.Controls.Add(this.tbNameK); + this.Controls.Add(deptLabel); + this.Controls.Add(this.tbDept); + this.Controls.Add(gradeLabel); + this.Controls.Add(this.tbGrade); + this.Controls.Add(emailLabel); + this.Controls.Add(this.tbEmail); + this.Controls.Add(levelLabel); + this.Controls.Add(this.tbLevel); + this.Controls.Add(indateLabel); + this.Controls.Add(this.tbDateIn); + this.Controls.Add(outdateLabel); + this.Controls.Add(this.tbDateO); + this.Controls.Add(memoLabel); + this.Controls.Add(this.tbMemo); + this.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fAddNewUser"; + this.Text = "사용자추가"; + this.Load += new System.EventHandler(this.fUserInfo_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -457,5 +469,6 @@ private System.Windows.Forms.TextBox tbState; private System.Windows.Forms.CheckBox chkJobReport; private System.Windows.Forms.CheckBox chkUseState; - } + private System.Windows.Forms.CheckBox chkExceptHoly; + } } diff --git a/Project/_Common/fAddNewUser.cs b/Project/_Common/fAddNewUser.cs index dc2eb09..e089a9c 100644 --- a/Project/_Common/fAddNewUser.cs +++ b/Project/_Common/fAddNewUser.cs @@ -47,6 +47,7 @@ namespace Project._Common tbDateO.Text = db_user.outdate; tbGrade.Text = db_user.grade; tbMemo.Text = db_user.memo; + } if (db_guser != null) { @@ -56,6 +57,7 @@ namespace Project._Common //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 = "사용자 정보 변경"; @@ -137,6 +139,7 @@ namespace Project._Common drGuser.state = this.tbState.Text.Trim(); drGuser.useJobReport = chkJobReport.Checked; drGuser.useUserState = chkUseState.Checked; + drGuser.exceptHoly = chkExceptHoly.Checked; } else { @@ -158,6 +161,7 @@ namespace Project._Common //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); } diff --git a/Project/_Common/fUserInfo.Designer.cs b/Project/_Common/fUserInfo.Designer.cs index 21950ae..47e5f34 100644 --- a/Project/_Common/fUserInfo.Designer.cs +++ b/Project/_Common/fUserInfo.Designer.cs @@ -203,7 +203,7 @@ // label4 // label4.AutoSize = true; - label4.Location = new System.Drawing.Point(106, 330); + label4.Location = new System.Drawing.Point(106, 356); label4.Name = "label4"; label4.Size = new System.Drawing.Size(96, 21); label4.TabIndex = 27; @@ -248,9 +248,9 @@ // // tbDept // - this.tbDept.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "dept", true)); this.tbDept.Location = new System.Drawing.Point(105, 119); this.tbDept.Name = "tbDept"; + this.tbDept.ReadOnly = true; this.tbDept.Size = new System.Drawing.Size(200, 29); this.tbDept.TabIndex = 9; // @@ -315,7 +315,7 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(105, 264); + this.button2.Location = new System.Drawing.Point(105, 290); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(491, 54); this.button2.TabIndex = 26; @@ -333,12 +333,14 @@ this.tam.EETGW_GroupUserTableAdapter = null; this.tam.InventoryTableAdapter = null; this.tam.ItemsTableAdapter = null; + this.tam.JobReportTableAdapter = null; this.tam.LineCodeTableAdapter = null; this.tam.ProjectsTableAdapter = null; this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; this.tam.UserGroupTableAdapter = null; this.tam.UsersTableAdapter = this.ta; + this.tam.vGroupUserTableAdapter = null; // // tbTel // @@ -367,7 +369,7 @@ // tbKJPath // this.tbKJPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true)); - this.tbKJPath.Location = new System.Drawing.Point(184, 327); + this.tbKJPath.Location = new System.Drawing.Point(184, 353); this.tbKJPath.Name = "tbKJPath"; this.tbKJPath.ReadOnly = true; this.tbKJPath.Size = new System.Drawing.Size(177, 29); @@ -384,7 +386,7 @@ // fUserInfo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(601, 326); + this.ClientSize = new System.Drawing.Size(601, 351); this.Controls.Add(label5); this.Controls.Add(this.tbProcess); this.Controls.Add(label4); diff --git a/Project/_Common/fUserInfo.cs b/Project/_Common/fUserInfo.cs index 230e8b0..298de3d 100644 --- a/Project/_Common/fUserInfo.cs +++ b/Project/_Common/fUserInfo.cs @@ -35,6 +35,8 @@ namespace Project._Common if (drGroupUser != null) this.tbProcess.Text = drGroupUser.Process; else this.tbProcess.Text = string.Empty; + + this.tbDept.Text = FCOMMON.info.Login.dept; } private void button1_Click(object sender, EventArgs e) @@ -77,7 +79,7 @@ namespace Project._Common this.Validate(); dr.name = tbNameK.Text; - dr.dept = tbDept.Text; + //dr.dept = tbDept.Text; dr.email = tbEmail.Text; dr.tel = tbTel.Text; dr.hp = tbHp.Text; diff --git a/Project/_Common/fUserInfo.resx b/Project/_Common/fUserInfo.resx index 9237edb..5f0b875 100644 --- a/Project/_Common/fUserInfo.resx +++ b/Project/_Common/fUserInfo.resx @@ -165,6 +165,12 @@ 122, 17 + + 122, 17 + + + 17, 17 + 17, 17 diff --git a/Project/_Common/fUserList.Designer.cs b/Project/_Common/fUserList.Designer.cs index 895b0bf..2f355bd 100644 --- a/Project/_Common/fUserList.Designer.cs +++ b/Project/_Common/fUserList.Designer.cs @@ -28,78 +28,78 @@ /// private void InitializeComponent() { - 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(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - 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(); - this.한글이름분리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.cmbdept = new System.Windows.Forms.ToolStripComboBox(); - this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); - 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(); - ((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(); - this.SuspendLayout(); - // - // bn - // - this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; - 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.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(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + 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(); + this.한글이름분리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.cmbdept = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + 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(); + ((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(); + this.SuspendLayout(); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + 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, this.bindingNavigatorSeparator, @@ -115,439 +115,439 @@ this.btSave, this.toolStripSeparator1, this.btDevel}); - this.bn.Location = new System.Drawing.Point(0, 672); - 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(1234, 39); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // bs - // - this.bs.DataMember = "vGroupUser"; - this.bs.DataSource = this.dsMSSQL; - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 36); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(36, 36); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(36, 36); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 39); - // - // bindingNavigatorPositionItem - // - 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"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 39); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(36, 36); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(36, 36); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - 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(83, 36); - this.btAdd.Text = "추가(&A)"; - this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); - // - // btEdit - // - 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(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(82, 36); - this.btSave.Text = "저장(&S)"; - this.btSave.Visible = false; - this.btSave.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39); - // - // btDevel - // - this.btDevel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btDevel.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bn.Location = new System.Drawing.Point(0, 672); + 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(1234, 39); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bs + // + this.bs.DataMember = "vGroupUser"; + this.bs.DataSource = this.dsMSSQL; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 36); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(36, 36); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(36, 36); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 39); + // + // bindingNavigatorPositionItem + // + 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"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 39); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(36, 36); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(36, 36); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + 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(83, 36); + this.btAdd.Text = "추가(&A)"; + this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); + // + // btEdit + // + 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(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(82, 36); + this.btSave.Text = "저장(&S)"; + this.btSave.Visible = false; + this.btSave.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39); + // + // btDevel + // + this.btDevel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btDevel.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.한글이름분리ToolStripMenuItem}); - 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(104, 36); - this.btDevel.Text = "developer"; - // - // 한글이름분리ToolStripMenuItem - // - this.한글이름분리ToolStripMenuItem.Name = "한글이름분리ToolStripMenuItem"; - this.한글이름분리ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); - this.한글이름분리ToolStripMenuItem.Text = "한글이름분리"; - this.한글이름분리ToolStripMenuItem.Click += new System.EventHandler(this.한글이름분리ToolStripMenuItem_Click); - // - // cm1 - // - this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + 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(104, 36); + this.btDevel.Text = "developer"; + // + // 한글이름분리ToolStripMenuItem + // + this.한글이름분리ToolStripMenuItem.Name = "한글이름분리ToolStripMenuItem"; + this.한글이름분리ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.한글이름분리ToolStripMenuItem.Text = "한글이름분리"; + this.한글이름분리ToolStripMenuItem.Click += new System.EventHandler(this.한글이름분리ToolStripMenuItem_Click); + // + // cm1 + // + this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.autoResizeColumnToolStripMenuItem, this.toolStripMenuItem2, this.iDChangeToolStripMenuItem, this.passwordChangeToolStripMenuItem, this.toolStripMenuItem1, this.mailToolStripMenuItem}); - this.cm1.Name = "cm1"; - this.cm1.Size = new System.Drawing.Size(181, 104); - // - // autoResizeColumnToolStripMenuItem - // - this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem"; - this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column"; - this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6); - // - // iDChangeToolStripMenuItem - // - this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem"; - this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.iDChangeToolStripMenuItem.Text = "ID Change"; - this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click); - // - // passwordChangeToolStripMenuItem - // - this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem"; - this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.passwordChangeToolStripMenuItem.Text = "Password Change"; - this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6); - // - // mailToolStripMenuItem - // - this.mailToolStripMenuItem.Name = "mailToolStripMenuItem"; - this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.mailToolStripMenuItem.Text = "Mail"; - this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click); - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cm1.Name = "cm1"; + this.cm1.Size = new System.Drawing.Size(181, 104); + // + // autoResizeColumnToolStripMenuItem + // + this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem"; + this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column"; + this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6); + // + // iDChangeToolStripMenuItem + // + this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem"; + this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.iDChangeToolStripMenuItem.Text = "ID Change"; + this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click); + // + // passwordChangeToolStripMenuItem + // + this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem"; + this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.passwordChangeToolStripMenuItem.Text = "Password Change"; + this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6); + // + // mailToolStripMenuItem + // + this.mailToolStripMenuItem.Name = "mailToolStripMenuItem"; + this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.mailToolStripMenuItem.Text = "Mail"; + this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel1, this.cmbdept, this.toolStripLabel2, this.tbProcess, this.btRef}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1234, 25); - this.toolStrip1.TabIndex = 2; - this.toolStrip1.Text = "toolStrip1"; - // - // toolStripLabel1 - // - this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel1.Text = "소속"; - // - // cmbdept - // - this.cmbdept.Enabled = false; - this.cmbdept.Name = "cmbdept"; - this.cmbdept.Size = new System.Drawing.Size(400, 25); - // - // toolStripLabel2 - // - this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel2.Text = "공정"; - // - // 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 = "%"; - this.tbProcess.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // btRef - // - this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image"))); - this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btRef.Name = "btRef"; - this.btRef.Size = new System.Drawing.Size(90, 22); - this.btRef.Text = "새로고침(&R)"; - this.btRef.Click += new System.EventHandler(this.btRef_Click); - // - // textBox1 - // - 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, 651); - this.textBox1.Name = "textBox1"; - 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.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1234, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel1.Text = "소속"; + // + // cmbdept + // + this.cmbdept.Enabled = false; + this.cmbdept.Name = "cmbdept"; + this.cmbdept.Size = new System.Drawing.Size(400, 25); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel2.Text = "공정"; + // + // 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 = "%"; + this.tbProcess.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // btRef + // + this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image"))); + this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRef.Name = "btRef"; + this.btRef.Size = new System.Drawing.Size(90, 22); + this.btRef.Text = "새로고침(&R)"; + this.btRef.Click += new System.EventHandler(this.btRef_Click); + // + // textBox1 + // + 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, 651); + this.textBox1.Name = "textBox1"; + 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; - // - // 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.textBox1); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.bn); - this.Name = "fUserList"; - this.Text = "그룹내 사용자 목록"; - this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - this.cm1.ResumeLayout(false); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + 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; + // + // 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.textBox1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.bn); + this.Name = "fUserList"; + this.Text = "그룹내 사용자 목록"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); + this.cm1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index 7cbac80..eae597d 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -4210,6 +4210,8 @@ namespace Project { private global::System.Data.DataColumn columnpassword; + private global::System.Data.DataColumn columnexceptHoly; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public vGroupUserDataTable() { @@ -4419,6 +4421,14 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn exceptHolyColumn { + get { + return this.columnexceptHoly; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4478,7 +4488,8 @@ namespace Project { string state, bool useJobReport, bool useUserState, - string password) { + string password, + bool exceptHoly) { vGroupUserRow rowvGroupUserRow = ((vGroupUserRow)(this.NewRow())); object[] columnValuesArray = new object[] { gcode, @@ -4502,7 +4513,8 @@ namespace Project { state, useJobReport, useUserState, - password}; + password, + exceptHoly}; rowvGroupUserRow.ItemArray = columnValuesArray; this.Rows.Add(rowvGroupUserRow); return rowvGroupUserRow; @@ -4555,6 +4567,7 @@ namespace Project { this.columnuseJobReport = base.Columns["useJobReport"]; this.columnuseUserState = base.Columns["useUserState"]; this.columnpassword = base.Columns["password"]; + this.columnexceptHoly = base.Columns["exceptHoly"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4604,6 +4617,8 @@ namespace Project { base.Columns.Add(this.columnuseUserState); this.columnpassword = new global::System.Data.DataColumn("password", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpassword); + this.columnexceptHoly = new global::System.Data.DataColumn("exceptHoly", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnexceptHoly); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columngcode, this.columnid}, true)); @@ -8359,6 +8374,22 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool exceptHoly { + get { + if (this.IsexceptHolyNull()) { + return false; + } + else { + return ((bool)(this[this.tablevGroupUser.exceptHolyColumn])); + } + } + set { + this[this.tablevGroupUser.exceptHolyColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsdeptNull() { @@ -8598,6 +8629,18 @@ namespace Project { public void SetpasswordNull() { this[this.tablevGroupUser.passwordColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsexceptHolyNull() { + return this.IsNull(this.tablevGroupUser.exceptHolyColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetexceptHolyNull() { + this[this.tablevGroupUser.exceptHolyColumn] = global::System.Convert.DBNull; + } } /// @@ -15804,6 +15847,7 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR tableMapping.ColumnMappings.Add("useJobReport", "useJobReport"); tableMapping.ColumnMappings.Add("useUserState", "useUserState"); tableMapping.ColumnMappings.Add("password", "password"); + tableMapping.ColumnMappings.Add("exceptHoly", "exceptHoly"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -15811,13 +15855,14 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE EETGW_GroupUser\r\nSET Process = @Process, state = @state\r\nWHERE (gc" + - "ode = @gcode) AND (uid = @id)"; + this._adapter.UpdateCommand.CommandText = "UPDATE EETGW_GroupUser\r\nSET Process = @Process, state = @state, exceptHoly" + + " = @exceptHoly\r\nWHERE (gcode = @gcode) AND (uid = @id)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "processs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@exceptHoly", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "exceptHoly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15833,7 +15878,8 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password + this._commandCollection[0].CommandText = @"SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password, + exceptHoly FROM vGroupUser WHERE (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs) ORDER BY name"; @@ -15842,7 +15888,7 @@ ORDER BY name"; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@processs", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT ads_created, ads_employNo, ads_title, dept, email, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name"; + this._commandCollection[1].CommandText = @"SELECT ads_created, ads_employNo, ads_title, dept, email, exceptHoly, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/Project/dsMSSQL.cs b/Project/dsMSSQL.cs index ec12345..eae2ed9 100644 --- a/Project/dsMSSQL.cs +++ b/Project/dsMSSQL.cs @@ -2,7 +2,7 @@ { - partial class dsMSSQL - { - } + partial class dsMSSQL + { + } } diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index 1ca5500..e17f2ac 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -1087,7 +1087,8 @@ and uid = @uid - SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password + SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password, + exceptHoly FROM vGroupUser WHERE (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs) ORDER BY name @@ -1098,15 +1099,16 @@ ORDER BY name - + UPDATE EETGW_GroupUser -SET Process = @Process, state = @state +SET Process = @Process, state = @state, exceptHoly = @exceptHoly WHERE (gcode = @gcode) AND (uid = @id) - - - - + + + + + @@ -1135,12 +1137,13 @@ WHERE (gcode = @gcode) AND (uid = @id) + - SELECT ads_created, ads_employNo, ads_title, dept, email, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name + SELECT ads_created, ads_employNo, ads_title, dept, email, exceptHoly, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name @@ -1369,7 +1372,7 @@ WHERE (idx = @idx) - + @@ -1510,7 +1513,7 @@ WHERE (idx = @idx) - + @@ -1581,7 +1584,7 @@ WHERE (idx = @idx) - + @@ -1639,7 +1642,7 @@ WHERE (idx = @idx) - + @@ -1709,7 +1712,7 @@ WHERE (idx = @idx) - + @@ -1767,7 +1770,7 @@ WHERE (idx = @idx) - + @@ -1811,7 +1814,7 @@ WHERE (idx = @idx) - + @@ -1927,7 +1930,7 @@ WHERE (idx = @idx) - + @@ -1966,7 +1969,7 @@ WHERE (idx = @idx) - + @@ -2082,7 +2085,7 @@ WHERE (idx = @idx) - + @@ -2105,10 +2108,11 @@ WHERE (idx = @idx) + - + diff --git a/Project/dsMSSQL.xss b/Project/dsMSSQL.xss index 237f75c..e8aec6d 100644 --- a/Project/dsMSSQL.xss +++ b/Project/dsMSSQL.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/Project/vGroupUser.cs b/Project/vGroupUser.cs index 54b8c71..848f14b 100644 --- a/Project/vGroupUser.cs +++ b/Project/vGroupUser.cs @@ -35,5 +35,7 @@ namespace Project public string state { get; set; } public Nullable useJobReport { get; set; } public Nullable useUserState { get; set; } + public string password { get; set; } + public Nullable exceptHoly { get; set; } } } diff --git a/SubProject/FBS0000/dsReport.Designer.cs b/SubProject/FBS0000/dsReport.Designer.cs index cbbc0ab..7d9f567 100644 --- a/SubProject/FBS0000/dsReport.Designer.cs +++ b/SubProject/FBS0000/dsReport.Designer.cs @@ -2703,7 +2703,8 @@ namespace FBS0000.dsReportTableAdapters { FROM Users INNER JOIN Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode -WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (EETGW_GroupUser.useUserState = 1) +WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND + (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0) ORDER BY Holyday.uid, CrDay"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FBS0000/dsReport.cs b/SubProject/FBS0000/dsReport.cs index b33dd82..d547a88 100644 --- a/SubProject/FBS0000/dsReport.cs +++ b/SubProject/FBS0000/dsReport.cs @@ -2,9 +2,9 @@ { - partial class dsReport - { - } + partial class dsReport + { + } } namespace FBS0000.dsReportTableAdapters { diff --git a/SubProject/FBS0000/dsReport.xsd b/SubProject/FBS0000/dsReport.xsd index ff1715e..87d4d74 100644 --- a/SubProject/FBS0000/dsReport.xsd +++ b/SubProject/FBS0000/dsReport.xsd @@ -16,7 +16,8 @@ FROM Users INNER JOIN Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode -WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (EETGW_GroupUser.useUserState = 1) +WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND + (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0) ORDER BY Holyday.uid, CrDay @@ -166,7 +167,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + @@ -211,7 +212,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + @@ -265,7 +266,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs index 1918225..1765afc 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs @@ -164,7 +164,6 @@ namespace FPJ0000.OtConfirm this.grpUser.TabIndex = 0; this.grpUser.TabStop = false; this.grpUser.Text = "신청자"; - this.grpUser.Enter += new System.EventHandler(this.grpUser_Enter); // // cmbUser // @@ -218,7 +217,6 @@ namespace FPJ0000.OtConfirm this.tbDays.Size = new System.Drawing.Size(130, 38); this.tbDays.TabIndex = 18; this.tbDays.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbDays.TextChanged += new System.EventHandler(this.tbDays_TextChanged); // // label10 // @@ -249,7 +247,6 @@ namespace FPJ0000.OtConfirm this.label9.Size = new System.Drawing.Size(93, 27); this.label9.TabIndex = 11; this.label9.Text = "행선지"; - this.label9.Click += new System.EventHandler(this.label9_Click); // // tbLocation // @@ -262,7 +259,6 @@ namespace FPJ0000.OtConfirm this.tbLocation.Name = "tbLocation"; this.tbLocation.Size = new System.Drawing.Size(381, 35); this.tbLocation.TabIndex = 12; - this.tbLocation.SelectedIndexChanged += new System.EventHandler(this.tbLocation_SelectedIndexChanged); // // label8 // @@ -284,7 +280,6 @@ namespace FPJ0000.OtConfirm this.tbReason.Name = "tbReason"; this.tbReason.Size = new System.Drawing.Size(310, 35); this.tbReason.TabIndex = 10; - this.tbReason.SelectedIndexChanged += new System.EventHandler(this.tbReason_SelectedIndexChanged); // // label5 // diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index ae13edb..57f95af 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -201,7 +201,7 @@ namespace FPJ0000.OtConfirm //사용시간여부 확인 var minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 문의 하세요"; - if(IsAdmin) + if (IsAdmin) minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 권한으로 기록은 진행 됩니다"; bool oktime = false; @@ -236,8 +236,8 @@ namespace FPJ0000.OtConfirm } if (oktime == false) { - FCOMMON.Util.MsgE(minmsg); - if (IsAdmin == false) return; + //FCOMMON.Util.MsgE(minmsg); + //if (IsAdmin == false) return; } // return; @@ -396,35 +396,6 @@ namespace FPJ0000.OtConfirm UpdateStatus(); } - private void label11_Click(object sender, EventArgs e) - { - - } - - private void tbDays_TextChanged(object sender, EventArgs e) - { - - } - - private void grpUser_Enter(object sender, EventArgs e) - { - - } - - private void tbLocation_SelectedIndexChanged(object sender, EventArgs e) - { - - } - - private void tbReason_SelectedIndexChanged(object sender, EventArgs e) - { - - } - - private void label9_Click(object sender, EventArgs e) - { - - } Dictionary holydata = new Dictionary(); @@ -437,9 +408,11 @@ namespace FPJ0000.OtConfirm if (uid.isEmpty()) return; - holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, DateTime.Now.AddDays(-1).ToShortDateString()); + var basedate = DateTime.Now.AddDays(-1).ToShortDateString(); + holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, basedate); this.richTextBox1.Clear(); + if (holydata.Any()) richTextBox1.AppendText($"[기준:{basedate}] => "); foreach (var item in holydata) { var val = item.Value.Split('|'); diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index cf3a0fb..042da98 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALpSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s - Zipm3uYUTU10YZAtppHX0ESFClGKXlRoF53a1Dnn3IZbZC5Tm/MueFnqLudsO9NvzzlbaiD0gw/Pi+d8 - P5zf9xweO2EPFMmXKzWy6CrN73CxhiInzVHNnlo6ulJNR5arDOdEylr/mLcHuNDeiXg8qFyx0GsGg8Ft - tjlgtu6yZmGh8XPJguJPc4ivGrfzc6Q+3qhnospUK2xYPeOCdpaBdo6BZoaBatoJxS8HusZscDBA+ziF - 4g+zSHtmoP6RhIu7qE27E/p5N77OM+RkMMxJnBgwOvBlzE4EW9AvuaFddKFUOoeQ+31vuHBcdbDppjhm - W9hwHWn1N1Df3YKS1mqEiAMQTOCXnkWY5BRq2mu4Vaw0g+V1O8KSBhhOEFsZ8r5vtAMdky9RrynkJEl1 - kSh8nYjclngIGq8gtTEV7SPL6DBY8fn7JjZIT+GSQZoT8Gv5Pv7iPLdmoh+vRiWoUORwkuSGKBK+iszn - GVAabdwqvZMUZKSHdZsL4SVDHgE7EWUDdH5TCnRGFRq19/CkpwBx1ReRXBcD3YwdOlIsW7ByytOJmQjC - JHsE5x+KXaeLjiCxlg/9lBql/VmQSPMR/zQULYqP+LbAQEeKVU+7MERYsbgQ8sgrOCHyFQaJDiO3OQG3 - GiKQUHOJk+RLEyFqzSBvEgr2Xj/nxjD7iQkWUmRgnsojCBIdXAgSHSIP+SKo0BfXKkKR/SIFyjEZSmVF - yHqXAkFDLHREoCX/hoYIaNcWESh2V7iQN0gvbdAYWXBzDEws4m5TJtJJUNgYj4LmOzt3LHanmwjadgWs - bd68K/gfNnaFjD2CM/lyu1hcvr3fw/shl8u3jiW1W71xUmRmj2l2025hL0yrFEwrFIxeVq0uDrZ5K+0J - UxS14Xe784c3zuOdzOzODhR09RwXysyBwjZ6h3QPAX8RtNF+gs71o6mdvQEp0jQej8f7A8h4nb60ARZQ - AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s + Zipm3uYUTU10YZAtpqGpC01UqBCl6EWFdtGpTZ1zTjfcInOZ2pw6L+Blqbuc43am355zttRA6AcfnhfP + +X44v+85PHbCHiiTL1dq5NFVmt/hYg1FTppDyp5aOrpyiI58ojacE6lq/GPeHuBCeyfi8YBq2UqvGgwG + t8W+CYttl1UrC42fi1YUfzIjvmrcwc+R+XijnokqVy+z4aEZF7SzDLRmBpoZBuppJ5S/NtE5ZscmA7SN + Uyj+MIu0ZwbqH0m4uJPacDihn3Pj6xxDTgbDnMSJfuMmvow5iGAL+kU3tAsulMrMCLnf+4YLx0mDTTfF + MdvC+utIq7uBuq5mlLRIESIOQDCBX3oWYZJTqG6r5lax0QyW1hwIS+pnOEFsZcj73tF2tE++RJ2mkJMk + 1Uai8HUicpvjIWi4gtSGVLSNLKHdYMPn7xtYJz2FSwZoTsCv4fv4i/Pcmok+vBqVoEKZw0mS66NI+Coy + n2dAZbRzq/RMUpCTHtbsLoSXDHoE7ESU99P5jSnQGdVo0N5DWXcB4qQXkVwbA92MAzpSLFuwasrTiYUI + wiR7BOcfil2ni44gsYYP/dQQSvuyIJHlI/5pKJqVH/FtnoGOFDs07cIgYdnqQsgjr+CEyFcYJDqM3KYE + 3KqPQEL1JU6SL0uEqCWDvEko2Hu92Y1h9hMTrKTIwDy1RxAkOjgfJDpEHvJFUKEvrlWEIvtFClRjcpTK + i5D1LgWC+ljoiEBL/g0NEdCuLSJQ7q5wIW+AXlynMTLv5uifWMDdxkykk6CwIR4FTXd27lgcTjcRtO4K + WNucZVfwP+zsChl7BGfyFQ6xuGx7v4f3Q6FQbB1LarN546TIzG7T7IbDyl6YViiYlikYvazYXBxs8zba + E6Yoat3vdscPb5zHO5nZlR0o6Ow+LpRbAoWt9A7pHgL+Imil/QQda0dTO3oCUmRpPB6P9wfHCJ28kSNT + iAAAAABJRU5ErkJggg==