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-01-15 23:05:53 +09:00
parent cd902327c8
commit 913ae6b261
28 changed files with 5278 additions and 2059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
SubProject/FPJ0000/Project/fProjectData.cs
View File

@@ -167,27 +167,29 @@ namespace FPJ0000
void UpdateUserList()
{
//담당자목록 - 사용자목록으로 처리한다.
this.dSComm.UserList.Clear();
var dt = new DSComm.UserListDataTable();
var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter();
var processStr = "%";
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
var newdrnone = dSComm.UserList.NewUserListRow();
var newdrnone = dt.NewUserListRow();
newdrnone.ID = string.Empty;
newdrnone.Name = "(없음)";
newdrnone.IDName = "(없음)";
newdrnone.Outdate = null;
newdrnone.Description = string.Empty;
dSComm.UserList.AddUserListRow(newdrnone);
dt.AddUserListRow(newdrnone);
foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t => t.outdate))
var orderlist = dtUserList.OrderBy(t => t.outdate).ToList();
foreach (dsReport.ProcessUserListRow dr in orderlist)
{
if (String.IsNullOrEmpty(dr.outdate) == false)
{
var odt = DateTime.Parse(dr.outdate);
//if (odt <= DateTime.Now) continue; //퇴사자제외 211221
}
var newdr = this.dSComm.UserList.NewUserListRow();
//if (String.IsNullOrEmpty(dr.outdate) == false)
//{
// var odt = DateTime.Parse(dr.outdate);
// if (odt <= DateTime.Now) continue; //퇴사자제외 211221
//}
var newdr = dt.NewUserListRow();
newdr.ID = dr.id;
newdr.Name = dr.name;
newdr.IDName = $"({dr.id}) {dr.name}";
@@ -196,8 +198,11 @@ namespace FPJ0000
else newdr.Description = $"퇴사({dr.outdate})";
//string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
//this.cmbUser.Items.Add(cmbdata);
this.dSComm.UserList.AddUserListRow(newdr);
//Console.WriteLine($"{dr.id},{dr.name}");
dt.AddUserListRow(newdr);
}
this.dSComm.UserList.Clear();
this.dSComm.UserList.Merge(dt);
this.dSComm.UserList.AcceptChanges();
}
void SelectUserList(string uid)
@@ -259,16 +264,12 @@ namespace FPJ0000
"dbo.getUserName2(epanelid,userhw2) as name_epanel," +
"dbo.getUserName2(softwareid,usersub) as name_software";
if (cmbChampion.SelectedIndex < 1)
{
if (dr.userManager.isEmpty() == false) dr.name_champion = $"({dr.userManager})";
}
else dr.name_champion = cmbChampion.Text.Substring(cmbChampion.Text.IndexOf("(") + 1);
//if (cmbChampion.SelectedIndex < 1)
//{
// if (dr.userManager.isEmpty() == false) dr.name_champion = $"({dr.userManager})";
//}
//else dr.name_champion = cmbChampion.Text.Substring(cmbChampion.Text.IndexOf("(") + 1);
//dr.name_champion = dr.championid.isEmpty() ? "(" + dr.userManager + ")" : FCOMMON.DBM.use
//}
//else
//{