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

..

Browse Source
This commit is contained in:
chi
2022-02-02 17:26:11 +09:00
parent 6bf9641682
commit e5df085788
9 changed files with 182 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SubProject/FPJ0000/JobReport_/rJobReportDay.cs
View File

@@ -117,12 +117,6 @@ namespace FPJ0000.JobReport_
var col = this.dataGridView1.Columns[i];
var dayStr = col.HeaderText.Substring(0, 2);
var daydata = dsReport.JobReportDay.Where(t => t.uid == userid && t.pdate.EndsWith(dayStr)).FirstOrDefault();
if (daydata != null)
{
@@ -143,10 +137,20 @@ namespace FPJ0000.JobReport_
{
//평일이다
sumOT += daydata.ot;
rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
if(daydata.jobtype == "휴가")
{
if (daydata.hrs + daydata.ot == 8.0) rowdata.Add("휴가");
else rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
}
else
{
rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
}
}
}
else rowdata.Add("--");
else rowdata.Add("--"); //업무일지에 자료가 없다.
}
rowdata.Add(sum.ToString() + "+" + sumOT.ToString() + "(*" + sumFR.ToString() + ")");
this.dataGridView1.Rows.Add(rowdata.ToArray());
@@ -159,6 +163,7 @@ namespace FPJ0000.JobReport_
var cellvalue = "--";
if(dvrow.Cells[i].Value != null) cellvalue= dvrow.Cells[i].Value.ToString();
if (cellvalue == "--") dvrow.Cells[i].Style.ForeColor = Color.Gray;
else if (cellvalue == "휴가") dvrow.Cells[i].Style.ForeColor = Color.Tomato;
else
{
var datasplbu = cellvalue.Split('+');