간트차트 변경

This commit is contained in:
chi
2022-02-01 15:36:13 +09:00
parent 4a43b30973
commit f2114194d3
15 changed files with 939 additions and 380 deletions

View File

@@ -46,7 +46,7 @@ namespace FPJ0000.OtConfirm
{
this.Text = "휴가신청 추가";
cmbUser.Text = $"{FCOMMON.info.Login.nameK}({FCOMMON.info.Login.no})";
//tbProcess.Text = FCOMMON.info.Login.process;
//tbTel.Text = FCOMMON.info.Login.tel;
}
@@ -54,10 +54,10 @@ namespace FPJ0000.OtConfirm
{
this.Text = "휴가신청 편집";
cmbUser.Text = $"{dr.name}({dr.uid})"; //dr.name;
////.Text = dr.processs;
// tbTel.Text = dr.tel;
////.Text = dr.processs;
// tbTel.Text = dr.tel;
}
if (dr.conf == 1) rad1.Checked = true;
else if (dr.conf == 2) rad2.Checked = true;
else rad0.Checked = true;
@@ -73,7 +73,7 @@ namespace FPJ0000.OtConfirm
tbDays.Text = dr.HolyDays.ToString(); //211224
tbTimes.Text = dr.HolyTimes.ToString();
if(dr.cate == "대체")
if (dr.cate == "대체")
{
tbTimes.Enabled = true;
tbDays.Enabled = false;
@@ -94,7 +94,7 @@ namespace FPJ0000.OtConfirm
{
curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
//관리자라면 관리자패널을 활성해준다.
if (dr.RowState == DataRowState.Detached)
{
@@ -107,7 +107,7 @@ namespace FPJ0000.OtConfirm
{
cmbUser.Enabled = false;
grpAdmin.Enabled = curLevel >= 5;
if(curLevel >= 5)
if (curLevel >= 5)
{
grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)";
}
@@ -118,7 +118,7 @@ namespace FPJ0000.OtConfirm
cmbPreset.SelectedIndex = 0;
}
binit = true;
}
@@ -147,8 +147,8 @@ namespace FPJ0000.OtConfirm
if (tbDays.Enabled == false) tbDays.Text = string.Empty;
if (tbTimes.Enabled == false) tbTimes.Text = string.Empty;
if (double.TryParse( tbDays.Text,out double val_days)) vDay = int.Parse(tbDays.Text.Trim());
if (double.TryParse( tbTimes.Text, out double val_times)) vTime = float.Parse(tbTimes.Text.Trim());
if (double.TryParse(tbDays.Text, out double val_days)) vDay = int.Parse(tbDays.Text.Trim());
if (double.TryParse(tbTimes.Text, out double val_times)) vTime = float.Parse(tbTimes.Text.Trim());
//라디오버튼에 따른 시간 값 할당
if (radTime.Checked) vDay = 0;
@@ -168,7 +168,7 @@ namespace FPJ0000.OtConfirm
}
//하나도 입력안했다면 경고한다
if(String.IsNullOrEmpty(tbReason.Text) && String.IsNullOrEmpty(tbLocation.Text) && String.IsNullOrEmpty(tbBackup.Text) && String.IsNullOrEmpty(tbRemark.Text))
if (String.IsNullOrEmpty(tbReason.Text) && String.IsNullOrEmpty(tbLocation.Text) && String.IsNullOrEmpty(tbBackup.Text) && String.IsNullOrEmpty(tbRemark.Text))
{
FCOMMON.Util.MsgE("비고를 입력해주세요");
tbRemark.Focus();
@@ -203,7 +203,7 @@ namespace FPJ0000.OtConfirm
dr.HolyLocation = tbLocation.Text.Trim();
dr.HolyBackup = tbBackup.Text.Trim();
dr.cate = cate;// tbCate.Text.Trim();
dr.Remark = tbRemark.Text.Trim();
dr.Remark = tbRemark.Text.Trim() + "\r\n" + this.richTextBox1.Text;
dr.Response = tbResponse.Text.Trim();
dr.sdate = tbSD.Value.ToShortDateString();
dr.edate = tbED.Value.ToShortDateString();
@@ -275,7 +275,7 @@ namespace FPJ0000.OtConfirm
tbTimes.Enabled = true;
tbDays.BackColor = Color.DimGray;
tbTimes.BackColor = Color.Gold;
label11.Text = "사용시간";
groupBox1.Text = "사용시간";
}
else
{
@@ -284,10 +284,69 @@ namespace FPJ0000.OtConfirm
tbTimes.Enabled = false;
tbTimes.BackColor = Color.DimGray;
tbDays.BackColor = Color.Gold;
label11.Text = "사용일";
groupBox1.Text = "사용일";
}
if (binit)
UpdateStatus();
}
private void label11_Click(object sender, EventArgs e)
{
}
private void tbDays_TextChanged(object sender, EventArgs e)
{
}
private void grpUser_Enter(object sender, EventArgs e)
{
}
private void tbLocation_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void tbReason_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void label9_Click(object sender, EventArgs e)
{
}
private void cmbUser_SelectedIndexChanged(object sender, EventArgs e)
{
var uiddt = this.cmbUser.SelectedValue;
if (uiddt == null) return;
var uid = uiddt.ToString();
var lst = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, DateTime.Now.AddDays(-1).ToShortDateString());
this.richTextBox1.Clear();
foreach (var item in lst)
{
var val = item.Value.Split('|');
if (val[2] != "0")
{
var perc = 0f;
if (val[0] != "0") perc = float.Parse(val[1]) / float.Parse(val[0]);
if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc:N1}%사용)");
}
else if (val[5] != "0")
{
var perc = 0f;
if (val[3] != "0") perc = float.Parse(val[4]) / float.Parse(val[3]);
if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc:N1}%사용)");
}
}
if(binit)
UpdateStatus();
}
}
}