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

29
SubProject/FPJ0000/JobReport_/rJobReport.cs
View File

@@ -36,6 +36,14 @@ namespace FPJ0000.JobReport_
void refrehData()
{
////휴일데이터가 들어가 있음.
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
//this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
@@ -87,13 +95,27 @@ namespace FPJ0000.JobReport_
}
else
{
////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
//var sumhr = 0f;
//var sumot = 0f;
//var sumholy = 0f;
//foreach(dsReport.jobReportRow item in userDatas)
//{
// dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
//}
var sumhr = userDatas.Sum(t => t.hrs);
var sumot = userDatas.Sum(t => t.ot);
var sumhl = userDatas.Sum(t => t.holyot);
if (sumot == 0) rowdata.Add(string.Format("{0}", sumhr, sumot));
else rowdata.Add(string.Format("{0}+{1}", sumhr, sumot));
else rowdata.Add(string.Format("{0}+{1}(*{2})", sumhr, sumot,sumhl));
if (sumhr > basehr) high.Add(true);
else high.Add(false);
if (sumhr < basehr) low.Add(true);
else low.Add(false);
}
@@ -123,5 +145,10 @@ namespace FPJ0000.JobReport_
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void button1_Click(object sender, EventArgs e)
{
dataGridView1.ExportData(string.Empty);
}
}
}