This commit is contained in:
chi
2022-12-15 08:27:20 +09:00
parent 742b3f5c5e
commit b7092ab514
15 changed files with 4128 additions and 2664 deletions

View File

@@ -28,6 +28,10 @@ namespace FPJ0000
}
private void fProjectData_Load(object sender, EventArgs e)
{
//사용자목록업데이트
UpdateUserList();
//상태
var dt_eetproc = FCOMMON.DBM.getCodeTable("10");
this.cmbProcess.DisplayMember = "Value";
@@ -53,6 +57,7 @@ namespace FPJ0000
this.cmbPart.DataSource = dt_part;
this.bs.DataSource = dr;
// this.cmbUser.SelectedValue = dr.championid;
//주간일지내역을 업데이트
@@ -95,9 +100,6 @@ namespace FPJ0000
btMailAddr.Enabled = false;
btSendMail.Enabled = false;
tabControl2.Enabled = false;
}
else
{
@@ -130,6 +132,58 @@ namespace FPJ0000
{
tbPath.ReadOnly = true;
}
}
void UpdateUserList()
{
//담당자목록 - 사용자목록으로 처리한다.
this.dSComm.UserList.Clear();
var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter();
var processStr = "%";
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t => t.outdate))
{
if (String.IsNullOrEmpty(dr.outdate) == false)
{
var odt = DateTime.Parse(dr.outdate);
//if (odt <= DateTime.Now) continue; //퇴사자제외 211221
}
var newdr = this.dSComm.UserList.NewUserListRow();
newdr.ID = dr.id;
newdr.Name = dr.name;
newdr.Outdate = dr.outdate;
if (dr.outdate.isEmpty()) newdr.Description = string.Empty;
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);
}
this.dSComm.UserList.AcceptChanges();
}
void SelectUserList(string uid)
{
}
bool checkDateValue()
{
foreach (Control ctl in panel2.Controls)
{
if (ctl is TextBox)
{
var tb = ctl as TextBox;
if (tb.Text.isEmpty()) continue;
if (DateTime.TryParse(tb.Text, out DateTime dt) == false)
{
FCOMMON.Util.MsgE($"다음 값은 날짜 형식이 아닙니다.\n입력값 : {tb.Text}\n\n정확한 날짜 데이터로 입력하세요\n" +
"예) 2000-01-01");
tb.Focus();
tb.SelectAll();
return false;
}
}
}
return true;
}
string oldsta = string.Empty;
@@ -140,6 +194,10 @@ namespace FPJ0000
this.dr.process = cmbProcess.Text;
this.dr.status = cmbState.Text;
this.dr.part = cmbPart.Text;
//날짜박스의 날짜데이터 검증
if (checkDateValue() == false) return;
//this.dr.category = cmbCate.Text;
//신규데이터일때에만 완료 자료를 처리한다.
@@ -377,7 +435,7 @@ namespace FPJ0000
else tbPath.Text = "\\" + tbPath.Text;
}
var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data","Project");
var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");
if (System.IO.Directory.Exists(serverpath) == false)
{
FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
@@ -519,5 +577,20 @@ namespace FPJ0000
{
}
private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
SelectDate(textBox7);
}
private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
SelectDate(textBox8);
}
private void linkLabel8_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
SelectDate(textBox9);
}
}
}