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

migratino complete

Browse Source
This commit is contained in:
chi
2025-04-07 00:54:29 +09:00
parent 2b22ca9c51
commit 8ac3600ec1
158 changed files with 39098 additions and 21257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Project/_Common/fAddNewUser.cs
View File

@@ -34,9 +34,10 @@ namespace Project._Common
btChangePW.Enabled = true;
var db = new EEEntitiesMain();
var db_user = db.Users.Where(t => t.id == id).FirstOrDefault();
var db_guser = db.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == id).FirstOrDefault();
var taUser = new dsMSSQLTableAdapters.UsersTableAdapter();// EEEntitiesMain();
var taGUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
var db_user = taUser.GetID(id).FirstOrDefault();// db.Users.Where(t => t.id == id).FirstOrDefault();
var db_guser = taGUser.GetbyID(FCOMMON.info.Login.gcode, id).FirstOrDefault();// db.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == id).FirstOrDefault();
if (db_user != null)
{
tbNameK.Text = db_user.name;
@@ -57,9 +58,9 @@ namespace Project._Common
tbState.Text = db_guser.state;
//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.chkJobReport.Checked = (db_guser.IsuseJobReportNull() ? false : (bool)db_guser.useJobReport);
this.chkUseState.Checked = (db_guser.IsuseUserStateNull() ? false : (bool)db_guser.useUserState);
this.chkExceptHoly.Checked = (db_guser.IsexceptHolyNull() ? false : (bool)db_guser.exceptHoly);
}
this.Text = "사용자 정보 변경";
@@ -108,8 +109,8 @@ namespace Project._Common
return;
}
var db = new EEEntitiesMain();
var dr_user = db.Users.Where(t => t.id == id).FirstOrDefault();
var db = new dsMSSQLTableAdapters.UsersTableAdapter();// EEEntitiesMain();
var dr_user = db.GetID(id).FirstOrDefault();//.Where(t => t.id == id).FirstOrDefault();
if (dr_user == null)
{
FCOMMON.Util.MsgE("등록된 자료가 없습니다");
@@ -132,7 +133,8 @@ namespace Project._Common
//부서가잇다면 해당 부서에서 해당 사용자의 공정을 찾는다
if (tbDept.Text.isEmpty() == false)
{
var drGrp = db.vGroupUser.Where(t => t.id == id).FirstOrDefault();
var tagGUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
var drGrp = tagGUser.GetOnlyID(id).FirstOrDefault();// db.vGroupUser.Where(t => t.id == id).FirstOrDefault();
if (drGrp != null)
{
tbProcess.Text = drGrp.processs;
@@ -175,18 +177,19 @@ namespace Project._Common
if (drGuser.level == 0)
{
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account));
if(curLevel >= 5)
if (curLevel >= 5)
{
FCOMMON.Util.MsgI($"해당 계정이 활성화 됩니다.");
drGuser.level = 1;
}
else {
else
{
FCOMMON.Util.MsgE($"이미 존재하는 사용자 정보입니다\n" +
"아직 관리자 승인이 되지 않은 상태입니다\n" +
"계정관리자 통해서 계정을 활성화를 하세요");
}
}
else FCOMMON.Util.MsgI($"이미 존재하는 사용자 정보입니다\n" + "기존 정보가 업데이트 됩니다");
}
@@ -271,7 +274,7 @@ namespace Project._Common
var cnt1 = taUserGrp.Update(dtUserGrp);
var cnt2 = tauser.Update(dtuser);
if(cnt1 +cnt2 != 2)
if (cnt1 + cnt2 != 2)
{
FCOMMON.Util.MsgE("저장에 문제가 생겼습니다\n관리자에게 문의 하시기 바랍니다");
}
@@ -310,8 +313,8 @@ namespace Project._Common
//해당 그룹에 해당 사용자가 존재하는지 확이한다.
var gcode = FCOMMON.info.Login.gcode;
var uid = tbId.Text;
var db = new EEEntitiesMain();
var drUser = db.Users.SingleOrDefault(t => t.id == uid);
var db = new dsMSSQLTableAdapters.UsersTableAdapter();// EEEntitiesMain();
var drUser = db.GetID(uid).FirstOrDefault();// .Users.SingleOrDefault(t => t.id == uid);
if (drUser != null)
{
if (curLevel < 5 && opass.Equals(drUser.password) == false)

1
Project/_Common/fUserInfo.Designer.cs generated
View File

@@ -336,7 +336,6 @@
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;

33
Project/_Common/fUserInfo.cs
View File

@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace Project._Common
{
public partial class fUserInfo : fBase
public partial class fUserInfo : fBase
{
public fUserInfo()
{
@@ -22,7 +22,7 @@ namespace Project._Common
private void fUserInfo_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.ta.FillID(this.dsMSSQL.Users,FCOMMON.info.Login.no);
this.ta.FillID(this.dsMSSQL.Users, FCOMMON.info.Login.no);
dr = this.dsMSSQL.Users.Rows[0] as dsMSSQL.UsersRow;
tbKJPath.Text = FCOMMON.DBM.getPathKJ(FCOMMON.info.Login.dept);
tbKJPath.Tag = tbKJPath.Text;
@@ -31,8 +31,8 @@ namespace Project._Common
//this.bs.Filter = "id='" + FCOMMON.info.Login.no + "'";
//공정은 usergroup에서 찾는다.
var db = new EEEntitiesMain();
var drGroupUser = db.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == FCOMMON.info.Login.no).FirstOrDefault();
var db = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();// EEEntitiesMain();
var drGroupUser = db.GetbyID(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no).FirstOrDefault();//).EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == FCOMMON.info.Login.no).FirstOrDefault();
if (drGroupUser != null)
this.tbProcess.Text = drGroupUser.Process;
else this.tbProcess.Text = string.Empty;
@@ -97,19 +97,20 @@ namespace Project._Common
this.bs.EndEdit();
var db2 = new EEEntitiesMain();
var drUserGr = db2.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == FCOMMON.info.Login.no).FirstOrDefault();
if(dr != null)
var db2 = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();// EEEntitiesMain();
var drUserGr = db2.GetbyID(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no).FirstOrDefault();// .EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == FCOMMON.info.Login.no).FirstOrDefault();
if (dr != null)
{
drUserGr.Process = this.tbProcess.Text;
db2.SaveChanges();
drUserGr.EndEdit();
db2.Update(drUserGr);//
}
// dr.processs = tbProcess.Text;
// dr.EndEdit();
// dr.processs = tbProcess.Text;
// dr.EndEdit();
try
{
if (tbKJPath.Enabled)
@@ -125,14 +126,14 @@ namespace Project._Common
}
var cnt = this.ta.Update(this.dsMSSQL.Users);
if(cnt == 1)
if (cnt == 1)
{
Util.MsgI(string.Format("{0}건의 자료가 업데이트 됨", cnt));
DialogResult = System.Windows.Forms.DialogResult.OK;
}
}
else
Util.MsgE(string.Format("{0}건의 자료가 업데이트 됨", cnt));
}
catch (Exception ex)
{

19
Project/_Common/fUserList.cs
View File

@@ -84,8 +84,8 @@ namespace Project._Common
btAdd.Enabled = curLevel >= 5;
//부서목록 업데이트
var db = new EEEntitiesMain();
var GrpList = db.UserGroup.Where(t => t.gcode != null && t.permission != null && t.gcode != "" && t.permission > 0);
var db = new dsMSSQLTableAdapters.UserGroupTableAdapter();// EEEntitiesMain();
var GrpList = db.GetData();//.UserGroup.Where(t => t.gcode != null && t.permission != null && t.gcode != "" && t.permission > 0);
this.cmbdept.Items.Clear();
@@ -323,12 +323,15 @@ namespace Project._Common
if (dlg != DialogResult.Yes) return;
//그룹사용자목록에서 삭제만 하면 됨
var db = new EEEntitiesMain();
var dr_user = db.EETGW_GroupUser.Where(t => t.uid == dr.id).FirstOrDefault();
if (dr_user != null) db.EETGW_GroupUser.Remove(dr_user);
var cnt = db.SaveChanges();
FCOMMON.Util.MsgI($"{cnt}건의 자료가 변경 되었습니다");
var db = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();// EEEntitiesMain();
var dr_user = db.GetbyID(dr.gcode, dr.id).FirstOrDefault();
//var dr_user = db.EETGW_GroupUser.Where(t => t.uid == dr.id).FirstOrDefault();
if (dr_user != null)
{
dr_user.Delete();// db.EETGW_GroupUser.Remove(dr_user);
var cnt = db.Update(dr_user);
FCOMMON.Util.MsgI($"{cnt}건의 자료가 삭제 되었습니다");
}
RefreshList();
}
}