diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 2762c66..063b667 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -131,6 +131,18 @@ fMailList.cs + + Form + + + fJobChartMenu.cs + + + Form + + + rJobChart.cs + Form @@ -246,6 +258,13 @@ fMailList.cs + + fJobChartMenu.cs + + + + rJobChart.cs + fPartList.cs diff --git a/SubProject/FPJ0000/JobReport/fJobChartMenu.Designer.cs b/SubProject/FPJ0000/JobReport/fJobChartMenu.Designer.cs new file mode 100644 index 0000000..587d38e --- /dev/null +++ b/SubProject/FPJ0000/JobReport/fJobChartMenu.Designer.cs @@ -0,0 +1,143 @@ +namespace FPJ0000.JobReport +{ + partial class fJobChartMenu + { + /// + /// 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() + { + System.Windows.Forms.Label label1; + System.Windows.Forms.Label label2; + System.Windows.Forms.Label label3; + this.tbName = new System.Windows.Forms.TextBox(); + this.tbUID = new System.Windows.Forms.TextBox(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); + this.btOK = new System.Windows.Forms.Button(); + label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(26, 22); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(41, 12); + label1.TabIndex = 0; + label1.Text = "사용자"; + // + // tbName + // + this.tbName.Location = new System.Drawing.Point(79, 18); + this.tbName.Name = "tbName"; + this.tbName.Size = new System.Drawing.Size(123, 21); + this.tbName.TabIndex = 1; + // + // tbUID + // + this.tbUID.Location = new System.Drawing.Point(208, 18); + this.tbUID.Name = "tbUID"; + this.tbUID.ReadOnly = true; + this.tbUID.Size = new System.Drawing.Size(123, 21); + this.tbUID.TabIndex = 2; + this.tbUID.TabStop = false; + // + // dateTimePicker1 + // + this.dateTimePicker1.Location = new System.Drawing.Point(79, 45); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(252, 21); + this.dateTimePicker1.TabIndex = 4; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(26, 51); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(41, 12); + label2.TabIndex = 3; + label2.Text = "시작일"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(26, 78); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(41, 12); + label3.TabIndex = 5; + label3.Text = "종료일"; + // + // dateTimePicker2 + // + this.dateTimePicker2.Location = new System.Drawing.Point(79, 72); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(252, 21); + this.dateTimePicker2.TabIndex = 6; + // + // btOK + // + this.btOK.Location = new System.Drawing.Point(79, 101); + this.btOK.Name = "btOK"; + this.btOK.Size = new System.Drawing.Size(252, 27); + this.btOK.TabIndex = 7; + this.btOK.Text = "확인"; + this.btOK.UseVisualStyleBackColor = true; + this.btOK.Click += new System.EventHandler(this.btOK_Click); + // + // fJobChartMenu + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(356, 146); + this.Controls.Add(this.btOK); + this.Controls.Add(label3); + this.Controls.Add(this.dateTimePicker2); + this.Controls.Add(label2); + this.Controls.Add(this.dateTimePicker1); + this.Controls.Add(this.tbUID); + this.Controls.Add(this.tbName); + this.Controls.Add(label1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fJobChartMenu"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "작업 분포 확인"; + this.Load += new System.EventHandler(this.fJobChartMenu_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox tbName; + private System.Windows.Forms.TextBox tbUID; + private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.DateTimePicker dateTimePicker2; + private System.Windows.Forms.Button btOK; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/fJobChartMenu.cs b/SubProject/FPJ0000/JobReport/fJobChartMenu.cs new file mode 100644 index 0000000..88036b7 --- /dev/null +++ b/SubProject/FPJ0000/JobReport/fJobChartMenu.cs @@ -0,0 +1,33 @@ +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 FPJ0000.JobReport +{ + public partial class fJobChartMenu : Form + { + public fJobChartMenu() + { + InitializeComponent(); + } + + private void btOK_Click(object sender, EventArgs e) + { + var f = new JobReport.rJobChart(tbUID.Text,dateTimePicker1.Value.ToShortDateString(),dateTimePicker2.Value.ToShortDateString()); + f.Show(); + } + + private void fJobChartMenu_Load(object sender, EventArgs e) + { + this.tbUID.Text = FCOMMON.info.Login.no; + this.tbName.Text = FCOMMON.info.Login.nameK; + this.dateTimePicker1.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")); + this.dateTimePicker2.Value = this.dateTimePicker1.Value.AddMonths(1).AddDays(-1); + } + } +} diff --git a/SubProject/FPJ0000/JobReport/fJobChartMenu.resx b/SubProject/FPJ0000/JobReport/fJobChartMenu.resx new file mode 100644 index 0000000..c0bb2f1 --- /dev/null +++ b/SubProject/FPJ0000/JobReport/fJobChartMenu.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + False + + + False + + + False + + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs index d73f80a..74eaadf 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs @@ -64,6 +64,7 @@ this.tbFind = new System.Windows.Forms.ToolStripTextBox(); this.btFind = new System.Windows.Forms.ToolStripButton(); this.btReport = new System.Windows.Forms.ToolStripButton(); + this.btReportDay = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -93,7 +94,7 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); - this.btReportDay = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -131,7 +132,8 @@ this.tbFind, this.btFind, this.btReport, - this.btReportDay}); + this.btReportDay, + this.toolStripButton1}); this.bn.Location = new System.Drawing.Point(0, 564); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -303,6 +305,16 @@ this.btReport.Text = "월/개인별 요약"; this.btReport.Click += new System.EventHandler(this.btReport_Click); // + // btReportDay + // + this.btReportDay.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btReportDay.Image = ((System.Drawing.Image)(resources.GetObject("btReportDay.Image"))); + this.btReportDay.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btReportDay.Name = "btReportDay"; + this.btReportDay.Size = new System.Drawing.Size(108, 22); + this.btReportDay.Text = "일/개인별 요약"; + this.btReportDay.Click += new System.EventHandler(this.btReportDay_Click); + // // cm // this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -632,15 +644,15 @@ this.btSearch.Text = "조회(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // - // btReportDay + // toolStripButton1 // - this.btReportDay.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btReportDay.Image = ((System.Drawing.Image)(resources.GetObject("btReportDay.Image"))); - this.btReportDay.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btReportDay.Name = "btReportDay"; - this.btReportDay.Size = new System.Drawing.Size(108, 22); - this.btReportDay.Text = "일/개인별 요약"; - this.btReportDay.Click += new System.EventHandler(this.btReportDay_Click); + this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(75, 22); + this.toolStripButton1.Text = "작업분포"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // // fJobReport // @@ -723,5 +735,6 @@ private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; private System.Windows.Forms.ToolStripButton btReportDay; + private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs index 9c694d0..e254ac9 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.cs @@ -478,5 +478,10 @@ namespace FPJ0000 f.Show(); } + private void toolStripButton1_Click(object sender, EventArgs e) + { + var f = new JobReport.fJobChartMenu(); + f.ShowDialog(); + } } } diff --git a/SubProject/FPJ0000/JobReport/fJobReport.resx b/SubProject/FPJ0000/JobReport/fJobReport.resx index 470ad20..e575b96 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport/fJobReport.resx @@ -233,6 +233,17 @@ hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/JobReport/rJobChart.Designer.cs b/SubProject/FPJ0000/JobReport/rJobChart.Designer.cs new file mode 100644 index 0000000..3732b60 --- /dev/null +++ b/SubProject/FPJ0000/JobReport/rJobChart.Designer.cs @@ -0,0 +1,89 @@ +namespace FPJ0000.JobReport +{ + partial class rJobChart + { + /// + /// 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(); + Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource(); + this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer(); + this.dsPRJ = new FPJ0000.dsPRJ(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + this.SuspendLayout(); + // + // reportViewer1 + // + this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill; + reportDataSource1.Name = "DataSet1"; + reportDataSource1.Value = this.bs; + this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1); + this.reportViewer1.LocalReport.ReportEmbeddedResource = "FPJ0000.JobReport.rJobChart.rdlc"; + this.reportViewer1.Location = new System.Drawing.Point(0, 0); + this.reportViewer1.Name = "reportViewer1"; + this.reportViewer1.Size = new System.Drawing.Size(721, 586); + this.reportViewer1.TabIndex = 0; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsPRJ; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // rJobChart + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(721, 586); + this.Controls.Add(this.reportViewer1); + this.Name = "rJobChart"; + this.Text = "작업 분포"; + this.Load += new System.EventHandler(this.rJobReport_Load); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Microsoft.Reporting.WinForms.ReportViewer reportViewer1; + private System.Windows.Forms.BindingSource bs; + private dsPRJ dsPRJ; + private dsPRJTableAdapters.JobReportTableAdapter ta; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/rJobChart.cs b/SubProject/FPJ0000/JobReport/rJobChart.cs new file mode 100644 index 0000000..8284d8d --- /dev/null +++ b/SubProject/FPJ0000/JobReport/rJobChart.cs @@ -0,0 +1,33 @@ +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 FPJ0000.JobReport +{ + public partial class rJobChart : Form + { + public rJobChart(string uid,string sdate, string edate) + { + InitializeComponent(); + this.WindowState = FormWindowState.Maximized; + //var ps = new Microsoft.Reporting.WinForms.ReportParameterCollection(); + //this.reportViewer1.LocalReport.SetParameters(ps); + this.ta.Fill(this.dsPRJ.JobReport,sdate,edate,uid); + } + + private void rJobReport_Load(object sender, EventArgs e) + { + this.Show(); + Application.DoEvents(); + + this.reportViewer1.SetDisplayMode( Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); + this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; + this.reportViewer1.RefreshReport(); + } + } +} diff --git a/SubProject/FPJ0000/JobReport/rJobChart.rdlc b/SubProject/FPJ0000/JobReport/rJobChart.rdlc new file mode 100644 index 0000000..1a11692 --- /dev/null +++ b/SubProject/FPJ0000/JobReport/rJobChart.rdlc @@ -0,0 +1,1064 @@ + + + + + + + + + 1.33583cm + + + 1.04479cm + + + 0.99188cm + + + 1.44167cm + + + 1.57396cm + + + + + 0.6cm + + + + + true + true + + + + + hrs + + + + + + + Textbox5 + + + #4c68a2 + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + ％ + + + + + + + Textbox27 + + + #4c68a2 + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Day + + + + + + + Textbox7 + + + #4c68a2 + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Start + + + + + + + Textbox30 + + + #4c68a2 + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Last + + + + + + + Textbox32 + + + #4c68a2 + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!hrs.Value) + + + + + + + hrs1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =(Sum(Fields!hrs.Value) / Sum(Fields!hrs.Value, "DataSet1"))*100 + + + + + + + Textbox28 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Sum(Fields!hrs.Value) / 8.0 + + + + + + + ot1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =right(Min(Fields!pdate.Value),5) + + + + + + + Textbox31 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =right(Max(Fields!pdate.Value),5) + + + + + + + pdate + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + + 9.2513cm + + + true + true + + + + + project + + + + + + + Textbox16 + + + #4c68a2 + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.37313cm + + + true + true + + + + + type + + + + + + + Textbox13 + + + #4c68a2 + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + After + + + + + =Fields!projectName.Value + + + + + =(Sum(Fields!hrs.Value) / Sum(Fields!hrs.Value, "DataSet1"))*100 + Descending + + + + + + + + + =Fields!type.Value + + + + + =Fields!type.Value + + + + 9.2513cm + + + true + true + + + + + =Left(Fields!projectName.Value,40) + + + + + + + projectName1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.37313cm + + + true + true + + + + + =Fields!type.Value + + + + + + + type1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + DataSet1 + + + (Sum(Fields!hrs.Value) / Sum(Fields!hrs.Value, "DataSet1"))*100 + Descending + + + 13.29972cm + 1.2cm + 19.01255cm + + + + + + + + + + + =Fields!projectName.Value + =Fields!type.Value + + + + + + =Fields!projectName.Value + + + + + + + + + + + + + + + + + + + =Sum(Fields!hrs.Value) + + + + + + + Primary + + + + False + + + + + + + + + 0.5 + + NaN + NaN + NaN + + + + Secondary + + + + False + + + + + + + + + 0.5 + + NaN + Opposite + NaN + NaN + + + + Value Primary + + + + + + + + + + + + 0.5 + + NaN + NaN + NaN + + + + Value Secondar + + + + + + + + + + + + 0.5 + + NaN + Opposite + NaN + NaN + + + + + + + + BottomCenter + true + + + + + Black + Black + + + + + JOB LIST + + + + BrightPastel + + + + + 사용 가능한 데이터 없음 + + + DataSet1 + 13.12333cm + 19.01255cm + 1 + + + White + None + + + + 5.70855in +