This commit is contained in:
chi
2021-06-17 09:36:17 +09:00
parent 71b362c05b
commit 139c48721f
25 changed files with 5556 additions and 904 deletions

View File

@@ -64,9 +64,9 @@ namespace FPJ0000.JobReport_
// var rawdata = rawdata0.GroupBy(t => t.pdate);
// var rawdata = rawdata0.GroupBy(t => t.pdate);
this.progressBar1.Maximum = rawdata.Count();
this.progressBar1.Maximum = rawdata.Count();
//날짜별로 묶음처리한다.
//var grplist = rawdata.GroupBy(t => t.pdate);
@@ -76,7 +76,12 @@ namespace FPJ0000.JobReport_
var drDate = item.FirstOrDefault();
//근무일원
var = item.GroupBy(t => t.id).Count();
var = item.Where(t => t.svalue == "휴가").Count();
var = item.Where(t => t.svalue == "파견").Count();
var = item.GroupBy(t => t.id).Count();
var = - - ;
if (chkallto.Checked) = ;
//var 근무인원 = 전체인원;
//완료
var newdr = this.dsReport.K5DailyForm.NewK5DailyFormRow();
@@ -259,9 +264,37 @@ namespace FPJ0000.JobReport_
newdr10.graph = false;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr10);
//휴가
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "3.휴가";
newdr10.Item = "1.(p.s)";
newdr10.Format = "N0";
newdr10.Sign = "";
newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00");
newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00");
newdr10.value = ;
newdr10.graph = false;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr10);
//파견
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "4.파견";
newdr10.Item = "1.(p.s)";
newdr10.Format = "N0";
newdr10.Sign = "";
newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00");
newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00");
newdr10.value = ;
newdr10.graph = false;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr10);
//3.근무인원
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "3.근무인원";
if (chkallto.Checked)
newdr10.Grp = "5.근무인원(전체)";
else
newdr10.Grp = "5.근무인원";
newdr10.Item = "1.(8hrs/p.s)";
newdr10.Format = "N0";
newdr10.Sign = "";
@@ -276,7 +309,7 @@ namespace FPJ0000.JobReport_
var v2 = (newdr5.value / ( * 8) + newdr6.value / ( * 8) + newdr7.value / ( * 8) + newdr8.value / ( * 8)) * 100.0;
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "4.TTL";
newdr10.Grp = "6.TTL";
newdr10.Item = "1.Working Utilization(%)";
newdr10.Format = "N1";
newdr10.Sign = "%";
@@ -319,7 +352,7 @@ namespace FPJ0000.JobReport_
this.dsReport.K5DailyForm.Clear();
this.dsReport.K5DailyForm.ReadXml(fn);
this.dsReport.K5DailyForm.AcceptChanges();
var ser1 = this.chart1.Series[0];// new System.Windows.Forms.DataVisualization.Charting.Series("Completed");
@@ -364,5 +397,11 @@ namespace FPJ0000.JobReport_
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
}
private void chkallto_Click(object sender, EventArgs e)
{
//makedata();
}
}
}