This commit is contained in:
chi
2023-11-24 08:38:21 +09:00
parent 2f22a15fd2
commit 6e88e7bdb4
11 changed files with 2579 additions and 634 deletions

View File

@@ -31,7 +31,6 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(rHolidaySummary));
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
this.dsReport = new FBS0000.dsReport();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
@@ -41,17 +40,15 @@
this.btSearch = new System.Windows.Forms.ToolStripButton();
this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FBS0000.dsReport();
this.bs2 = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FBS0000.dsReportTableAdapters.holydataTableAdapter();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs2)).BeginInit();
this.SuspendLayout();
//
// dsReport
//
this.dsReport.DataSetName = "dsReport";
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -125,8 +122,8 @@
// reportViewer1
//
this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
reportDataSource1.Name = "DataSet1";
reportDataSource1.Value = this.bs;
reportDataSource1.Name = "DataSet2";
reportDataSource1.Value = this.bs2;
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolidaySummary.rdlc";
this.reportViewer1.Location = new System.Drawing.Point(0, 37);
@@ -141,6 +138,16 @@
this.bs.DataMember = "holydata";
this.bs.DataSource = this.dsReport;
//
// dsReport
//
this.dsReport.DataSetName = "dsReport";
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// bs2
//
this.bs2.DataMember = "holydatasum";
this.bs2.DataSource = this.dsReport;
//
// ta
//
this.ta.ClearBeforeFill = true;
@@ -156,10 +163,11 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "휴가이력 현황";
this.Load += new System.EventHandler(this.rJobReport_Load);
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -177,5 +185,6 @@
private Microsoft.Reporting.WinForms.ReportViewer reportViewer1;
private System.Windows.Forms.BindingSource bs;
private dsReportTableAdapters.holydataTableAdapter ta;
private System.Windows.Forms.BindingSource bs2;
}
}

View File

@@ -1,4 +1,6 @@
using System;
using FarPoint.Excel;
using FarPoint.Win.Spread.CellType.BarCode;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -41,9 +43,67 @@ namespace FBS0000
void refrehData()
{
var dt = DateTime.Parse(this.tbMon.Text);
var dt = DateTime.Parse(this.tbMon.Text);
ta.Fill(this.dsReport.holydata, FCOMMON.info.Login.gcode, dt.Year.ToString("0000") + "-01-01", dt.ToShortDateString());
//데이터를 재 집계한다.
this.dsReport.holydatasum.Clear();
var grp_user = dsReport.holydata.GroupBy(t => t.uid);
foreach (var grp in grp_user)
{
//cate group
var first_user = grp.First();
var grp_cate = grp.GroupBy(t => t.cate);
foreach (var cate in grp_cate)
{
var newdr = this.dsReport.holydatasum.NewholydatasumRow();
var catename = cate.Key;
newdr.uid = grp.Key;
newdr.uname = first_user.name;
newdr.process = first_user.Process;
newdr.cate = cate.Key;
if (catename.StartsWith("대체"))
{
newdr.dr = cate.Sum(t => t.DrTime);
newdr.cr = cate.Sum(t => t.CrTime);
newdr.jan = newdr.dr - newdr.cr;
//newdr.add = 0;
if (newdr.dr != 0) newdr.rate = (newdr.cr / newdr.dr)*100f;
else newdr.rate = 0;
}
else if (catename.StartsWith("외출"))
{
//newdr.dr = 0;
//newdr.cr = 0;
//newdr.jan = 0;
//newdr.add = 0;
//newdr.rate = 0;
}
else
{
newdr.dr = cate.Sum(t => t.DrDay);
newdr.cr = cate.Sum(t => t.CrDay);
newdr.jan = newdr.dr - newdr.cr;
if (newdr.jan < 0) //초과사용자는 0으로 처리
{
newdr.add = newdr.jan;
newdr.cr = newdr.dr;
newdr.jan = 0;
}
if (newdr.dr != 0) newdr.rate = (newdr.cr / newdr.dr) * 100f;
else newdr.rate = 0;
newdr.drday = newdr.dr;
newdr.crday = newdr.cr;
newdr.janday = newdr.jan;
newdr.rateday = newdr.rate;
newdr.addday = newdr.add;
}
this.dsReport.holydatasum.AddholydatasumRow(newdr);
}
}
this.dsReport.holydatasum.AcceptChanges();
//this.reportViewer1.LocalReport.ReportPath = "JobReport_\\rK5Dailyform.rdlc";
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal);
@@ -148,17 +208,17 @@ namespace FBS0000
private void btRefresh_Click(object sender, EventArgs e)
{
}
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void button1_Click(object sender, EventArgs e)
{
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -168,12 +228,12 @@ namespace FBS0000
private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
// if (tbProcess.SelectedIndex >= 0) refrehData();
// if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void toolStripButton6_Click(object sender, EventArgs e)
{
// dataGridView1.ExportData(string.Empty);
// dataGridView1.ExportData(string.Empty);
}
private void btSearch_Click(object sender, EventArgs e)

File diff suppressed because it is too large Load Diff

View File

@@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 17</value>
</metadata>
@@ -175,6 +172,12 @@
dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII=
</value>
</data>
<metadata name="bs2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>351, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>225, 17</value>
</metadata>