Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
chi
2022-12-16 15:06:45 +09:00
parent 146f32c64e
commit 6ea52f61be
12 changed files with 1776 additions and 1540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1983
SubProject/FEQ0000/Purchase/fPurchase.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

5
SubProject/FEQ0000/Purchase/fPurchase.cs
View File

@@ -953,7 +953,10 @@ namespace FEQ0000
return; return;
} }
var dr = drv.Row as dsPurchase.PurchaseRow; var dr = drv.Row as dsPurchase.PurchaseRow;
this.label1.Text = string.Format("{0}", dr.bigo.Replace("\r", "").Replace("\n", "")); if (dr.project.isEmpty())
this.label1.Text = $"비고:{dr.bigo.Replace("\r", "").Replace("\n", "")}";
else
this.label1.Text = $"프로젝트:{dr.project},비고:{dr.bigo.Replace("\r", "").Replace("\n", "")}";
} }
private void toolStripButton4_Click(object sender, EventArgs e) private void toolStripButton4_Click(object sender, EventArgs e)

14
SubProject/FEQ0000/Purchase/fPurchase.resx
View File

@@ -410,13 +410,13 @@
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGSSURBVFhH7ZDdSgJBGIa9kY67hK6gdFX8g27Cm4gIYjVN YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGSSURBVFhH7ZDdSgJBGIa9kY67hK6gdFX8g27Cm4gIYjVN
6KyMrM6qw6DooOjXGbeO6kACQ/IwDJSCLKPJd9gVk8l1ncWNmAdeZme+l/FxfIp/j18nTCbBNH2LZ4wj 6KyMrM6qw6AIIvp1xq2jOpDAkDwMA6Ugy2jyHXbFZHJdZ3Ej5oGX2ZnvZXwcn+Lf49cJk0kwTd/iGePI
f+pyEvfNLBgTiZxxiHNR30m6gjLUX95ZoVhtR/RSc3qeTIUzF40CqbZxLoNrghZccok+YTWPpHBdEC8W n7qcxH0zC8ZEImcc4lzUd5KuoAz1l3dWKFbbEb3UnJ4nU+HMRaNAqm2cy+CaoAWXXKJPWM0jKVwXxIuF
WqJ8dQPXBYHbdylBGTwT3DitsWi2xApnNfNEjGeCsWWD97AOwjNBvBzkNv/qCw6LEhSBeW8GgfnYBYEl lihf3cB1QeD2XUpQBs8EN05rLJotscJZzTwR45lgbNngPayD8EwQLwe5zb/6gsOiBEVg3ptBYD52QWDJ
Z9fFXAmKsOTsupgrQRGWnF0XcyUowpKz62KuBPuxxHrzG5iNXdAJSlAWJSiLEpTlh6BsZldu2OrJI//G 2XUxV4IiLDm7LuZKUIQlZ9fFXAmKsOTsupgrwX4ssd78BmZjF3SCEpRFCcqiBGX5ISib2ZUbtnryyL+x
in1/Z5R0BQ8qX1LZvWux5FaZX5rcLrO9zl7Uc5KuYGix9LxOm8KSk+zctvilkBXNnSTf8dEy53UuGEiR Yt/fGSVdwYPKl1R271osuVXmlya3y2yvsxf1nKQrGFosPa/TprDkJDu3LX4pZEVzJ8l3fLTMeZ0LBlIk
ICRx+ajp/4P4AVFv2EBO04nGBWUJpIvxWO7qNU8bbP/+k62RBot29lqKxsyK9wR1koikrx8Cc8cf4Syt CElcPmr6/yB+QNQbNpDTdKJxQVkC6WI8lrt6zdMG27//ZGukwaKdvZaiMbPiPUGdJCLp64fA3PFHOEsr
QNocKTzG5/sG83SklgnLtDwAAAAASUVORK5CYII= kDZHCo/x+b4B8eCklafTY54AAAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

734
SubProject/FPJ0000/JobReport_/rJobReportPrj.Designer.cs generated
View File

@@ -28,343 +28,398 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
this.bs = new System.Windows.Forms.BindingSource(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport(); this.dsReport = new FPJ0000.dsReport();
this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter(); this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.linkLabel9 = new System.Windows.Forms.LinkLabel(); this.linkLabel9 = new System.Windows.Forms.LinkLabel();
this.linkLabel10 = new System.Windows.Forms.LinkLabel(); this.linkLabel10 = new System.Windows.Forms.LinkLabel();
this.linkLabel11 = new System.Windows.Forms.LinkLabel(); this.linkLabel11 = new System.Windows.Forms.LinkLabel();
this.linkLabel12 = new System.Windows.Forms.LinkLabel(); this.linkLabel12 = new System.Windows.Forms.LinkLabel();
this.linkLabel5 = new System.Windows.Forms.LinkLabel(); this.linkLabel5 = new System.Windows.Forms.LinkLabel();
this.linkLabel6 = new System.Windows.Forms.LinkLabel(); this.linkLabel6 = new System.Windows.Forms.LinkLabel();
this.linkLabel7 = new System.Windows.Forms.LinkLabel(); this.linkLabel7 = new System.Windows.Forms.LinkLabel();
this.linkLabel8 = new System.Windows.Forms.LinkLabel(); this.linkLabel8 = new System.Windows.Forms.LinkLabel();
this.linkLabel3 = new System.Windows.Forms.LinkLabel(); this.linkLabel3 = new System.Windows.Forms.LinkLabel();
this.linkLabel4 = new System.Windows.Forms.LinkLabel(); this.linkLabel4 = new System.Windows.Forms.LinkLabel();
this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btSave = new System.Windows.Forms.Button(); this.btSave = new System.Windows.Forms.Button();
this.cmbUser = new System.Windows.Forms.ComboBox(); this.cmbUser = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.dte = new System.Windows.Forms.DateTimePicker(); this.dte = new System.Windows.Forms.DateTimePicker();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.dts = new System.Windows.Forms.DateTimePicker(); this.dts = new System.Windows.Forms.DateTimePicker();
this.tbProcess = new System.Windows.Forms.ComboBox(); this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.btRefresh = new System.Windows.Forms.Button(); this.btRefresh = new System.Windows.Forms.Button();
this.dv1 = new arCtl.arDatagridView(); this.dv1 = new arCtl.arDatagridView();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.button1 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); this.linkLabel13 = new System.Windows.Forms.LinkLabel();
this.panel1.SuspendLayout(); this.linkLabel14 = new System.Windows.Forms.LinkLabel();
((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
this.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
// this.panel1.SuspendLayout();
// bs ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
// this.SuspendLayout();
this.bs.DataMember = "JobReportDay"; //
this.bs.DataSource = this.dsReport; // bs
// //
// dsReport this.bs.DataMember = "JobReportDay";
// this.bs.DataSource = this.dsReport;
this.dsReport.DataSetName = "dsReport"; //
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // dsReport
// //
// ta this.dsReport.DataSetName = "dsReport";
// this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
this.ta.ClearBeforeFill = true; //
// // ta
// panel1 //
// this.ta.ClearBeforeFill = true;
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); //
this.panel1.Controls.Add(this.linkLabel9); // panel1
this.panel1.Controls.Add(this.linkLabel10); //
this.panel1.Controls.Add(this.linkLabel11); this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.panel1.Controls.Add(this.linkLabel12); this.panel1.Controls.Add(this.linkLabel13);
this.panel1.Controls.Add(this.linkLabel5); this.panel1.Controls.Add(this.linkLabel14);
this.panel1.Controls.Add(this.linkLabel6); this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.linkLabel7); this.panel1.Controls.Add(this.linkLabel9);
this.panel1.Controls.Add(this.linkLabel8); this.panel1.Controls.Add(this.linkLabel10);
this.panel1.Controls.Add(this.linkLabel3); this.panel1.Controls.Add(this.linkLabel11);
this.panel1.Controls.Add(this.linkLabel4); this.panel1.Controls.Add(this.linkLabel12);
this.panel1.Controls.Add(this.linkLabel2); this.panel1.Controls.Add(this.linkLabel5);
this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.linkLabel6);
this.panel1.Controls.Add(this.btSave); this.panel1.Controls.Add(this.linkLabel7);
this.panel1.Controls.Add(this.cmbUser); this.panel1.Controls.Add(this.linkLabel8);
this.panel1.Controls.Add(this.label4); this.panel1.Controls.Add(this.linkLabel3);
this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.linkLabel4);
this.panel1.Controls.Add(this.dte); this.panel1.Controls.Add(this.linkLabel2);
this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.dts); this.panel1.Controls.Add(this.btSave);
this.panel1.Controls.Add(this.tbProcess); this.panel1.Controls.Add(this.cmbUser);
this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.btRefresh); this.panel1.Controls.Add(this.label3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Controls.Add(this.dte);
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Controls.Add(this.label2);
this.panel1.Name = "panel1"; this.panel1.Controls.Add(this.dts);
this.panel1.Padding = new System.Windows.Forms.Padding(5); this.panel1.Controls.Add(this.tbProcess);
this.panel1.Size = new System.Drawing.Size(1114, 58); this.panel1.Controls.Add(this.label1);
this.panel1.TabIndex = 7; this.panel1.Controls.Add(this.btRefresh);
// this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
// linkLabel9 this.panel1.Location = new System.Drawing.Point(0, 0);
// this.panel1.Name = "panel1";
this.linkLabel9.AutoSize = true; this.panel1.Padding = new System.Windows.Forms.Padding(5);
this.linkLabel9.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.panel1.Size = new System.Drawing.Size(1114, 58);
this.linkLabel9.Location = new System.Drawing.Point(672, 31); this.panel1.TabIndex = 7;
this.linkLabel9.Name = "linkLabel9"; //
this.linkLabel9.Size = new System.Drawing.Size(39, 19); // linkLabel9
this.linkLabel9.TabIndex = 24; //
this.linkLabel9.TabStop = true; this.linkLabel9.AutoSize = true;
this.linkLabel9.Text = "12월"; this.linkLabel9.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
// this.linkLabel9.Location = new System.Drawing.Point(672, 31);
// linkLabel10 this.linkLabel9.Name = "linkLabel9";
// this.linkLabel9.Size = new System.Drawing.Size(39, 19);
this.linkLabel10.AutoSize = true; this.linkLabel9.TabIndex = 24;
this.linkLabel10.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel9.TabStop = true;
this.linkLabel10.Location = new System.Drawing.Point(633, 31); this.linkLabel9.Text = "12월";
this.linkLabel10.Name = "linkLabel10"; this.linkLabel9.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel10.Size = new System.Drawing.Size(39, 19); //
this.linkLabel10.TabIndex = 23; // linkLabel10
this.linkLabel10.TabStop = true; //
this.linkLabel10.Text = "11월"; this.linkLabel10.AutoSize = true;
// this.linkLabel10.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
// linkLabel11 this.linkLabel10.Location = new System.Drawing.Point(633, 31);
// this.linkLabel10.Name = "linkLabel10";
this.linkLabel11.AutoSize = true; this.linkLabel10.Size = new System.Drawing.Size(39, 19);
this.linkLabel11.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel10.TabIndex = 23;
this.linkLabel11.Location = new System.Drawing.Point(594, 31); this.linkLabel10.TabStop = true;
this.linkLabel11.Name = "linkLabel11"; this.linkLabel10.Text = "11월";
this.linkLabel11.Size = new System.Drawing.Size(39, 19); this.linkLabel10.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel11.TabIndex = 22; //
this.linkLabel11.TabStop = true; // linkLabel11
this.linkLabel11.Text = "10월"; //
// this.linkLabel11.AutoSize = true;
// linkLabel12 this.linkLabel11.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
// this.linkLabel11.Location = new System.Drawing.Point(594, 31);
this.linkLabel12.AutoSize = true; this.linkLabel11.Name = "linkLabel11";
this.linkLabel12.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel11.Size = new System.Drawing.Size(39, 19);
this.linkLabel12.Location = new System.Drawing.Point(555, 31); this.linkLabel11.TabIndex = 22;
this.linkLabel12.Name = "linkLabel12"; this.linkLabel11.TabStop = true;
this.linkLabel12.Size = new System.Drawing.Size(39, 19); this.linkLabel11.Text = "10월";
this.linkLabel12.TabIndex = 21; this.linkLabel11.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel12.TabStop = true; //
this.linkLabel12.Text = "09월"; // linkLabel12
// //
// linkLabel5 this.linkLabel12.AutoSize = true;
// this.linkLabel12.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel5.AutoSize = true; this.linkLabel12.Location = new System.Drawing.Point(555, 31);
this.linkLabel5.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel12.Name = "linkLabel12";
this.linkLabel5.Location = new System.Drawing.Point(516, 31); this.linkLabel12.Size = new System.Drawing.Size(39, 19);
this.linkLabel5.Name = "linkLabel5"; this.linkLabel12.TabIndex = 21;
this.linkLabel5.Size = new System.Drawing.Size(39, 19); this.linkLabel12.TabStop = true;
this.linkLabel5.TabIndex = 20; this.linkLabel12.Text = "09월";
this.linkLabel5.TabStop = true; this.linkLabel12.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel5.Text = "08월"; //
// // linkLabel5
// linkLabel6 //
// this.linkLabel5.AutoSize = true;
this.linkLabel6.AutoSize = true; this.linkLabel5.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel6.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel5.Location = new System.Drawing.Point(516, 31);
this.linkLabel6.Location = new System.Drawing.Point(477, 31); this.linkLabel5.Name = "linkLabel5";
this.linkLabel6.Name = "linkLabel6"; this.linkLabel5.Size = new System.Drawing.Size(39, 19);
this.linkLabel6.Size = new System.Drawing.Size(39, 19); this.linkLabel5.TabIndex = 20;
this.linkLabel6.TabIndex = 19; this.linkLabel5.TabStop = true;
this.linkLabel6.TabStop = true; this.linkLabel5.Text = "08월";
this.linkLabel6.Text = "07월"; this.linkLabel5.Click += new System.EventHandler(this.linkLabel13_Click);
// //
// linkLabel7 // linkLabel6
// //
this.linkLabel7.AutoSize = true; this.linkLabel6.AutoSize = true;
this.linkLabel7.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel6.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel7.Location = new System.Drawing.Point(672, 7); this.linkLabel6.Location = new System.Drawing.Point(477, 31);
this.linkLabel7.Name = "linkLabel7"; this.linkLabel6.Name = "linkLabel6";
this.linkLabel7.Size = new System.Drawing.Size(39, 19); this.linkLabel6.Size = new System.Drawing.Size(39, 19);
this.linkLabel7.TabIndex = 18; this.linkLabel6.TabIndex = 19;
this.linkLabel7.TabStop = true; this.linkLabel6.TabStop = true;
this.linkLabel7.Text = "06월"; this.linkLabel6.Text = "07월";
// this.linkLabel6.Click += new System.EventHandler(this.linkLabel13_Click);
// linkLabel8 //
// // linkLabel7
this.linkLabel8.AutoSize = true; //
this.linkLabel8.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel7.AutoSize = true;
this.linkLabel8.Location = new System.Drawing.Point(633, 7); this.linkLabel7.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel8.Name = "linkLabel8"; this.linkLabel7.Location = new System.Drawing.Point(672, 7);
this.linkLabel8.Size = new System.Drawing.Size(39, 19); this.linkLabel7.Name = "linkLabel7";
this.linkLabel8.TabIndex = 17; this.linkLabel7.Size = new System.Drawing.Size(39, 19);
this.linkLabel8.TabStop = true; this.linkLabel7.TabIndex = 18;
this.linkLabel8.Text = "05월"; this.linkLabel7.TabStop = true;
// this.linkLabel7.Text = "06월";
// linkLabel3 this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked);
// this.linkLabel7.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel3.AutoSize = true; //
this.linkLabel3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); // linkLabel8
this.linkLabel3.Location = new System.Drawing.Point(594, 7); //
this.linkLabel3.Name = "linkLabel3"; this.linkLabel8.AutoSize = true;
this.linkLabel3.Size = new System.Drawing.Size(39, 19); this.linkLabel8.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel3.TabIndex = 16; this.linkLabel8.Location = new System.Drawing.Point(633, 7);
this.linkLabel3.TabStop = true; this.linkLabel8.Name = "linkLabel8";
this.linkLabel3.Text = "04월"; this.linkLabel8.Size = new System.Drawing.Size(39, 19);
// this.linkLabel8.TabIndex = 17;
// linkLabel4 this.linkLabel8.TabStop = true;
// this.linkLabel8.Text = "05월";
this.linkLabel4.AutoSize = true; this.linkLabel8.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel4.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); //
this.linkLabel4.Location = new System.Drawing.Point(555, 7); // linkLabel3
this.linkLabel4.Name = "linkLabel4"; //
this.linkLabel4.Size = new System.Drawing.Size(39, 19); this.linkLabel3.AutoSize = true;
this.linkLabel4.TabIndex = 15; this.linkLabel3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel4.TabStop = true; this.linkLabel3.Location = new System.Drawing.Point(594, 7);
this.linkLabel4.Text = "03월"; this.linkLabel3.Name = "linkLabel3";
// this.linkLabel3.Size = new System.Drawing.Size(39, 19);
// linkLabel2 this.linkLabel3.TabIndex = 16;
// this.linkLabel3.TabStop = true;
this.linkLabel2.AutoSize = true; this.linkLabel3.Text = "04월";
this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel3.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel2.Location = new System.Drawing.Point(516, 7); //
this.linkLabel2.Name = "linkLabel2"; // linkLabel4
this.linkLabel2.Size = new System.Drawing.Size(39, 19); //
this.linkLabel2.TabIndex = 14; this.linkLabel4.AutoSize = true;
this.linkLabel2.TabStop = true; this.linkLabel4.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel2.Text = "02월"; this.linkLabel4.Location = new System.Drawing.Point(555, 7);
// this.linkLabel4.Name = "linkLabel4";
// linkLabel1 this.linkLabel4.Size = new System.Drawing.Size(39, 19);
// this.linkLabel4.TabIndex = 15;
this.linkLabel1.AutoSize = true; this.linkLabel4.TabStop = true;
this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.linkLabel4.Text = "03월";
this.linkLabel1.Location = new System.Drawing.Point(477, 7); this.linkLabel4.Click += new System.EventHandler(this.linkLabel13_Click);
this.linkLabel1.Name = "linkLabel1"; //
this.linkLabel1.Size = new System.Drawing.Size(39, 19); // linkLabel2
this.linkLabel1.TabIndex = 13; //
this.linkLabel1.TabStop = true; this.linkLabel2.AutoSize = true;
this.linkLabel1.Text = "01월"; this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
// this.linkLabel2.Location = new System.Drawing.Point(516, 7);
// btSave this.linkLabel2.Name = "linkLabel2";
// this.linkLabel2.Size = new System.Drawing.Size(39, 19);
this.btSave.Dock = System.Windows.Forms.DockStyle.Right; this.linkLabel2.TabIndex = 14;
this.btSave.Location = new System.Drawing.Point(959, 5); this.linkLabel2.TabStop = true;
this.btSave.Name = "btSave"; this.linkLabel2.Text = "02월";
this.btSave.Size = new System.Drawing.Size(75, 48); this.linkLabel2.Click += new System.EventHandler(this.linkLabel13_Click);
this.btSave.TabIndex = 12; //
this.btSave.Text = "파일저장"; // linkLabel1
this.btSave.UseVisualStyleBackColor = true; //
this.btSave.Click += new System.EventHandler(this.btSave_Click); this.linkLabel1.AutoSize = true;
// this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
// cmbUser this.linkLabel1.Location = new System.Drawing.Point(477, 7);
// this.linkLabel1.Name = "linkLabel1";
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.linkLabel1.Size = new System.Drawing.Size(39, 19);
this.cmbUser.FormattingEnabled = true; this.linkLabel1.TabIndex = 13;
this.cmbUser.Location = new System.Drawing.Point(289, 32); this.linkLabel1.TabStop = true;
this.cmbUser.Name = "cmbUser"; this.linkLabel1.Text = "01월";
this.cmbUser.Size = new System.Drawing.Size(180, 20); this.linkLabel1.Click += new System.EventHandler(this.linkLabel13_Click);
this.cmbUser.TabIndex = 11; //
// // btSave
// label4 //
// this.btSave.Dock = System.Windows.Forms.DockStyle.Right;
this.label4.AutoSize = true; this.btSave.Location = new System.Drawing.Point(959, 5);
this.label4.Location = new System.Drawing.Point(254, 36); this.btSave.Name = "btSave";
this.label4.Name = "label4"; this.btSave.Size = new System.Drawing.Size(75, 48);
this.label4.Size = new System.Drawing.Size(29, 12); this.btSave.TabIndex = 12;
this.label4.TabIndex = 10; this.btSave.Text = "파일저장";
this.label4.Text = "사원"; this.btSave.UseVisualStyleBackColor = true;
// this.btSave.Click += new System.EventHandler(this.btSave_Click);
// label3 //
// // cmbUser
this.label3.AutoSize = true; //
this.label3.Location = new System.Drawing.Point(261, 12); this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.label3.Name = "label3"; this.cmbUser.FormattingEnabled = true;
this.label3.Size = new System.Drawing.Size(14, 12); this.cmbUser.Location = new System.Drawing.Point(289, 32);
this.label3.TabIndex = 9; this.cmbUser.Name = "cmbUser";
this.label3.Text = "~"; this.cmbUser.Size = new System.Drawing.Size(180, 20);
// this.cmbUser.TabIndex = 11;
// dte //
// // label4
this.dte.Location = new System.Drawing.Point(289, 8); //
this.dte.Name = "dte"; this.label4.AutoSize = true;
this.dte.Size = new System.Drawing.Size(180, 21); this.label4.Location = new System.Drawing.Point(254, 36);
this.dte.TabIndex = 8; this.label4.Name = "label4";
// this.label4.Size = new System.Drawing.Size(29, 12);
// label2 this.label4.TabIndex = 10;
// this.label4.Text = "사원";
this.label2.AutoSize = true; //
this.label2.Location = new System.Drawing.Point(10, 12); // label3
this.label2.Name = "label2"; //
this.label2.Size = new System.Drawing.Size(53, 12); this.label3.AutoSize = true;
this.label2.TabIndex = 7; this.label3.Location = new System.Drawing.Point(261, 12);
this.label2.Text = "검색기간"; this.label3.Name = "label3";
// this.label3.Size = new System.Drawing.Size(14, 12);
// dts this.label3.TabIndex = 9;
// this.label3.Text = "~";
this.dts.Location = new System.Drawing.Point(68, 8); //
this.dts.Name = "dts"; // dte
this.dts.Size = new System.Drawing.Size(180, 21); //
this.dts.TabIndex = 6; this.dte.Location = new System.Drawing.Point(289, 8);
// this.dte.Name = "dte";
// tbProcess this.dte.Size = new System.Drawing.Size(180, 21);
// this.dte.TabIndex = 8;
this.tbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; //
this.tbProcess.FormattingEnabled = true; // label2
this.tbProcess.Location = new System.Drawing.Point(68, 32); //
this.tbProcess.Name = "tbProcess"; this.label2.AutoSize = true;
this.tbProcess.Size = new System.Drawing.Size(180, 20); this.label2.Location = new System.Drawing.Point(10, 12);
this.tbProcess.TabIndex = 5; this.label2.Name = "label2";
this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); this.label2.Size = new System.Drawing.Size(53, 12);
// this.label2.TabIndex = 7;
// label1 this.label2.Text = "검색기간";
// //
this.label1.AutoSize = true; // dts
this.label1.Location = new System.Drawing.Point(34, 36); //
this.label1.Name = "label1"; this.dts.Location = new System.Drawing.Point(68, 8);
this.label1.Size = new System.Drawing.Size(29, 12); this.dts.Name = "dts";
this.label1.TabIndex = 3; this.dts.Size = new System.Drawing.Size(180, 21);
this.label1.Text = "공정"; this.dts.TabIndex = 6;
// //
// btRefresh // tbProcess
// //
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; this.tbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.btRefresh.Location = new System.Drawing.Point(1034, 5); this.tbProcess.FormattingEnabled = true;
this.btRefresh.Name = "btRefresh"; this.tbProcess.Location = new System.Drawing.Point(68, 32);
this.btRefresh.Size = new System.Drawing.Size(75, 48); this.tbProcess.Name = "tbProcess";
this.btRefresh.TabIndex = 2; this.tbProcess.Size = new System.Drawing.Size(180, 20);
this.btRefresh.Text = "새로고침"; this.tbProcess.TabIndex = 5;
this.btRefresh.UseVisualStyleBackColor = true; this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); //
// // label1
// dv1 //
// this.label1.AutoSize = true;
this.dv1.A_DelCurrentCell = true; this.label1.Location = new System.Drawing.Point(34, 36);
this.dv1.A_EnterToTab = true; this.label1.Name = "label1";
this.dv1.A_KoreanField = null; this.label1.Size = new System.Drawing.Size(29, 12);
this.dv1.A_UpperField = null; this.label1.TabIndex = 3;
this.dv1.A_ViewRownumOnHeader = true; this.label1.Text = "공정";
this.dv1.AllowUserToAddRows = false; //
this.dv1.AllowUserToDeleteRows = false; // btRefresh
this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; //
this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
this.dv1.Location = new System.Drawing.Point(0, 58); this.btRefresh.Location = new System.Drawing.Point(1034, 5);
this.dv1.Name = "dv1"; this.btRefresh.Name = "btRefresh";
this.dv1.ReadOnly = true; this.btRefresh.Size = new System.Drawing.Size(75, 48);
this.dv1.RowTemplate.Height = 23; this.btRefresh.TabIndex = 2;
this.dv1.Size = new System.Drawing.Size(1114, 641); this.btRefresh.Text = "새로고침";
this.dv1.TabIndex = 1; this.btRefresh.UseVisualStyleBackColor = true;
// this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
// rJobReportPrj //
// // dv1
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.dv1.A_DelCurrentCell = true;
this.ClientSize = new System.Drawing.Size(1114, 699); this.dv1.A_EnterToTab = true;
this.Controls.Add(this.dv1); this.dv1.A_KoreanField = null;
this.Controls.Add(this.panel1); this.dv1.A_UpperField = null;
this.Name = "rJobReportPrj"; this.dv1.A_ViewRownumOnHeader = true;
this.Text = "개인별 프로젝트 집계"; this.dv1.AllowUserToAddRows = false;
this.Load += new System.EventHandler(this.rJobReport_Load); this.dv1.AllowUserToDeleteRows = false;
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.ResumeLayout(false); this.dv1.Location = new System.Drawing.Point(0, 58);
this.panel1.PerformLayout(); this.dv1.Name = "dv1";
((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); this.dv1.ReadOnly = true;
this.ResumeLayout(false); this.dv1.RowTemplate.Height = 23;
this.dv1.Size = new System.Drawing.Size(1114, 641);
this.dv1.TabIndex = 1;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(884, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 48);
this.button1.TabIndex = 25;
this.button1.Text = "WW축소";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// linkLabel13
//
this.linkLabel13.AutoSize = true;
this.linkLabel13.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel13.Location = new System.Drawing.Point(717, 31);
this.linkLabel13.Name = "linkLabel13";
this.linkLabel13.Size = new System.Drawing.Size(51, 19);
this.linkLabel13.TabIndex = 27;
this.linkLabel13.TabStop = true;
this.linkLabel13.Text = "하반기";
this.linkLabel13.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel14
//
this.linkLabel14.AutoSize = true;
this.linkLabel14.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel14.Location = new System.Drawing.Point(717, 7);
this.linkLabel14.Name = "linkLabel14";
this.linkLabel14.Size = new System.Drawing.Size(51, 19);
this.linkLabel14.TabIndex = 26;
this.linkLabel14.TabStop = true;
this.linkLabel14.Text = "상반기";
this.linkLabel14.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel14_LinkClicked);
this.linkLabel14.Click += new System.EventHandler(this.linkLabel13_Click);
//
// rJobReportPrj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1114, 699);
this.Controls.Add(this.dv1);
this.Controls.Add(this.panel1);
this.Name = "rJobReportPrj";
this.Text = "개인별 프로젝트 집계";
this.Load += new System.EventHandler(this.rJobReport_Load);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit();
this.ResumeLayout(false);
} }
@@ -396,5 +451,8 @@
private System.Windows.Forms.ComboBox tbProcess; private System.Windows.Forms.ComboBox tbProcess;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btRefresh; private System.Windows.Forms.Button btRefresh;
} private System.Windows.Forms.Button button1;
private System.Windows.Forms.LinkLabel linkLabel13;
private System.Windows.Forms.LinkLabel linkLabel14;
}
} }

397
SubProject/FPJ0000/JobReport_/rJobReportPrj.cs
View File

@@ -9,230 +9,289 @@ using System.Windows.Forms;
namespace FPJ0000.JobReport_ namespace FPJ0000.JobReport_
{ {
public partial class rJobReportPrj : Form public partial class rJobReportPrj : Form
{ {
Boolean binit = false; Boolean binit = false;
public rJobReportPrj(string baseday) public rJobReportPrj(string baseday)
{ {
InitializeComponent(); InitializeComponent();
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
this.dts.Value = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01")); this.dts.Value = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01"));
this.dte.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddMonths(1).AddDays(-1); this.dte.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddMonths(1).AddDays(-1);
} }
private void rJobReport_Load(object sender, EventArgs e) private void rJobReport_Load(object sender, EventArgs e)
{ {
this.tbProcess.Items.Clear(); this.tbProcess.Items.Clear();
tbProcess.Items.Add("--전체--"); tbProcess.Items.Add("--전체--");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows) foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs); tbProcess.Items.Add(dr.processs);
this.tbProcess.Text = FCOMMON.info.Login.process; this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
//사용자 목록을 선택한다 //사용자 목록을 선택한다
UpdateUserList(); UpdateUserList();
//this.tbMon.Text = DateTime.Now.ToString("yyyy-MM"); //this.tbMon.Text = DateTime.Now.ToString("yyyy-MM");
refrehData(); refrehData();
binit = true; binit = true;
} }
void UpdateUserList() void UpdateUserList()
{ {
var ta = new dsPRJTableAdapters.vJobReportForUserListTableAdapter(); var ta = new dsPRJTableAdapters.vJobReportForUserListTableAdapter();
cmbUser.Items.Clear(); cmbUser.Items.Clear();
//일반사용자 목록 가져온다 //일반사용자 목록 가져온다
dsPRJ.vJobReportForUserListDataTable userlist; dsPRJ.vJobReportForUserListDataTable userlist;
if (tbProcess.SelectedIndex <= 0) if (tbProcess.SelectedIndex <= 0)
{ {
//공정구분없이 전체사용자를 가져온다 //공정구분없이 전체사용자를 가져온다
userlist = ta.GetData(FCOMMON.info.Login.gcode, "%"); userlist = ta.GetData(FCOMMON.info.Login.gcode, "%");
// db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name).GroupBy(t => t.name); // db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name).GroupBy(t => t.name);
} }
else else
{ {
userlist = ta.GetData(FCOMMON.info.Login.gcode, tbProcess.Text); userlist = ta.GetData(FCOMMON.info.Login.gcode, tbProcess.Text);
//db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).OrderBy(t => t.name).GroupBy(t => t.name); //db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).OrderBy(t => t.name).GroupBy(t => t.name);
} }
//if (tbProcess.SelectedIndex != 0) userlist = userlist.Where(t => t.processs == tbProcess.Text); //해당 공정의 인원만 처리한다 //if (tbProcess.SelectedIndex != 0) userlist = userlist.Where(t => t.processs == tbProcess.Text); //해당 공정의 인원만 처리한다
foreach (var dr in userlist) foreach (var dr in userlist)
{ {
//var dr = item.First(); //var dr = item.First();
cmbUser.Items.Add(String.Format("[{0}] {1}", dr.id, dr.name)); cmbUser.Items.Add(String.Format("[{0}] {1}", dr.id, dr.name));
} }
if (tbProcess.SelectedIndex > 0) if (tbProcess.SelectedIndex > 0)
cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK);
if (cmbUser.SelectedIndex < 0) cmbUser.SelectedIndex = 0; //기본전체로 선택해준다. if (cmbUser.SelectedIndex < 0) cmbUser.SelectedIndex = 0; //기본전체로 선택해준다.
} }
void refrehData() void refrehData()
{ {
//근문일수,시간 //근문일수,시간
var vSD = dts.Value.ToShortDateString(); var vSD = dts.Value.ToShortDateString();
var vED = dte.Value.ToShortDateString(); var vED = dte.Value.ToShortDateString();
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
var taH = new dsReportTableAdapters.JobProjectTimesTableAdapter(); var taH = new dsReportTableAdapters.JobProjectTimesTableAdapter();
var username = cmbUser.Text.Trim(); var username = cmbUser.Text.Trim();
var uid = username.Substring(1, username.IndexOf("]") - 1);// "395552"; var uid = username.Substring(1, username.IndexOf("]") - 1);// "395552";
taH.Fill(this.dsReport.JobProjectTimes, FCOMMON.info.Login.gcode, vSD, vED, uid); taH.Fill(this.dsReport.JobProjectTimes, FCOMMON.info.Login.gcode, vSD, vED, uid);
//this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
//this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
//this.reportViewer1.RefreshReport(); //this.reportViewer1.RefreshReport();
//그리드뷰 생성 //그리드뷰 생성
this.dv1.Rows.Clear(); this.dv1.Rows.Clear();
this.dv1.Columns.Clear(); this.dv1.Columns.Clear();
var wekklist = new string[] { "일", "월", "화", "수", "목", "금", "토" }; var wekklist = new string[] { "일", "월", "화", "수", "목", "금", "토" };
//날짜에 해당하는 열을 먼저 생성한다 //날짜에 해당하는 열을 먼저 생성한다
dv1.Columns.Add("dvcu_pidx", "*"); dv1.Columns.Add("dvcu_pidx", "*");
dv1.Columns.Add("dvcu_title", "프로젝트"); dv1.Columns.Add("dvcu_state", "상태");
//dv1.Columns.Add("dvcu_hrs", "시간"); dv1.Columns.Add("dvcu_title", "프로젝트");
//dv1.Columns.Add("dvcu_hrs", "시간");
//ww컬럼생성 //ww컬럼생성
var wwlist = dsReport.JobProjectTimes.GroupBy(t => t.ww).Select(t => int.Parse(t.Key)).OrderBy(t => t).ToList(); var wwlist = dsReport.JobProjectTimes.GroupBy(t => t.ww).Select(t => int.Parse(t.Key)).OrderBy(t => t).ToList();
var wwfont = new Font("Consolas", 8f); var wwfont = new Font("Consolas", 8f);
dv1.ColumnHeadersDefaultCellStyle.Font = wwfont; dv1.ColumnHeadersDefaultCellStyle.Font = wwfont;
foreach (var item in wwlist) foreach (var item in wwlist)
{ {
dv1.Columns.Add("dvcu_ww" + item, $"{item}(%)"); dv1.Columns.Add("dvcu_ww" + item, $"{item}(%)");
dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.NullValue = ""; dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.NullValue = "";
dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Format = "N2"; dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Format = "N2";
dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Font = wwfont; dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Font = wwfont;
} }
dv1.Columns.Add("dvcu_hrs", "합계(h)"); dv1.Columns.Add("dvcu_hrs", "합계(h)");
dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.BackColor = Color.LightGray; dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.BackColor = Color.LightGray;
dv1.Columns.Add("dvcu_hrs", "비율(%)"); dv1.Columns.Add("dvcu_hrs", "비율(%)");
dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Format = "N2"; dv1.Columns[dv1.Columns.Count - 1].DefaultCellStyle.Format = "N2";
var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs); var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs);
//데이터를 추가한다. //데이터를 추가한다.
foreach (var dr in dsReport.JobProjectTimes.GroupBy(t => t.pidx)) foreach (var dr in dsReport.JobProjectTimes.OrderByDescending(t => t.PrjStatus + t.PrjName).GroupBy(t => t.pidx))
{ {
var pidx = dr.Key; var pidx = dr.Key;
var fdr = dr.First(); var fdr = dr.First();
List<object> row = new List<object>(); List<object> row = new List<object>();
row.Add(dr.Key); row.Add(dr.Key);
if (dr.Key == -1) row.Add("Other"); if (dr.Key == -1)
else row.Add(fdr.title); {
//row.Add("--"); row.Add("--");
row.Add("비 프로젝트 업무");
}
else
{
row.Add(fdr.PrjStatus);
if (fdr.PrjName.isEmpty())
{
row.Add($"{fdr.title}");
}
else
{
row.Add($"{fdr.PrjName}");
}
foreach (var item in wwlist) }
{ //row.Add("--");
var wwsum = dsReport.JobProjectTimes.Where(t => t.ww == item.ToString()).Sum(t => t.hrs);
var wwhrs = 0.0;
var hrsdata = dr.Where(t => t.ww == item.ToString());
if (hrsdata.Any()) wwhrs = hrsdata.Sum(t => t.hrs);
var perc = 0.0; foreach (var item in wwlist)
if (wwsum > 0) perc = (wwhrs / wwsum) * 100.0; {
var wwsum = dsReport.JobProjectTimes.Where(t => t.ww == item.ToString()).Sum(t => t.hrs);
var wwhrs = 0.0;
var hrsdata = dr.Where(t => t.ww == item.ToString());
if (hrsdata.Any()) wwhrs = hrsdata.Sum(t => t.hrs);
if (perc == 0.0) row.Add(null); var perc = 0.0;
else row.Add(perc); if (wwsum > 0) perc = (wwhrs / wwsum) * 100.0;
}
row.Add(dr.Sum(t => t.hrs)); if (perc == 0.0) row.Add(null);
var tperc = 0.0; else row.Add(perc);
if (TotHrs > 0) tperc = (dr.Sum(t => t.hrs) / TotHrs) * 100.0; }
row.Add(tperc); row.Add(dr.Sum(t => t.hrs));
var tperc = 0.0;
if (TotHrs > 0) tperc = (dr.Sum(t => t.hrs) / TotHrs) * 100.0;
if (dr.Key == -1) row.Add(tperc);
dv1.Rows.Insert(0, row.ToArray());
else if (dr.Key == -1)
dv1.Rows.Add(row.ToArray()); dv1.Rows.Insert(0, row.ToArray());
else
dv1.Rows.Add(row.ToArray());
} }
dv1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; dv1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
dv1.Columns[0].DefaultCellStyle.BackColor = Color.LightGray; dv1.Columns[0].DefaultCellStyle.BackColor = Color.LightGray;
dv1.Columns[1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft; dv1.Columns[2].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft;
for (int i = 0; i < this.dv1.ColumnCount; i++) for (int i = 0; i < this.dv1.ColumnCount; i++)
{ {
var col = this.dv1.Columns[i]; var col = this.dv1.Columns[i];
if (col.Name.StartsWith("dvcu_ww") == false) continue; if (col.Name.StartsWith("dvcu_ww") == false) continue;
foreach (DataGridViewRow dvrow in this.dv1.Rows) foreach (DataGridViewRow dvrow in this.dv1.Rows)
{ {
var c = dvrow.Cells[col.Index]; var c = dvrow.Cells[col.Index];
var v = c.Value; var v = c.Value;
double hrs = 0.0; double hrs = 0.0;
if (v != null) hrs = double.Parse(v.ToString()); if (v != null) hrs = double.Parse(v.ToString());
if (hrs > 0) if (hrs > 0)
{ {
c.Style.BackColor = Color.Gold; c.Style.BackColor = Color.Gold;
} }
else else
{ {
c.Style.BackColor = Color.White; c.Style.BackColor = Color.White;
} }
} }
} }
//첫줄은 색상을 변경해준다. //첫줄은 색상을 변경해준다.
if (dv1.RowCount > 0) if (dv1.RowCount > 0)
{ {
var dvrow = dv1.Rows[0]; var dvrow = dv1.Rows[0];
for (int i = 0; i < this.dv1.ColumnCount; i++) for (int i = 0; i < this.dv1.ColumnCount; i++)
{ {
var c = dvrow.Cells[i]; var c = dvrow.Cells[i];
c.Style.BackColor = Color.Gray; c.Style.BackColor = Color.LightGray;
} }
} }
this.dv1.AutoResizeColumns(); this.dv1.AutoResizeColumns();
} }
private void btSave_Click(object sender, EventArgs e) private void btSave_Click(object sender, EventArgs e)
{ {
dv1.ExportData(string.Empty); dv1.ExportData(string.Empty);
} }
private void btRefresh_Click(object sender, EventArgs e) private void btRefresh_Click(object sender, EventArgs e)
{ {
refrehData(); refrehData();
} }
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (binit == false) return; if (binit == false) return;
UpdateUserList(); UpdateUserList();
} }
}
private void button1_Click(object sender, EventArgs e)
{
var newsize = dv1.Columns[2].Width < 10 ? 100 : 5;
this.dv1.SuspendLayout();
for (int i = 3; i < this.dv1.ColumnCount - 2; i++)
{
this.dv1.Columns[i].Width = newsize;
}
this.dv1.ResumeLayout();
}
private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
}
private void linkLabel13_Click(object sender, EventArgs e)
{
var lnk = sender as LinkLabel;
if (lnk.Text.Equals("상반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-05-31");
}
else if (lnk.Text.Equals("하반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-12-31");
}
else
{
if (int.TryParse(lnk.Text.Substring(0, 2), out int mon) == false) return;
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00" + "-01"));
dte.Value = dts.Value.AddMonths(1).AddDays(-1);
}
}
private void linkLabel14_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
}
}
} }

3
SubProject/FPJ0000/JobReport_/rJobReportPrj.resx
View File

@@ -123,6 +123,9 @@
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </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="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value> <value>245, 17</value>
</metadata> </metadata>

28
SubProject/FPJ0000/Project/fPartBuyStatus.resx
View File

@@ -331,20 +331,20 @@
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALpSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s
zXSY6XRO0dREFwbZahqZl9BEBxWiFL2o0C46tXmbc7rhFpnL1Ob9Al6Wuss5bmf67TlnSw2EfvDhefGc Zipm3uYUTU10YZAtppHX0ESFClGKXlRoF53a1Dnn3IZbZC5Tm/MueFnqLudsO9NvzzlbaiD0gw/Pi+d8
74fz+57DYyf0njrxYqlOFVWm+x0m01HkpDnK2VNPR5X20xFPtKYzUk2lf/TbfVxo94Q/6tUsWekVk8nk P5zf9xweO2EPFMmXKzWy6CrN73CxhiInzVHNnlo6ulJNR5arDOdEylr/mLcHuNDeiXg8qFyx0GsGg8Ft
ttg3YLHtsGJlofFzwYqCTzMQlo04BJlKH2/UM5HF2iU23D/lgn6agX6GgW6KgXbSCfWvDbQO27HBAE0j tjlgtu6yZmGh8XPJguJPc4ivGrfzc6Q+3qhnospUK2xYPeOCdpaBdo6BZoaBatoJxS8HusZscDBA+ziF
FAo+TCP5mYn6RxIma6XWHU4YZ934OsuQk8EAJ3Gix7yBL8MOItiEccEN/bwLRcoZ8O92vuHCseXBE9dl 4g+zSHtmoP6RhIu7qE27E/p5N77OM+RkMMxJnBgwOvBlzE4EW9AvuaFddKFUOoeQ+31vuHBcdbDppjhm
0VuSmqtIrr6G6rZ6FDaUgy8LQDBBUHQaofITqGiq4Fax0QwWVx0ITehhOEFMKf9951AzmsdeolqXx0kS W9hwHWn1N1Df3YKS1mqEiAMQTOCXnkWY5BRq2mu4Vaw0g+V1O8KSBhhOEFsZ8r5vtAMdky9RrynkJEl1
qiKQ9zoeWfVCiBWXkKRIQtPgIppNNnz+vo410lOYvJfmBIJKgY+/LNutG+3GqyE5StSZnCSxJpKELyPt kSh8nYjclngIGq8gtTEV7SPL6DBY8fn7JjZIT+GSQZoT8Gv5Pv7iPLdmoh+vRiWoUORwkuSGKBK+iszn
eSo0Zju3SscYBRXpYdXuQlhhn0fATnhxD51TK4LBrIVCfweP23MRW34eiVXRMEw5YCDFsgVrxj2dWIgg GVAabdwqvZMUZKSHdZsL4SVDHgE7EWUDdH5TCnRGFRq19/CkpwBx1ReRXBcD3YwdOlIsW7ByytOJmQjC
VL5LcPa+zHUy/xDiKwUwjvejqDsdcmUOhE9DUK/+iG9zDAyk2P5JF/oIS1YX+A+8gmNSX0mQ9CCy6uJw JHsE5x+KXaeLjiCxlg/9lBql/VmQSPMR/zQULYqP+LbAQEeKVU+7MERYsbgQ8sgrOCHyFQaJDiO3OQG3
oyYccRUXOEmOMh7ShlTyJiFg740zbgywn5hgJUUGZms9giDp/rkg6QHykC+C8nxxpSQEGS9E0AyrUKTK GiKQUHOJk+RLEyFqzSBvEgr2Xj/nxjD7iQkWUmRgnsojCBIdXAgSHSIP+SKo0BfXKkKR/SIFyjEZSmVF
R/o7EcQ1MTAQgZ78GzoioF2bRKDeWeFcdi+9sEZjcM7N0TM6j9u1aUghQYlCiNy6W9t3LA6nmwgadwSs yHqXAkFDLHREoCX/hoYIaNcWESh2V7iQN0gvbdAYWXBzDEws4m5TJtJJUNgYj4LmOzt3LHanmwjadgWs
bdayI/gfdnaF1F2CUzldDtnD0q29Ht6Lrq6uzSMJTTZvnBSZ1j4xve6wshcTyxQmliiYvSzbXBxs8zba bd68K/gfNnaFjD2CM/lyu1hcvr3fw/shl8u3jiW1W71xUmRmj2l2025hL0yrFEwrFIxeVq0uDrZ5K+0J
E6Yoas3vZssPb5zHO57WlhEobm0/KlFZAiWN9DYpHgL+Im6k/cQtq4eTWjoCRMpkHo/H+wPLWp3CEq51 UxS14Xe784c3zuOdzOzODhR09RwXysyBwjZ6h3QPAX8RtNF+gs71o6mdvQEp0jQej8f7A8h4nb60ARZQ
jAAAAABJRU5ErkJggg== AAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

4
SubProject/FPJ0000/dsQuery.xss
View File

@@ -6,8 +6,8 @@
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:JobReportItemList" ZOrder="2" X="70" Y="70" Height="134" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" /> <Shape ID="DesignTable:JobReportItemList" ZOrder="2" X="40" Y="54" Height="305" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="392" Y="70" Height="48" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="16" /> <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="392" Y="70" Height="220" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
</Shapes> </Shapes>
<Connectors /> <Connectors />
</DiagramLayout> </DiagramLayout>

102
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -2800,6 +2800,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnidx; private global::System.Data.DataColumn columnidx;
private global::System.Data.DataColumn columnPrjStatus;
private global::System.Data.DataColumn columnPrjName;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobProjectTimesDataTable() { public JobProjectTimesDataTable() {
@@ -2873,6 +2877,22 @@ namespace FPJ0000 {
} }
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn PrjStatusColumn {
get {
return this.columnPrjStatus;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn PrjNameColumn {
get {
return this.columnPrjName;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.Browsable(false)]
@@ -2910,14 +2930,16 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobProjectTimesRow AddJobProjectTimesRow(string ww, int pidx, string title, double hrs, int idx) { public JobProjectTimesRow AddJobProjectTimesRow(string ww, int pidx, string title, double hrs, int idx, string PrjStatus, string PrjName) {
JobProjectTimesRow rowJobProjectTimesRow = ((JobProjectTimesRow)(this.NewRow())); JobProjectTimesRow rowJobProjectTimesRow = ((JobProjectTimesRow)(this.NewRow()));
object[] columnValuesArray = new object[] { object[] columnValuesArray = new object[] {
ww, ww,
pidx, pidx,
title, title,
hrs, hrs,
idx}; idx,
PrjStatus,
PrjName};
rowJobProjectTimesRow.ItemArray = columnValuesArray; rowJobProjectTimesRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobProjectTimesRow); this.Rows.Add(rowJobProjectTimesRow);
return rowJobProjectTimesRow; return rowJobProjectTimesRow;
@@ -2952,6 +2974,8 @@ namespace FPJ0000 {
this.columntitle = base.Columns["title"]; this.columntitle = base.Columns["title"];
this.columnhrs = base.Columns["hrs"]; this.columnhrs = base.Columns["hrs"];
this.columnidx = base.Columns["idx"]; this.columnidx = base.Columns["idx"];
this.columnPrjStatus = base.Columns["PrjStatus"];
this.columnPrjName = base.Columns["PrjName"];
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2967,6 +2991,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnhrs); base.Columns.Add(this.columnhrs);
this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnidx); base.Columns.Add(this.columnidx);
this.columnPrjStatus = new global::System.Data.DataColumn("PrjStatus", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPrjStatus);
this.columnPrjName = new global::System.Data.DataColumn("PrjName", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPrjName);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true)); this.columnidx}, true));
this.columnww.ReadOnly = true; this.columnww.ReadOnly = true;
@@ -2978,6 +3006,8 @@ namespace FPJ0000 {
this.columnidx.AllowDBNull = false; this.columnidx.AllowDBNull = false;
this.columnidx.ReadOnly = true; this.columnidx.ReadOnly = true;
this.columnidx.Unique = true; this.columnidx.Unique = true;
this.columnPrjStatus.MaxLength = 50;
this.columnPrjName.MaxLength = 255;
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5181,6 +5211,38 @@ namespace FPJ0000 {
} }
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string PrjStatus {
get {
if (this.IsPrjStatusNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobProjectTimes.PrjStatusColumn]));
}
}
set {
this[this.tableJobProjectTimes.PrjStatusColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string PrjName {
get {
if (this.IsPrjNameNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobProjectTimes.PrjNameColumn]));
}
}
set {
this[this.tableJobProjectTimes.PrjNameColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IswwNull() { public bool IswwNull() {
@@ -5228,6 +5290,30 @@ namespace FPJ0000 {
public void SethrsNull() { public void SethrsNull() {
this[this.tableJobProjectTimes.hrsColumn] = global::System.Convert.DBNull; this[this.tableJobProjectTimes.hrsColumn] = global::System.Convert.DBNull;
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPrjStatusNull() {
return this.IsNull(this.tableJobProjectTimes.PrjStatusColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetPrjStatusNull() {
this[this.tableJobProjectTimes.PrjStatusColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPrjNameNull() {
return this.IsNull(this.tableJobProjectTimes.PrjNameColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetPrjNameNull() {
this[this.tableJobProjectTimes.PrjNameColumn] = global::System.Convert.DBNull;
}
} }
/// <summary> /// <summary>
@@ -7761,6 +7847,8 @@ ORDER BY pdate";
tableMapping.ColumnMappings.Add("title", "title"); tableMapping.ColumnMappings.Add("title", "title");
tableMapping.ColumnMappings.Add("hrs", "hrs"); tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("idx", "idx"); tableMapping.ColumnMappings.Add("idx", "idx");
tableMapping.ColumnMappings.Add("PrjStatus", "PrjStatus");
tableMapping.ColumnMappings.Add("PrjName", "PrjName");
this._adapter.TableMappings.Add(tableMapping); this._adapter.TableMappings.Add(tableMapping);
} }
@@ -7777,10 +7865,12 @@ ORDER BY pdate";
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT MAX(idx) AS idx, dbo.getWorkWeek(pdate) AS ww, ISNULL(pidx, 0) AS pidx, MAX(projectName) AS title, ISNULL(SUM(hrs), 0) AS hrs this._commandCollection[0].CommandText = @"SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs,
FROM JobReport Projects.status AS PrjStatus, Projects.name AS PrjName
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) AND (ISNULL(hrs, 0) > 0) FROM JobReport LEFT OUTER JOIN
GROUP BY dbo.getWorkWeek(pdate), ISNULL(pidx, 0) Projects ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0)
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), Projects.name, Projects.status
ORDER BY title, ww"; ORDER BY title, ww";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

12
SubProject/FPJ0000/dsReport.cs
View File

@@ -2,10 +2,10 @@
{ {
partial class dsReport partial class dsReport
{ {
partial class JobReportDayDataTable partial class JobReportDayDataTable
{ {
} }
} }
} }

28
SubProject/FPJ0000/dsReport.xsd
View File

@@ -295,13 +295,15 @@ ORDER BY pdate</CommandText>
</TableAdapter> </TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobProjectTimesTableAdapter" GeneratorDataComponentClassName="JobProjectTimesTableAdapter" Name="JobProjectTimes" UserDataComponentName="JobProjectTimesTableAdapter"> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobProjectTimesTableAdapter" GeneratorDataComponentClassName="JobProjectTimesTableAdapter" Name="JobProjectTimes" UserDataComponentName="JobProjectTimesTableAdapter">
<MainSource> <MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill"> <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand> <SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false"> <DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT MAX(idx) AS idx, dbo.getWorkWeek(pdate) AS ww, ISNULL(pidx, 0) AS pidx, MAX(projectName) AS title, ISNULL(SUM(hrs), 0) AS hrs <CommandText>SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs,
FROM JobReport Projects.status AS PrjStatus, Projects.name AS PrjName
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) AND (ISNULL(hrs, 0) &gt; 0) FROM JobReport LEFT OUTER JOIN
GROUP BY dbo.getWorkWeek(pdate), ISNULL(pidx, 0) Projects ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) &gt; 0)
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), Projects.name, Projects.status
ORDER BY title, ww</CommandText> ORDER BY title, ww</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -319,6 +321,8 @@ ORDER BY title, ww</CommandText>
<Mapping SourceColumn="title" DataSetColumn="title" /> <Mapping SourceColumn="title" DataSetColumn="title" />
<Mapping SourceColumn="hrs" DataSetColumn="hrs" /> <Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="idx" DataSetColumn="idx" /> <Mapping SourceColumn="idx" DataSetColumn="idx" />
<Mapping SourceColumn="PrjStatus" DataSetColumn="PrjStatus" />
<Mapping SourceColumn="PrjName" DataSetColumn="PrjName" />
</Mappings> </Mappings>
<Sources /> <Sources />
</TableAdapter> </TableAdapter>
@@ -660,6 +664,20 @@ ORDER BY title, ww</CommandText>
</xs:element> </xs:element>
<xs:element name="hrs" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" /> <xs:element name="hrs" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
<xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="PrjStatus" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PrjStatus" msprop:Generator_ColumnVarNameInTable="columnPrjStatus" msprop:Generator_ColumnPropNameInTable="PrjStatusColumn" msprop:Generator_UserColumnName="PrjStatus" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="PrjName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PrjName" msprop:Generator_ColumnVarNameInTable="columnPrjName" msprop:Generator_ColumnPropNameInTable="PrjNameColumn" msprop:Generator_UserColumnName="PrjName" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>

4
SubProject/FPJ0000/dsReport.xss
View File

@@ -6,13 +6,13 @@
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="54" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="54" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="1" X="494" Y="216" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" /> <Shape ID="DesignTable:jobReport" ZOrder="2" X="384" Y="301" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" /> <Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="9" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:ProcessList" ZOrder="9" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="8" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" /> <Shape ID="DesignTable:ProcessUserList" ZOrder="8" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="6" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:HolidayLIst" ZOrder="6" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobProjectTimes" ZOrder="2" X="537" Y="622" Height="191" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:JobProjectTimes" ZOrder="1" X="624" Y="600" Height="267" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="199" />
<Shape ID="DesignTable:PartSummary" ZOrder="7" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" /> <Shape ID="DesignTable:PartSummary" ZOrder="7" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:K5DailyForm" ZOrder="5" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" /> <Shape ID="DesignTable:K5DailyForm" ZOrder="5" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
</Shapes> </Shapes>