otPMS추가(테스트버젼)
This commit is contained in:
13
SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs
generated
13
SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs
generated
@@ -30,7 +30,7 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayData));
|
||||
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
|
||||
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
|
||||
this.bsDay = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.dsReport = new FBS0000.dsReport();
|
||||
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
|
||||
@@ -164,9 +164,11 @@
|
||||
//
|
||||
// cmbType
|
||||
//
|
||||
this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cmbType.Items.AddRange(new object[] {
|
||||
"일반 원장",
|
||||
"대체 원장"});
|
||||
"대체 원장",
|
||||
"PMS 원장"});
|
||||
this.cmbType.Name = "cmbType";
|
||||
this.cmbType.Size = new System.Drawing.Size(150, 37);
|
||||
this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
|
||||
@@ -175,9 +177,9 @@
|
||||
// reportViewer1
|
||||
//
|
||||
this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
reportDataSource2.Name = "DataSet1";
|
||||
reportDataSource2.Value = this.bsDay;
|
||||
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
|
||||
reportDataSource1.Name = "DataSet1";
|
||||
reportDataSource1.Value = this.bsDay;
|
||||
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
|
||||
this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyData.rdlc";
|
||||
this.reportViewer1.Location = new System.Drawing.Point(0, 37);
|
||||
this.reportViewer1.Name = "reportViewer1";
|
||||
@@ -207,7 +209,6 @@
|
||||
this.Controls.Add(this.reportViewer1);
|
||||
this.Controls.Add(this.toolStrip1);
|
||||
this.Name = "fHolyDayData";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "근태 원장";
|
||||
this.Load += new System.EventHandler(this.rJobReport_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.bsDay)).EndInit();
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace FBS0000
|
||||
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
|
||||
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
|
||||
}
|
||||
else
|
||||
else if (cmbType.SelectedIndex == 1) //대체
|
||||
{
|
||||
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
|
||||
dsReport.Holydata_Day.Clear();
|
||||
@@ -78,10 +78,19 @@ namespace FBS0000
|
||||
dsReport.Holydata_Day.AcceptChanges();
|
||||
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
|
||||
}
|
||||
else //PMS
|
||||
{
|
||||
var tapms = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
|
||||
tapms.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
|
||||
dsReport.Holydata_Day.Clear();
|
||||
dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
|
||||
dsReport.Holydata_Day.AcceptChanges();
|
||||
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
|
||||
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
|
||||
this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
|
||||
|
||||
@@ -123,9 +123,6 @@
|
||||
<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="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>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayDataSum));
|
||||
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
|
||||
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
|
||||
this.bsDay = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.dsReport = new FBS0000.dsReport();
|
||||
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
|
||||
@@ -143,9 +143,11 @@
|
||||
//
|
||||
// cmbType
|
||||
//
|
||||
this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cmbType.Items.AddRange(new object[] {
|
||||
"일반 원장",
|
||||
"대체 원장"});
|
||||
"대체 원장",
|
||||
"PMS 원장"});
|
||||
this.cmbType.Name = "cmbType";
|
||||
this.cmbType.Size = new System.Drawing.Size(150, 37);
|
||||
this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
|
||||
@@ -154,9 +156,9 @@
|
||||
// reportViewer1
|
||||
//
|
||||
this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
reportDataSource1.Name = "DataSet1";
|
||||
reportDataSource1.Value = this.bsDay;
|
||||
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
|
||||
reportDataSource2.Name = "DataSet1";
|
||||
reportDataSource2.Value = this.bsDay;
|
||||
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
|
||||
this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyDataSum.rdlc";
|
||||
this.reportViewer1.Location = new System.Drawing.Point(0, 37);
|
||||
this.reportViewer1.Name = "reportViewer1";
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace FBS0000
|
||||
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
|
||||
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
|
||||
}
|
||||
else
|
||||
else if(cmbType.SelectedIndex == 1)
|
||||
{
|
||||
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
|
||||
dsReport.Holydata_Day.Clear();
|
||||
@@ -93,8 +93,16 @@ namespace FBS0000
|
||||
dsReport.Holydata_Day.AcceptChanges();
|
||||
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
|
||||
}
|
||||
else //pms
|
||||
{
|
||||
var taPMS = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
|
||||
taPMS.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
|
||||
dsReport.Holydata_Day.Clear();
|
||||
dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
|
||||
dsReport.Holydata_Day.AcceptChanges();
|
||||
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
|
||||
}
|
||||
|
||||
|
||||
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
|
||||
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
|
||||
this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
|
||||
|
||||
@@ -123,6 +123,9 @@
|
||||
<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="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>
|
||||
|
||||
@@ -748,6 +748,7 @@
|
||||
<Style>
|
||||
<FontFamily>맑은 고딕</FontFamily>
|
||||
<FontWeight>Normal</FontWeight>
|
||||
<Format>N1</Format>
|
||||
<Color>#333333</Color>
|
||||
</Style>
|
||||
</TextRun>
|
||||
@@ -786,6 +787,7 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
@@ -801,6 +803,7 @@
|
||||
<Style>
|
||||
<FontFamily>맑은 고딕</FontFamily>
|
||||
<FontWeight>Normal</FontWeight>
|
||||
<Format>N1</Format>
|
||||
<Color>#333333</Color>
|
||||
</Style>
|
||||
</TextRun>
|
||||
@@ -839,6 +842,7 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
@@ -854,6 +858,7 @@
|
||||
<Style>
|
||||
<FontFamily>맑은 고딕</FontFamily>
|
||||
<FontWeight>Normal</FontWeight>
|
||||
<Format>N1</Format>
|
||||
<Color>#333333</Color>
|
||||
</Style>
|
||||
</TextRun>
|
||||
@@ -892,6 +897,7 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
@@ -946,6 +952,7 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
@@ -1173,6 +1180,7 @@
|
||||
<Style>
|
||||
<FontFamily>맑은 고딕</FontFamily>
|
||||
<FontWeight>Normal</FontWeight>
|
||||
<Format>N1</Format>
|
||||
<Color>#333333</Color>
|
||||
</Style>
|
||||
</TextRun>
|
||||
@@ -1212,6 +1220,7 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
@@ -1227,6 +1236,7 @@
|
||||
<Style>
|
||||
<FontFamily>맑은 고딕</FontFamily>
|
||||
<FontWeight>Normal</FontWeight>
|
||||
<Format>N1</Format>
|
||||
<Color>#333333</Color>
|
||||
</Style>
|
||||
</TextRun>
|
||||
@@ -1266,6 +1276,7 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
@@ -1321,6 +1332,7 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
|
||||
@@ -81,7 +81,9 @@
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Sum(Fields!Dr.Value)</Value>
|
||||
<Style />
|
||||
<Style>
|
||||
<Format>N1</Format>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style />
|
||||
@@ -112,7 +114,9 @@
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Sum(Fields!Cr.Value)</Value>
|
||||
<Style />
|
||||
<Style>
|
||||
<Format>N1</Format>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style />
|
||||
@@ -229,7 +233,6 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
@@ -262,7 +265,6 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
</TablixCells>
|
||||
@@ -661,7 +663,6 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixHeader>
|
||||
<TablixMembers>
|
||||
|
||||
Reference in New Issue
Block a user