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-12-28 10:24:51 +09:00
parent 6e925857b3
commit 6e091f6218
11 changed files with 217 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
View File

@@ -527,7 +527,8 @@ namespace FPJ0000.OtConfirm
if (uiddt == null) return;
var uid = uiddt.ToString();
if (uid.isEmpty()) return;
if (uid == "System.Data.DataRowView") return;
if (updateuserinfo.Equals(uid)) return;
var basedate = DateTime.Now.AddDays(-1).ToShortDateString();
holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, basedate);
@@ -537,19 +538,19 @@ namespace FPJ0000.OtConfirm
foreach (var item in holydata)
{
var val = item.Value.Split('|');
if (val[2] != "0")
if (val[0] != "0" || 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 * 100:N1}%사용)");
richTextBox1.AppendText($"[{item.Key}] {val[2]:N1}일 남음({perc * 100:N1}%사용)");
}
else if (val[5] != "0")
else if (val[3] != "0" || 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 * 100:N1}%사용)");
richTextBox1.AppendText($"[{item.Key}] {val[5]:N1}시간 남음({perc * 100:N1}%사용)");
}
}