Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
chi
2023-10-30 20:03:36 +09:00
parent 0e23ef4d09
commit adee51915b
10 changed files with 1978 additions and 1661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Project/Dialog/fLogin.cs
View File

@@ -55,9 +55,9 @@ namespace Project.Dialog
//마지막으로사용한 부서이름 //마지막으로사용한 부서이름
if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1; if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1;
else this.cmbDept.Text = Pub.setting.lastdpt; else this.cmbDept.Text = Pub.setting.lastdpt;
if(cmbDept.SelectedIndex == -1 && Pub.setting.lastgcode.isEmpty()==false) if (cmbDept.SelectedIndex == -1 && Pub.setting.lastgcode.isEmpty() == false)
{ {
var dr =grplist.Where(t => t.gcode.Equals(Pub.setting.lastgcode)).FirstOrDefault(); var dr = grplist.Where(t => t.gcode.Equals(Pub.setting.lastgcode)).FirstOrDefault();
if (dr != null) cmbDept.Text = dr.dept; if (dr != null) cmbDept.Text = dr.dept;
} }
//foreach (var item in dlist) //foreach (var item in dlist)
@@ -72,7 +72,7 @@ namespace Project.Dialog
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
DateTime dt = DateTime.Now;
if (this.tbID.Text.isEmpty()) if (this.tbID.Text.isEmpty())
{ {
tbID.Focus(); tbID.Focus();
@@ -121,26 +121,46 @@ namespace Project.Dialog
//var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter(); //var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter();
try try
{ {
if(id.ToUpper().Equals("DEV") == false) if (id.ToUpper().Equals("DEV") == false)
{ {
var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')"); var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
//var userGcode = ta.GetUserLoginCheck(id, encpass).ToString(); var drGrpUser = taGrpUser.GetbyID(gCode, id).FirstOrDefault();
if (String.IsNullOrEmpty(userGcode)) if(drGrpUser == null)
{ {
Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요"); Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
tbPW.SelectAll(); tbPW.SelectAll();
tbPW.Focus(); tbPW.Focus();
return; return;
} }
else if (userGcode.StartsWith("@ERR")) else if(drGrpUser.level == 0)
{ {
Util.MsgE("접속실패\n\n" + userGcode.Substring(3)); Util.MsgE($"해당 계정이 활성화되지 않았습니다\n계정 담당자 문의하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
//사용자테이블에서 암호를 확인합니다.
var taUser = new dsMSSQLTableAdapters.UsersTableAdapter();
var drUser = taUser.GetID(id).FirstOrDefault();
if(drUser == null)
{
Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
else if(drUser.password.Equals(encpass)==false)
{
Util.MsgE($"암호가 일치하지 않습니다.\n암호를 분실했을 경우에는 계정담당자에 초기화를 요청 하세요");
tbPW.SelectAll();
tbPW.Focus();
return; return;
} }
//이사용자의 부서 코드확인 //이사용자의 부서 코드확인
var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter(); //var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow; //var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
if (MaxVerstion.isEmpty() == false) if (MaxVerstion.isEmpty() == false)
@@ -154,20 +174,20 @@ namespace Project.Dialog
} }
} }
FCOMMON.info.Login.no = userdr.id; FCOMMON.info.Login.no = drUser.id;
FCOMMON.info.Login.nameK = userdr.name; FCOMMON.info.Login.nameK = drUser.name;
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
FCOMMON.info.Login.level = userdr.level; FCOMMON.info.Login.level = drGrpUser.level;
FCOMMON.info.Login.email = userdr.email; FCOMMON.info.Login.email = drUser.email;
FCOMMON.info.Login.nameE = userdr.nameE; FCOMMON.info.Login.nameE = drUser.nameE;
FCOMMON.info.Login.hp = userdr.hp; FCOMMON.info.Login.hp = drUser.hp;
FCOMMON.info.Login.tel = userdr.tel; FCOMMON.info.Login.tel = drUser.tel;
FCOMMON.info.Login.title = userdr.dept + "(" + userdr.grade + ")"; FCOMMON.info.Login.title = drUser.dept + "(" + drUser.grade + ")";
FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); //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 + "'"); var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gCode;// gcode; FCOMMON.info.Login.gcode = gCode;// gcode;
FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자" : userdr.processs; FCOMMON.info.Login.process = drUser.id == "dev" ? "개발자" : drGrpUser.Process;
FCOMMON.info.Login.permission = 0; FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm); FCOMMON.info.Login.gpermission = int.Parse(gperm);
//FCOMMON.info.datapath = Pub.setting.SharedDataPath; //FCOMMON.info.datapath = Pub.setting.SharedDataPath;
@@ -178,9 +198,9 @@ namespace Project.Dialog
} }
else else
{ {
if(tbPW.Text.Equals("123")==false) if (tbPW.Text.Equals("123") == false)
{ {
return ; return;
} }
FCOMMON.info.Login.no = "dev"; FCOMMON.info.Login.no = "dev";
FCOMMON.info.Login.nameK = "개발자"; FCOMMON.info.Login.nameK = "개발자";
@@ -222,6 +242,7 @@ namespace Project.Dialog
MakeAutoJobReportByAuto(); MakeAutoJobReportByAuto();
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
FCOMMON.info.Login.loginusetime = (DateTime.Now - dt).TotalMilliseconds;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -412,20 +433,27 @@ namespace Project.Dialog
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{ {
if(System.Diagnostics.Debugger.IsAttached==false) //if (System.Diagnostics.Debugger.IsAttached == false)
{ //{
Util.MsgE("이 기능은 준비중 입니다"); // Util.MsgE("이 기능은 준비중 입니다");
return; // return;
} //}
var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow; var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow;
FCOMMON.info.Login.gcode = gCode;
FCOMMON.info.Login.no = "new";
FCOMMON.info.Login.dept = this.cmbDept.Text;
var dlg = FCOMMON.Util.MsgQ($"현재 선택된 그룹[{this.cmbDept.Text}]의 사용자를 추가할까요?\n" + var dlg = FCOMMON.Util.MsgQ($"현재 선택된 그룹[{this.cmbDept.Text}]의 사용자를 추가할까요?\n" +
"추가된 사용자는 담당자로부터 승인 완료되어야 접속이 가능 합니다\n" + "추가된 사용자는 담당자로부터 승인 완료되어야 접속이 가능 합니다\n" +
"사용자 추가 후 그룹담당자에게 문의 하시기 바랍니다"); "사용자 추가 후 그룹담당자에게 문의 하시기 바랍니다");
if (dlg != DialogResult.Yes) return; if (dlg != DialogResult.Yes) return;
var f = new _Common.fAddNewUser(cmbDept.Text, string.Empty,0);//.fUserInfo(); var f = new _Common.fAddNewUser(cmbDept.Text, string.Empty, 0);//.fUserInfo();
dlg = f.ShowDialog();
f.ShowDialog(); if(dlg == DialogResult.OK)
{
tbID.Text = f.tbId.Text.Trim();
}
} }
} }
} }

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다. // 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("23.10.26.2000")] [assembly: AssemblyVersion("23.10.30.2000")]
[assembly: AssemblyFileVersion("23.10.26.2000")] [assembly: AssemblyFileVersion("23.10.30.2000")]

2
Project/_Common/fAddNewUser.Designer.cs generated
View File

@@ -450,7 +450,6 @@
} }
#endregion #endregion
private System.Windows.Forms.TextBox tbId;
private System.Windows.Forms.TextBox tbNameK; private System.Windows.Forms.TextBox tbNameK;
private System.Windows.Forms.TextBox tbDept; private System.Windows.Forms.TextBox tbDept;
private System.Windows.Forms.TextBox tbGrade; private System.Windows.Forms.TextBox tbGrade;
@@ -471,5 +470,6 @@
private System.Windows.Forms.CheckBox chkUseState; private System.Windows.Forms.CheckBox chkUseState;
private System.Windows.Forms.CheckBox chkExceptHoly; private System.Windows.Forms.CheckBox chkExceptHoly;
private System.Windows.Forms.Button btChangePW; private System.Windows.Forms.Button btChangePW;
public System.Windows.Forms.TextBox tbId;
} }
} }

65
Project/_Common/fAddNewUser.cs
View File

@@ -76,7 +76,7 @@ namespace Project._Common
{ {
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account)); int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account));
if(this.deflevel < 1) if (this.deflevel < 1)
{ {
chkExceptHoly.Visible = false; chkExceptHoly.Visible = false;
chkJobReport.Visible = false; chkJobReport.Visible = false;
@@ -142,7 +142,7 @@ namespace Project._Common
private void button2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
this.Validate(); this.Validate();
var db = new EEEntitiesMain(); //var db = new EEEntitiesMain();
//해당 그룹에 데이터를 추가한다. //해당 그룹에 데이터를 추가한다.
//var drDept = db.UserGroup.Where(t => t.dept == tbDept.Text).FirstOrDefault(); //var drDept = db.UserGroup.Where(t => t.dept == tbDept.Text).FirstOrDefault();
@@ -151,24 +151,32 @@ namespace Project._Common
// FCOMMON.Util.MsgE("해당 부서정보가 존재하지 않습니다\n\n부서를 신규로 추가할 수는 없습니다\n관리자에 문의하세요"); // FCOMMON.Util.MsgE("해당 부서정보가 존재하지 않습니다\n\n부서를 신규로 추가할 수는 없습니다\n관리자에 문의하세요");
// return; // return;
//} //}
//해당 그룹에 해당 사용자가 존재하는지 확이한다.
var gcode = FCOMMON.info.Login.gcode; var gcode = FCOMMON.info.Login.gcode;
var uid = (p_id.isEmpty() ? tbId.Text.Trim() : p_id); var uid = (p_id.isEmpty() ? tbId.Text.Trim() : p_id);
var drGuser = db.EETGW_GroupUser.Where(t => t.gcode == gcode && t.uid == uid).FirstOrDefault(); //if (FCOMMON.info.Login.no.isEmpty()) FCOMMON.info.Login.no = uid;
//해당 그룹에 해당 사용자가 존재하는지 확이한다.
var taUserGrp = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
var dtUserGrp = taUserGrp.GetData(gcode);
var drGuser = dtUserGrp.Where(t => t.uid == uid).FirstOrDefault();
if (drGuser != null) if (drGuser != null)
{ {
drGuser.Process = this.tbProcess.Text.Trim(); drGuser.Process = this.tbProcess.Text.Trim();
drGuser.state = this.tbState.Text.Trim(); drGuser.state = this.tbState.Text.Trim();
if (deflevel > 0)
if(deflevel > 0)
{ {
drGuser.useJobReport = chkJobReport.Checked; drGuser.useJobReport = chkJobReport.Checked;
drGuser.useUserState = chkUseState.Checked; drGuser.useUserState = chkUseState.Checked;
drGuser.exceptHoly = chkExceptHoly.Checked; drGuser.exceptHoly = chkExceptHoly.Checked;
} }
if (drGuser.level == 0)
FCOMMON.Util.MsgI($"이미 존재하는 사용자 정보입니다\n"+"기존 정보가 업데이트 됩니다"); {
FCOMMON.Util.MsgE($"이미 존재하는 사용자 정보입니다\n"+
"아직 관리자 승인이 되지 않은 상태입니다\n"+
"계정관리자 통해서 계정을 활성화를 하세요");
}
else FCOMMON.Util.MsgI($"이미 존재하는 사용자 정보입니다\n" + "기존 정보가 업데이트 됩니다");
} }
else else
{ {
@@ -179,7 +187,7 @@ namespace Project._Common
return; return;
} }
drGuser = new EETGW_GroupUser(); drGuser = dtUserGrp.NewEETGW_GroupUserRow();
drGuser.wuid = FCOMMON.info.Login.no; drGuser.wuid = FCOMMON.info.Login.no;
drGuser.wdate = DateTime.Now; drGuser.wdate = DateTime.Now;
drGuser.gcode = gcode; drGuser.gcode = gcode;
@@ -191,16 +199,18 @@ namespace Project._Common
drGuser.useJobReport = this.chkJobReport.Checked; drGuser.useJobReport = this.chkJobReport.Checked;
drGuser.useUserState = this.chkUseState.Checked; drGuser.useUserState = this.chkUseState.Checked;
drGuser.exceptHoly = this.chkExceptHoly.Checked; drGuser.exceptHoly = this.chkExceptHoly.Checked;
db.EETGW_GroupUser.Add(drGuser);
dtUserGrp.AddEETGW_GroupUserRow(drGuser);
} }
//사용자 목록에 없다면 추가한다 //사용자 목록에 없다면 추가한다
var drUser = db.Users.SingleOrDefault(t => t.id == uid); var tauser = new dsMSSQLTableAdapters.UsersTableAdapter();
var dtuser = tauser.GetID(uid);
var drUser = dtuser.FirstOrDefault();
if (drUser == null) if (drUser == null)
{ {
drUser = new Users(); drUser = dtuser.NewUsersRow();
drUser.wuid = FCOMMON.info.Login.no; drUser.wuid = FCOMMON.info.Login.no;
drUser.wdate = DateTime.Now; drUser.wdate = DateTime.Now;
drUser.gcode = gcode; drUser.gcode = gcode;
@@ -219,12 +229,14 @@ namespace Project._Common
drUser.memo = tbMemo.Text; drUser.memo = tbMemo.Text;
drUser.processs = tbProcess.Text; drUser.processs = tbProcess.Text;
drUser.grade = tbGrade.Text.Trim(); drUser.grade = tbGrade.Text.Trim();
db.Users.Add(drUser); dtuser.AddUsersRow(drUser);
} }
else else
{ {
if(string.IsNullOrEmpty(drUser.password) || newpassword.isEmpty()==false) if (string.IsNullOrEmpty(drUser.password)) //암호가 아에없다면 기본 0으로 설정
drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
else if (newpassword.isEmpty() == false)
drUser.password = newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; drUser.password = newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
drUser.name = tbNameK.Text.Trim(); drUser.name = tbNameK.Text.Trim();
@@ -238,12 +250,22 @@ namespace Project._Common
drUser.memo = tbMemo.Text; drUser.memo = tbMemo.Text;
drUser.processs = tbProcess.Text; drUser.processs = tbProcess.Text;
drUser.grade = tbGrade.Text.Trim(); drUser.grade = tbGrade.Text.Trim();
drUser.EndEdit();
} }
try try
{ {
db.SaveChanges(); var cnt1 = taUserGrp.Update(dtUserGrp);
var cnt2 = tauser.Update(dtuser);
if(cnt1 +cnt2 != 2)
{
FCOMMON.Util.MsgE("저장에 문제가 생겼습니다\n관리자에게 문의 하시기 바랍니다");
}
taUserGrp.Dispose();
tauser.Dispose();
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
} }
catch (Exception ex) catch (Exception ex)
@@ -263,13 +285,13 @@ namespace Project._Common
{ {
} }
string newpassword = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값 0 string newpassword = "";//"B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값 0
private void btChangePW_Click(object sender, EventArgs e) private void btChangePW_Click(object sender, EventArgs e)
{ {
var f = new fNewPassword(this.tbId.Text); var f = new fNewPassword(this.tbId.Text);
if (f.ShowDialog() == DialogResult.OK) if (f.ShowDialog() == DialogResult.OK)
{ {
var opass = Pub.MakePasswordEnc( f.tbPassO.Text); var opass = Pub.MakePasswordEnc(f.tbPassO.Text);
//해당 그룹에 해당 사용자가 존재하는지 확이한다. //해당 그룹에 해당 사용자가 존재하는지 확이한다.
var gcode = FCOMMON.info.Login.gcode; var gcode = FCOMMON.info.Login.gcode;
@@ -278,13 +300,14 @@ namespace Project._Common
var drUser = db.Users.SingleOrDefault(t => t.id == uid); var drUser = db.Users.SingleOrDefault(t => t.id == uid);
if (drUser != null) if (drUser != null)
{ {
if (opass.Equals(drUser.password)==false) if (opass.Equals(drUser.password) == false)
{ {
Util.MsgE("기존 암호가 일치하지 않습니다"); Util.MsgE("기존 암호가 일치하지 않습니다");
return; return;
} }
} }
else { else
{
Util.MsgE("사용자 정보가 없어 처리할 수 없습니다"); Util.MsgE("사용자 정보가 없어 처리할 수 없습니다");
return; return;
} }

2981
Project/dsMSSQL.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

437
Project/dsMSSQL.xsd
View File

File diff suppressed because it is too large Load Diff

35
Project/fMain.Designer.cs generated
View File

@@ -154,6 +154,7 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.sbLoginUseTime = new System.Windows.Forms.ToolStripStatusLabel();
this.cmTab.SuspendLayout(); this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
@@ -203,7 +204,8 @@
this.lbSvr, this.lbSvr,
this.sbBCD, this.sbBCD,
this.sbLogin, this.sbLogin,
this.toolStripStatusLabel1}); this.toolStripStatusLabel1,
this.sbLoginUseTime});
this.statusStrip1.Location = new System.Drawing.Point(1, 622); this.statusStrip1.Location = new System.Drawing.Point(1, 622);
this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1094, 22); this.statusStrip1.Size = new System.Drawing.Size(1094, 22);
@@ -486,21 +488,21 @@
// 목록ToolStripMenuItem1 // 목록ToolStripMenuItem1
// //
this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1";
this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24);
this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Text = "목록";
this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click); this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click);
// //
// 자동입력ToolStripMenuItem // 자동입력ToolStripMenuItem
// //
this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem"; this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem";
this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.자동입력ToolStripMenuItem.Text = "자동입력"; this.자동입력ToolStripMenuItem.Text = "자동입력";
this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click); this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click);
// //
// 양식ToolStripMenuItem // 양식ToolStripMenuItem
// //
this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem"; this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem";
this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.양식ToolStripMenuItem.Text = "양식"; this.양식ToolStripMenuItem.Text = "양식";
this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click);
// //
@@ -1118,7 +1120,7 @@
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true; this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(1062, 594); this.tabControl1.Size = new System.Drawing.Size(1065, 594);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34; this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -1135,9 +1137,9 @@
this.toolStripButton1, this.toolStripButton1,
this.toolStripButton2, this.toolStripButton2,
this.toolStripButton3}); this.toolStripButton3});
this.toolStrip1.Location = new System.Drawing.Point(1063, 28); this.toolStrip1.Location = new System.Drawing.Point(1066, 28);
this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(32, 594); this.toolStrip1.Size = new System.Drawing.Size(29, 594);
this.toolStrip1.TabIndex = 35; this.toolStrip1.TabIndex = 35;
this.toolStrip1.Text = "toolStrip1"; this.toolStrip1.Text = "toolStrip1";
// //
@@ -1146,7 +1148,7 @@
this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
this.toolStripMenuItem8.Name = "toolStripMenuItem8"; this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem8.Text = "업무일지"; this.toolStripMenuItem8.Text = "업무일지";
this.toolStripMenuItem8.ToolTipText = "업무일지"; this.toolStripMenuItem8.ToolTipText = "업무일지";
this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
@@ -1156,7 +1158,7 @@
this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image")));
this.toolStripMenuItem7.Name = "toolStripMenuItem7"; this.toolStripMenuItem7.Name = "toolStripMenuItem7";
this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem7.Text = "구매신청"; this.toolStripMenuItem7.Text = "구매신청";
this.toolStripMenuItem7.ToolTipText = "구매신청"; this.toolStripMenuItem7.ToolTipText = "구매신청";
this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click);
@@ -1166,7 +1168,7 @@
this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
this.toolStripMenuItem6.Name = "toolStripMenuItem6"; this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem6.Text = "프로젝트"; this.toolStripMenuItem6.Text = "프로젝트";
this.toolStripMenuItem6.ToolTipText = "프로젝트"; this.toolStripMenuItem6.ToolTipText = "프로젝트";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
@@ -1178,7 +1180,7 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(29, 20); this.toolStripButton1.Size = new System.Drawing.Size(26, 20);
this.toolStripButton1.Text = "구매진행상황"; this.toolStripButton1.Text = "구매진행상황";
this.toolStripButton1.ToolTipText = "구매진행상황"; this.toolStripButton1.ToolTipText = "구매진행상황";
this.toolStripButton1.Visible = false; this.toolStripButton1.Visible = false;
@@ -1190,7 +1192,7 @@
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(29, 20); this.toolStripButton2.Size = new System.Drawing.Size(26, 20);
this.toolStripButton2.Text = "품목정보"; this.toolStripButton2.Text = "품목정보";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
// //
@@ -1200,11 +1202,17 @@
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(29, 20); this.toolStripButton3.Size = new System.Drawing.Size(26, 20);
this.toolStripButton3.Text = "toolStripButton3"; this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.ToolTipText = "휴가신청";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
// //
// sbLoginUseTime
//
this.sbLoginUseTime.Name = "sbLoginUseTime";
this.sbLoginUseTime.Size = new System.Drawing.Size(68, 17);
this.sbLoginUseTime.Text = "LOGINTIME";
//
// fMain // fMain
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1361,6 +1369,7 @@
private System.Windows.Forms.ToolStripMenuItem 개인별근태집계표ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 개인별근태집계표ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 연차현황ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 연차현황ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 대쉬보드ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 대쉬보드ToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel sbLoginUseTime;
} }
} }

2
Project/fMain.cs
View File

@@ -220,6 +220,8 @@ namespace Project
FCOMMON.info.Login.gcode); FCOMMON.info.Login.gcode);
Pub.log.Add("Program Start"); Pub.log.Add("Program Start");
sbLoginUseTime.Text = "접속시간:"+FCOMMON.info.Login.loginusetime.ToString("N1") + "ms";
Func_RunStartForm(); Func_RunStartForm();
} }
void Func_RunStartForm() void Func_RunStartForm()

8
Project/fMain.resx
View File

@@ -452,14 +452,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
/U7m/E+5XP8/92TF/3lzYj/UzM7/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e /U7m/E+5XP8/92TF/3lzYj/UzMr/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
/4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3tzr/vV7o9blnWyHc /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3tzr9vV7o9blnWyHc
gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr
2d+jAdUG1LhtIjtQcP79BfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz 2d+jAdUG1LhtIjtQcP69+fX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
BQC8v6rH00jEYwAAAABJRU5ErkJggg== BQCz2KrByZltZQAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

1
SubProject/FCOMMON/Info.cs
View File

@@ -50,6 +50,7 @@ namespace FCOMMON
public string gcode; public string gcode;
public int gpermission; public int gpermission;
public int permission; public int permission;
public double loginusetime;
} }
public static Boolean NotShowJobReportview = false; public static Boolean NotShowJobReportview = false;