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

업무일지 시간 요약화면에 휴일 데이터를 추가 함.

Browse Source
This commit is contained in:
chi
2021-06-25 14:18:23 +09:00
parent 139c48721f
commit acc368d065
24 changed files with 712 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,9 @@ namespace FPJ0000.JobReport_
if (col.Tag.ToString() == "1")
{
//이날은 휴일이다
sumFR += daydata.ot + daydata.hrs;
rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
sumFR += daydata.ot;// + daydata.hrs;
//sumOT += daydata.ot;
rowdata.Add("*" + daydata.hrs.ToString() + "+" + daydata.ot.ToString());
}
else
{
@@ -147,7 +148,7 @@ namespace FPJ0000.JobReport_
}
else rowdata.Add("--");
}
rowdata.Add(sum.ToString() + "+" + sumOT.ToString());
rowdata.Add(sum.ToString() + "+" + sumOT.ToString() + "(*" + sumFR.ToString() + ")");
this.dataGridView1.Rows.Add(rowdata.ToArray());
}
foreach(DataGridViewRow dvrow in this.dataGridView1.Rows)
@@ -205,5 +206,10 @@ namespace FPJ0000.JobReport_
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void button1_Click_1(object sender, EventArgs e)
{
dataGridView1.ExportData(string.Empty);
}
}
}