This commit is contained in:
chi
2021-05-12 14:56:17 +09:00
parent c5a2b30ae3
commit 0c88107b77
23 changed files with 1493 additions and 1377 deletions

View File

@@ -55,12 +55,19 @@ namespace FPJ0000.JobReport_
if (FCOMMON.info.Login.gcode.isEmpty() == false)
gcode = FCOMMON.info.Login.gcode;
//var ta = new dsReportTableAdapters.vJobReportForUserTableAdapter();
//var rawdata0 = ta.GetData(FCOMMON.info.Login.gcode, sd, ed);
var rawdata = db.vJobReportForUser.AsNoTracking()
.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1)
.OrderBy(t => t.pdate).GroupBy(t => t.pdate);
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString());
this.progressBar1.Maximum = rawdata.Count();
// var rawdata = rawdata0.GroupBy(t => t.pdate);
this.progressBar1.Maximum = rawdata.Count();
//날짜별로 묶음처리한다.
//var grplist = rawdata.GroupBy(t => t.pdate);
foreach (var item in rawdata)
@@ -91,7 +98,7 @@ namespace FPJ0000.JobReport_
newdr2.Sign = string.Empty;
newdr2.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00");
newdr2.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00");
newdr2.value = item.Where(t => t.svalue == "Technical Support" && t.status == "진행 ").Count();
newdr2.value = item.Where(t => t.svalue == "Technical Support" && t.status != "진행 완료").Count();
newdr2.graph = true;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr2);
@@ -175,7 +182,7 @@ namespace FPJ0000.JobReport_
newdr8.Sign = string.Empty;
newdr8.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00");
newdr8.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00");
newdr8.value = (double)(item.Where(t => t.svalue == "Others").Sum(t => t.hrs));
newdr8.value = (double)(item.Where(t => t.svalue != "Overhaul" && t.svalue != "Project" && t.svalue != "Training").Sum(t => t.hrs));
newdr8.graph = false;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr8);
@@ -282,6 +289,12 @@ namespace FPJ0000.JobReport_
}
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal);
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
List<ReportParameter> parameters = new List<ReportParameter>();
parameters.Add(new ReportParameter("sd", dtSD.Text));
parameters.Add(new ReportParameter("ed", dtED.Text));
reportViewer1.LocalReport.SetParameters(parameters);
this.reportViewer1.RefreshReport();
}
@@ -326,9 +339,30 @@ namespace FPJ0000.JobReport_
//this.reportViewer1.LocalReport.SetParameters(new Microsoft.Reporting.WinForms.ReportParameter("chartfile", fni));
this.reportViewer1.RefreshReport();
}
private void toolStripButton2_Click(object sender, EventArgs e)
{
this.Close();
}
private void lbStt_Click(object sender, EventArgs e)
{
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
dtSD.Text = sdDate.ToShortDateString();
if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString())
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
else
dtED.Text = f.dtPick.SelectionEnd.ToShortDateString();
}
private void toolStripLabel4_Click(object sender, EventArgs e)
{
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
}
}
}