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

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

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

73
Project/_Common/fAddNewUser.cs
View File

@@ -75,11 +75,11 @@ namespace Project._Common
private void fUserInfo_Load(object sender, EventArgs e)
{
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;
chkJobReport.Visible = false;
chkJobReport.Visible = false;
chkUseState.Visible = false;
chkExceptHoly.Checked = false;
@@ -92,7 +92,7 @@ namespace Project._Common
chkJobReport.Enabled = curLevel > 4;
chkUseState.Enabled = curLevel > 4;
}
}
private void button1_Click(object sender, EventArgs e)
{
@@ -142,7 +142,7 @@ namespace Project._Common
private void button2_Click(object sender, EventArgs e)
{
this.Validate();
var db = new EEEntitiesMain();
//var db = new EEEntitiesMain();
//해당 그룹에 데이터를 추가한다.
//var drDept = db.UserGroup.Where(t => t.dept == tbDept.Text).FirstOrDefault();
@@ -151,24 +151,32 @@ namespace Project._Common
// FCOMMON.Util.MsgE("해당 부서정보가 존재하지 않습니다\n\n부서를 신규로 추가할 수는 없습니다\n관리자에 문의하세요");
// return;
//}
//해당 그룹에 해당 사용자가 존재하는지 확이한다.
var gcode = FCOMMON.info.Login.gcode;
var uid = (p_id.isEmpty() ? tbId.Text.Trim() : p_id);
var drGuser = db.EETGW_GroupUser.Where(t => t.gcode == gcode && t.uid == uid).FirstOrDefault();
//if (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)
{
drGuser.Process = this.tbProcess.Text.Trim();
drGuser.state = this.tbState.Text.Trim();
if(deflevel > 0)
if (deflevel > 0)
{
drGuser.useJobReport = chkJobReport.Checked;
drGuser.useUserState = chkUseState.Checked;
drGuser.exceptHoly = chkExceptHoly.Checked;
}
FCOMMON.Util.MsgI($"이미 존재하는 사용자 정보입니다\n"+"기존 정보가 업데이트 됩니다");
if (drGuser.level == 0)
{
FCOMMON.Util.MsgE($"이미 존재하는 사용자 정보입니다\n"+
"아직 관리자 승인이 되지 않은 상태입니다\n"+
"계정관리자 통해서 계정을 활성화를 하세요");
}
else FCOMMON.Util.MsgI($"이미 존재하는 사용자 정보입니다\n" + "기존 정보가 업데이트 됩니다");
}
else
{
@@ -179,7 +187,7 @@ namespace Project._Common
return;
}
drGuser = new EETGW_GroupUser();
drGuser = dtUserGrp.NewEETGW_GroupUserRow();
drGuser.wuid = FCOMMON.info.Login.no;
drGuser.wdate = DateTime.Now;
drGuser.gcode = gcode;
@@ -191,16 +199,18 @@ namespace Project._Common
drGuser.useJobReport = this.chkJobReport.Checked;
drGuser.useUserState = this.chkUseState.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)
{
drUser = new Users();
drUser = dtuser.NewUsersRow();
drUser.wuid = FCOMMON.info.Login.no;
drUser.wdate = DateTime.Now;
drUser.gcode = gcode;
@@ -219,13 +229,15 @@ namespace Project._Common
drUser.memo = tbMemo.Text;
drUser.processs = tbProcess.Text;
drUser.grade = tbGrade.Text.Trim();
db.Users.Add(drUser);
dtuser.AddUsersRow(drUser);
}
else
{
if(string.IsNullOrEmpty(drUser.password) || newpassword.isEmpty()==false)
drUser.password = newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
if (string.IsNullOrEmpty(drUser.password)) //암호가 아에없다면 기본 0으로 설정
drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
else if (newpassword.isEmpty() == false)
drUser.password = newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
drUser.name = tbNameK.Text.Trim();
drUser.nameE = tbNameE.Text.Trim();
@@ -238,12 +250,22 @@ namespace Project._Common
drUser.memo = tbMemo.Text;
drUser.processs = tbProcess.Text;
drUser.grade = tbGrade.Text.Trim();
drUser.EndEdit();
}
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;
}
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)
{
var f = new fNewPassword(this.tbId.Text);
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;
@@ -278,13 +300,14 @@ namespace Project._Common
var drUser = db.Users.SingleOrDefault(t => t.id == uid);
if (drUser != null)
{
if (opass.Equals(drUser.password)==false)
if (opass.Equals(drUser.password) == false)
{
Util.MsgE("기존 암호가 일치하지 않습니다");
return;
}
}
else {
else
{
Util.MsgE("사용자 정보가 없어 처리할 수 없습니다");
return;
}