diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index f2f9c54..4782142 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.08.02.1530")] -[assembly: AssemblyFileVersion("23.08.02.1530")] +[assembly: AssemblyVersion("23.08.09.1410")] +[assembly: AssemblyFileVersion("23.08.09.1410")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 694f8a8..db0d039 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -92,6 +92,7 @@ this.근태입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.휴가신청ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.개인별근태원장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.개인별근태집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator(); this.출근부출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.휴가사용현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -116,6 +117,8 @@ this.품목검색ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.즐겨찾기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.btDev = new System.Windows.Forms.ToolStripMenuItem(); + this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.휴가REMINDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.purchaseOrderImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -149,8 +152,6 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.휴가REMINDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -376,6 +377,7 @@ this.managementToolStripMenuItem.Name = "managementToolStripMenuItem"; this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23); this.managementToolStripMenuItem.Text = "관리"; + this.managementToolStripMenuItem.Click += new System.EventHandler(this.managementToolStripMenuItem_Click); // // mn_purchase // @@ -615,6 +617,7 @@ this.근태입력ToolStripMenuItem, this.휴가신청ToolStripMenuItem, this.개인별근태원장ToolStripMenuItem, + this.개인별근태집계표ToolStripMenuItem, this.toolStripMenuItem10, this.출근부출력ToolStripMenuItem, this.휴가사용현황ToolStripMenuItem, @@ -670,6 +673,13 @@ this.개인별근태원장ToolStripMenuItem.Text = "개인별 근태 원장"; this.개인별근태원장ToolStripMenuItem.Click += new System.EventHandler(this.개인별근태원장ToolStripMenuItem_Click); // + // 개인별근태집계표ToolStripMenuItem + // + this.개인별근태집계표ToolStripMenuItem.Name = "개인별근태집계표ToolStripMenuItem"; + this.개인별근태집계표ToolStripMenuItem.Size = new System.Drawing.Size(248, 24); + this.개인별근태집계표ToolStripMenuItem.Text = "개인별 근태 집계표"; + this.개인별근태집계표ToolStripMenuItem.Click += new System.EventHandler(this.개인별근태집계표ToolStripMenuItem_Click); + // // toolStripMenuItem10 // this.toolStripMenuItem10.Name = "toolStripMenuItem10"; @@ -886,6 +896,21 @@ this.btDev.Text = "개발자메뉴"; this.btDev.Visible = false; // + // 메일전송ToolStripMenuItem1 + // + this.메일전송ToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.휴가REMINDToolStripMenuItem}); + this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1"; + this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(302, 24); + this.메일전송ToolStripMenuItem1.Text = "메일전송"; + // + // 휴가REMINDToolStripMenuItem + // + this.휴가REMINDToolStripMenuItem.Name = "휴가REMINDToolStripMenuItem"; + this.휴가REMINDToolStripMenuItem.Size = new System.Drawing.Size(166, 24); + this.휴가REMINDToolStripMenuItem.Text = "휴가-REMIND"; + this.휴가REMINDToolStripMenuItem.Click += new System.EventHandler(this.휴가REMINDToolStripMenuItem_Click); + // // purchaseImportToolStripMenuItem // this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem"; @@ -1161,21 +1186,6 @@ this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // 메일전송ToolStripMenuItem1 - // - this.메일전송ToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.휴가REMINDToolStripMenuItem}); - this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1"; - this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(302, 24); - this.메일전송ToolStripMenuItem1.Text = "메일전송"; - // - // 휴가REMINDToolStripMenuItem - // - this.휴가REMINDToolStripMenuItem.Name = "휴가REMINDToolStripMenuItem"; - this.휴가REMINDToolStripMenuItem.Size = new System.Drawing.Size(180, 24); - this.휴가REMINDToolStripMenuItem.Text = "휴가-REMIND"; - this.휴가REMINDToolStripMenuItem.Click += new System.EventHandler(this.휴가REMINDToolStripMenuItem_Click); - // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1329,6 +1339,7 @@ private System.Windows.Forms.ToolStripMenuItem bwrunToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 휴가REMINDToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 개인별근태집계표ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index b3b8c31..504c72c 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -1444,5 +1444,17 @@ namespace Project { Mail_Take_a_rest_remind(); } + + private void 개인별근태집계표ToolStripMenuItem_Click(object sender, EventArgs e) + { + var uid = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")"; + var f = new FBS0000.fHolyDayDataSum(DateTime.Now.ToShortDateString(), uid); + f.Show(); + } + + private void managementToolStripMenuItem_Click(object sender, EventArgs e) + { + + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 95fa8f3..1cef8c5 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -452,14 +452,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/ULMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e - /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+Ptnr+vV7o9blnWyHc + /U7m/E+5XP8/92TF/3lzYj/UzM//l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e + /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8Pt7r/vV7o9blnWyHc gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ - Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bpgd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP7TZfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQAOjqr9dEfZwgAAAABJRU5ErkJggg== + Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bxgd7fQPo/MoaKnQGr + 2d+jAdUG1LhtIjtQcP7jJfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQDzP6rrBTxFGAAAAABJRU5ErkJggg== diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj index 5cef95d..2cc4c60 100644 --- a/SubProject/FBS0000/FBS0000.csproj +++ b/SubProject/FBS0000/FBS0000.csproj @@ -152,6 +152,12 @@ fErrorChk.cs + + Form + + + fHolyDayDataSum.cs + Form @@ -245,6 +251,9 @@ fErrorChk.cs + + fHolyDayDataSum.cs + fImpKunTae.cs @@ -254,6 +263,7 @@ fHolyDayData.cs + WorkTable.cs diff --git a/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs b/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs new file mode 100644 index 0000000..80acdf9 --- /dev/null +++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs @@ -0,0 +1,226 @@ +namespace FBS0000 +{ + partial class fHolyDayDataSum + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + 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(); + this.bsDay = new System.Windows.Forms.BindingSource(this.components); + 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(); + this.tbMon = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btSearch = new System.Windows.Forms.ToolStripButton(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.cmbType = new System.Windows.Forms.ToolStripComboBox(); + this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer(); + this.taDay = new FBS0000.dsReportTableAdapters.Holydata_DayTableAdapter(); + this.bsTime = new System.Windows.Forms.BindingSource(this.components); + this.taTime = new FBS0000.dsReportTableAdapters.Holydata_timee_adapter(); + this.Holydata_DayBindingSource = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.bsDay)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); + this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Holydata_DayBindingSource)).BeginInit(); + this.SuspendLayout(); + // + // bsDay + // + this.bsDay.DataMember = "Holydata_Day"; + this.bsDay.DataSource = this.dsReport; + // + // dsReport + // + this.dsReport.DataSetName = "dsReport"; + this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton8, + this.lbStt, + this.tbMon, + this.toolStripButton7, + this.toolStripSeparator2, + this.btSearch, + this.toolStripLabel1, + this.cmbType}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1059, 37); + this.toolStrip1.TabIndex = 6; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton8 + // + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(34, 34); + this.toolStripButton8.Text = "toolStripButton7"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // + // lbStt + // + this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbStt.ForeColor = System.Drawing.Color.Black; + this.lbStt.LinkColor = System.Drawing.Color.Black; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(47, 34); + this.lbStt.Text = "기준 일"; + // + // tbMon + // + this.tbMon.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbMon.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbMon.Name = "tbMon"; + this.tbMon.Size = new System.Drawing.Size(90, 37); + this.tbMon.Text = "1982"; + this.tbMon.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripButton7 + // + this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(34, 34); + this.toolStripButton7.Text = "toolStripButton7"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); + // + // btSearch + // + this.btSearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSearch.Name = "btSearch"; + this.btSearch.Size = new System.Drawing.Size(80, 34); + this.btSearch.Text = "조회(&R)"; + this.btSearch.Click += new System.EventHandler(this.btSearch_Click); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(55, 34); + this.toolStripLabel1.Text = "출력형태"; + // + // cmbType + // + this.cmbType.Items.AddRange(new object[] { + "일반 원장", + "대체 원장"}); + this.cmbType.Name = "cmbType"; + this.cmbType.Size = new System.Drawing.Size(150, 37); + this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged); + this.cmbType.Click += new System.EventHandler(this.cmbType_Click); + // + // reportViewer1 + // + this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill; + reportDataSource1.Name = "DataSet1"; + reportDataSource1.Value = this.bsDay; + this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1); + this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyDataSum.rdlc"; + this.reportViewer1.Location = new System.Drawing.Point(0, 37); + this.reportViewer1.Name = "reportViewer1"; + this.reportViewer1.ServerReport.BearerToken = null; + this.reportViewer1.Size = new System.Drawing.Size(1059, 543); + this.reportViewer1.TabIndex = 7; + this.reportViewer1.Load += new System.EventHandler(this.reportViewer1_Load); + // + // taDay + // + this.taDay.ClearBeforeFill = true; + // + // bsTime + // + this.bsTime.DataMember = "Holydata_Time"; + this.bsTime.DataSource = this.dsReport; + // + // taTime + // + this.taTime.ClearBeforeFill = true; + // + // Holydata_DayBindingSource + // + this.Holydata_DayBindingSource.DataMember = "Holydata_Day"; + this.Holydata_DayBindingSource.DataSource = this.dsReport; + // + // fHolyDayDataSum + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1059, 580); + this.Controls.Add(this.reportViewer1); + this.Controls.Add(this.toolStrip1); + this.Name = "fHolyDayDataSum"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "근태 집계표"; + this.Load += new System.EventHandler(this.rJobReport_Load); + ((System.ComponentModel.ISupportInitialize)(this.bsDay)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Holydata_DayBindingSource)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private dsReport dsReport; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton8; + private System.Windows.Forms.ToolStripLabel lbStt; + private System.Windows.Forms.ToolStripTextBox tbMon; + private System.Windows.Forms.ToolStripButton toolStripButton7; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripButton btSearch; + private Microsoft.Reporting.WinForms.ReportViewer reportViewer1; + private System.Windows.Forms.BindingSource bsDay; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripComboBox cmbType; + private dsReportTableAdapters.Holydata_DayTableAdapter taDay; + private System.Windows.Forms.BindingSource bsTime; + private dsReportTableAdapters.Holydata_timee_adapter taTime; + private System.Windows.Forms.BindingSource Holydata_DayBindingSource; + } +} \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs b/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs new file mode 100644 index 0000000..9c81e20 --- /dev/null +++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs @@ -0,0 +1,158 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FBS0000 +{ + public partial class fHolyDayDataSum : Form + { + bool binit = false; + public fHolyDayDataSum(string sdate, string uid) + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + this.WindowState = FormWindowState.Maximized; + + //var dtUser = FCOMMON.DBM.getUserTable(); + //this.cmbUser.Items.Clear(); + //this.cmbUser.Items.Add("-- ALL --"); + //foreach (DataRow dr in dtUser.Rows) + //{ + // this.cmbUser.Items.Add(dr["dispname"].ToString()); + //} + //cmbUser.Text = uid; + + //if (cmbUser.SelectedIndex < 0) + // cmbUser.SelectedIndex = 0; + + this.tbMon.Text = DateTime.Now.ToShortDateString(); + cmbType.SelectedIndex = 0; //일기준으로한다 + + } + + private void rJobReport_Load(object sender, EventArgs e) + { + refreshData(); + binit = true; + + } + //string GetUIDValue() + //{ + // string uid = "%"; + // if (cmbUser.SelectedIndex > 0) + // { + // var si = cmbUser.Text.IndexOf("("); + // var ei = cmbUser.Text.LastIndexOf(")"); + // uid = cmbUser.Text.Substring(si + 1, ei - si - 1); + // } + // return uid; + //} + + void refreshData() + { + + var ed = DateTime.Parse(this.tbMon.Text); + var sd = DateTime.Parse(ed.ToString("yyyy") + "-01-01"); + + //this.reportViewer1.LocalReport.DataSources.Clear(); + var uid = "%";// GetUIDValue(); + if (cmbType.SelectedIndex == 0) + { + 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 + { + taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString()); + dsReport.Holydata_Day.Clear(); + dsReport.Holydata_Day.Merge(dsReport.Holydata_Time); + 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; + this.reportViewer1.RefreshReport(); + + + + } + + 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) + { + + } + + private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + // if (tbProcess.SelectedIndex >= 0) refrehData(); + } + + private void toolStripButton6_Click(object sender, EventArgs e) + { + // dataGridView1.ExportData(string.Empty); + } + + private void btSearch_Click(object sender, EventArgs e) + { + refreshData(); + } + + private void toolStripButton8_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(this.tbMon.Text); + var sd = sdo.AddMonths(-1); + tbMon.Text = sd.ToShortDateString(); + } + + private void toolStripButton7_Click(object sender, EventArgs e) + { + var sdo = DateTime.Parse(this.tbMon.Text); + var sd = sdo.AddMonths(1); + tbMon.Text = sd.ToShortDateString(); + } + + private void reportViewer1_Load(object sender, EventArgs e) + { + + } + + private void lbStt_Click(object sender, EventArgs e) + { + + } + + private void cmbType_Click(object sender, EventArgs e) + { + + } + + private void cmbType_SelectedIndexChanged(object sender, EventArgs e) + { + if(binit) + refreshData(); + } + } +} diff --git a/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx b/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx new file mode 100644 index 0000000..438592c --- /dev/null +++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 225, 17 + + + 17, 17 + + + 119, 17 + + + + + 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 + + + + 311, 17 + + + 395, 17 + + + 486, 17 + + + 575, 17 + + \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc b/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc new file mode 100644 index 0000000..0bb72a7 --- /dev/null +++ b/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc @@ -0,0 +1,825 @@ + + + + + + + + + + + + true + true + + + + + 담당자 + + + + Textbox4 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + + + + + + 0.93896cm + + + 0.85958cm + + + 1.01833cm + + + 1.25646cm + + + 1.12417cm + + + 1.15063cm + + + + + 0.74083cm + + + + + true + true + + + + + =Sum(Fields!Dr.Value) + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Sum(Fields!Cr.Value) + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Sum(Fields!Dr.Value) + + + + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Sum(Fields!Cr.Value) + + + + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =last(fields!jan.Value) + + + + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =sum(fields!Cr.Value)/ sum(fields!Dr.Value) * 100.0 + + + + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + + + + + + + =left(Fields!sdate.Value,7) + + + + + =Fields!sdate.Value + + + + 0.68792cm + + + true + true + + + + + =left(Fields!sdate.Value,7) + + + + sdate1 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + true + true + + + + + 발생 + + + + Textbox37 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 0.6cm + + + true + true + + + + + 사용 + + + + Textbox32 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + 0.68792cm + + + true + true + + + + + 전체 + + + + Textbox45 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + true + true + + + + + 발생 + + + + Textbox46 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + true + true + + + + + 사용 + + + + Textbox49 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + true + true + + + + + 잔량 + + + + Textbox34 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + 0.68792cm + + + true + true + + + + + 사용 + + + + Textbox20 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + true + true + + + + + % + + + + Textbox41 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + ="[" & Fields!uid.Value & "] " & Fields!name.Value + + + + + =Fields!uid.Value + + + + 2.97656cm + + + true + true + + + + + ="[" & Fields!uid.Value & "] " & Fields!name.Value + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + + + + true + true + DataSet1 + 2.02875cm + 9.32469cm + + + + + + 0.79872in + + + + + + + Textbox88 + 0.17625cm + 0.6cm + 27.95916cm + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 21cm + 29.7cm + 0.7cm + 0.5cm + 0.5cm + 0.5cm + 0.13cm +