From 8e384da8ff660d89f4c528bff54b0cf241b6d9e4 Mon Sep 17 00:00:00 2001 From: chi Date: Fri, 8 Dec 2023 16:56:58 +0900 Subject: [PATCH] .. --- Project/Properties/AssemblyInfo.cs | 4 +- .../FPJ0000/Project/fProjectList.Designer.cs | 323 +++++++++++++++--- SubProject/FPJ0000/Project/fProjectList.cs | 19 ++ 3 files changed, 290 insertions(+), 56 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index dcfdbe7..55b33a8 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.12.06.1000")] -[assembly: AssemblyFileVersion("23.12.06.1000")] +[assembly: AssemblyVersion("23.12.08.1640")] +[assembly: AssemblyFileVersion("23.12.08.1640")] diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 4b5cab1..0df95bd 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -203,6 +203,19 @@ this.label17 = new System.Windows.Forms.Label(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.timer1 = new System.Windows.Forms.Timer(this.components); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.label32 = new System.Windows.Forms.Label(); + this.label33 = new System.Windows.Forms.Label(); + this.label34 = new System.Windows.Forms.Label(); + this.label35 = new System.Windows.Forms.Label(); + this.lbcnt1 = new System.Windows.Forms.Label(); + this.lbcnt2 = new System.Windows.Forms.Label(); + this.lbcnt3 = new System.Windows.Forms.Label(); + this.lbcnt4 = new System.Windows.Forms.Label(); + this.label40 = new System.Windows.Forms.Label(); + this.label41 = new System.Windows.Forms.Label(); + this.lbcnt5 = new System.Windows.Forms.Label(); + this.lbcnt6 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -222,6 +235,7 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); this.SuspendLayout(); // // bn @@ -258,14 +272,14 @@ this.sbCount, this.toolStripButton2, this.toolStripButton5}); - this.bn.Location = new System.Drawing.Point(0, 837); + this.bn.Location = new System.Drawing.Point(0, 665); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1585, 25); + this.bn.Size = new System.Drawing.Size(1339, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -671,11 +685,11 @@ this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.fpSpread1.Location = new System.Drawing.Point(0, 79); + this.fpSpread1.Location = new System.Drawing.Point(0, 108); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1585, 496); + this.fpSpread1.Size = new System.Drawing.Size(1339, 295); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -998,7 +1012,7 @@ this.tbRequest}); this.toolStrip1.Location = new System.Drawing.Point(5, 5); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1355, 29); + this.toolStrip1.Size = new System.Drawing.Size(1109, 29); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -1114,10 +1128,10 @@ // this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 596); + this.label1.Location = new System.Drawing.Point(0, 424); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1585, 23); + this.label1.Size = new System.Drawing.Size(1339, 23); this.label1.TabIndex = 5; this.label1.Text = "--"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1140,7 +1154,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1585, 139); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1339, 139); this.tableLayoutPanel1.TabIndex = 11; // // rtMemo @@ -1149,10 +1163,10 @@ this.rtMemo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHistD, "remark", true)); this.rtMemo.Dock = System.Windows.Forms.DockStyle.Fill; this.rtMemo.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.rtMemo.Location = new System.Drawing.Point(1112, 28); + this.rtMemo.Location = new System.Drawing.Point(939, 28); this.rtMemo.Name = "rtMemo"; this.rtMemo.ReadOnly = true; - this.rtMemo.Size = new System.Drawing.Size(470, 108); + this.rtMemo.Size = new System.Drawing.Size(397, 108); this.rtMemo.TabIndex = 35; this.rtMemo.Text = ""; this.rtMemo.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.rtMemo_MouseDoubleClick); @@ -1169,10 +1183,10 @@ this.panel5.Controls.Add(this.label31); this.panel5.Controls.Add(this.sbDateMemo); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(1109, 0); + this.panel5.Location = new System.Drawing.Point(936, 0); this.panel5.Margin = new System.Windows.Forms.Padding(0); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(476, 25); + this.panel5.Size = new System.Drawing.Size(403, 25); this.panel5.TabIndex = 35; // // label31 @@ -1180,7 +1194,7 @@ this.label31.Dock = System.Windows.Forms.DockStyle.Fill; this.label31.Location = new System.Drawing.Point(0, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(376, 25); + this.label31.Size = new System.Drawing.Size(303, 25); this.label31.TabIndex = 14; this.label31.Text = "프로젝트 메모"; this.label31.Click += new System.EventHandler(this.label31_Click); @@ -1191,7 +1205,7 @@ this.sbDateMemo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHistD, "pdate", true)); this.sbDateMemo.Dock = System.Windows.Forms.DockStyle.Right; this.sbDateMemo.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sbDateMemo.Location = new System.Drawing.Point(376, 0); + this.sbDateMemo.Location = new System.Drawing.Point(303, 0); this.sbDateMemo.Margin = new System.Windows.Forms.Padding(0); this.sbDateMemo.Name = "sbDateMemo"; this.sbDateMemo.Size = new System.Drawing.Size(100, 25); @@ -1204,10 +1218,10 @@ this.panel4.Controls.Add(this.label11); this.panel4.Controls.Add(this.label4); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(475, 0); + this.panel4.Location = new System.Drawing.Point(401, 0); this.panel4.Margin = new System.Windows.Forms.Padding(0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(634, 25); + this.panel4.Size = new System.Drawing.Size(535, 25); this.panel4.TabIndex = 0; // // label11 @@ -1215,7 +1229,7 @@ this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Location = new System.Drawing.Point(0, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(534, 25); + this.label11.Size = new System.Drawing.Size(435, 25); this.label11.TabIndex = 14; this.label11.Text = "주간 진행 내용"; this.label11.Click += new System.EventHandler(this.label11_Click); @@ -1226,7 +1240,7 @@ this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); this.label4.Dock = System.Windows.Forms.DockStyle.Right; this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(534, 0); + this.label4.Location = new System.Drawing.Point(435, 0); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 25); @@ -1249,7 +1263,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(475, 25); + this.label2.Size = new System.Drawing.Size(401, 25); this.label2.TabIndex = 0; this.label2.Text = "요청 사항"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1262,7 +1276,7 @@ this.richTextBox1.Location = new System.Drawing.Point(3, 28); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(469, 108); + this.richTextBox1.Size = new System.Drawing.Size(395, 108); this.richTextBox1.TabIndex = 1; this.richTextBox1.Text = ""; // @@ -1272,10 +1286,10 @@ this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true)); this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.richTextBox2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.richTextBox2.Location = new System.Drawing.Point(478, 28); + this.richTextBox2.Location = new System.Drawing.Point(404, 28); this.richTextBox2.Name = "richTextBox2"; this.richTextBox2.ReadOnly = true; - this.richTextBox2.Size = new System.Drawing.Size(628, 108); + this.richTextBox2.Size = new System.Drawing.Size(529, 108); this.richTextBox2.TabIndex = 1; this.richTextBox2.Text = ""; this.richTextBox2.TextChanged += new System.EventHandler(this.richTextBox2_TextChanged); @@ -1316,7 +1330,7 @@ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1585, 79); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1339, 79); this.tableLayoutPanel2.TabIndex = 12; // // label6 @@ -1335,7 +1349,7 @@ // this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(1192, 1); + this.label5.Location = new System.Drawing.Point(1009, 1); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(74, 22); this.label5.TabIndex = 0; @@ -1348,7 +1362,7 @@ this.label9.Dock = System.Windows.Forms.DockStyle.Fill; this.label9.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label9.Location = new System.Drawing.Point(400, 1); + this.label9.Location = new System.Drawing.Point(339, 1); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(74, 22); this.label9.TabIndex = 0; @@ -1361,7 +1375,7 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label3.Location = new System.Drawing.Point(796, 1); + this.label3.Location = new System.Drawing.Point(674, 1); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(74, 22); this.label3.TabIndex = 0; @@ -1375,7 +1389,7 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Location = new System.Drawing.Point(85, 1); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(308, 22); + this.label7.Size = new System.Drawing.Size(247, 22); this.label7.TabIndex = 1; this.label7.Text = "--"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1384,9 +1398,9 @@ // this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); this.label8.Dock = System.Windows.Forms.DockStyle.Fill; - this.label8.Location = new System.Drawing.Point(481, 1); + this.label8.Location = new System.Drawing.Point(420, 1); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(308, 22); + this.label8.Size = new System.Drawing.Size(247, 22); this.label8.TabIndex = 1; this.label8.Text = "--"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1395,9 +1409,9 @@ // this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(877, 1); + this.label10.Location = new System.Drawing.Point(755, 1); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(308, 22); + this.label10.Size = new System.Drawing.Size(247, 22); this.label10.TabIndex = 1; this.label10.Text = "--"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1407,9 +1421,9 @@ this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label12.Location = new System.Drawing.Point(1273, 1); + this.label12.Location = new System.Drawing.Point(1090, 1); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(308, 22); + this.label12.Size = new System.Drawing.Size(245, 22); this.label12.TabIndex = 1; this.label12.Text = "--"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1423,7 +1437,7 @@ this.label13.Location = new System.Drawing.Point(1, 24); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(395, 22); + this.label13.Size = new System.Drawing.Size(334, 22); this.label13.TabIndex = 0; this.label13.Text = "Cost Summary"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1433,7 +1447,7 @@ this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(397, 24); + this.label14.Location = new System.Drawing.Point(336, 24); this.label14.Margin = new System.Windows.Forms.Padding(0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(80, 22); @@ -1446,7 +1460,7 @@ this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(793, 24); + this.label15.Location = new System.Drawing.Point(671, 24); this.label15.Margin = new System.Windows.Forms.Padding(0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(80, 22); @@ -1459,7 +1473,7 @@ this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(1189, 24); + this.label16.Location = new System.Drawing.Point(1006, 24); this.label16.Margin = new System.Windows.Forms.Padding(0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(80, 22); @@ -1472,10 +1486,10 @@ this.sbSumO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumO.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumO.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumO.Location = new System.Drawing.Point(478, 24); + this.sbSumO.Location = new System.Drawing.Point(417, 24); this.sbSumO.Margin = new System.Windows.Forms.Padding(0); this.sbSumO.Name = "sbSumO"; - this.sbSumO.Size = new System.Drawing.Size(314, 22); + this.sbSumO.Size = new System.Drawing.Size(253, 22); this.sbSumO.TabIndex = 1; this.sbSumO.Text = "--"; this.sbSumO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1485,10 +1499,10 @@ this.sbSumI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumI.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumI.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumI.Location = new System.Drawing.Point(874, 24); + this.sbSumI.Location = new System.Drawing.Point(752, 24); this.sbSumI.Margin = new System.Windows.Forms.Padding(0); this.sbSumI.Name = "sbSumI"; - this.sbSumI.Size = new System.Drawing.Size(314, 22); + this.sbSumI.Size = new System.Drawing.Size(253, 22); this.sbSumI.TabIndex = 1; this.sbSumI.Text = "--"; this.sbSumI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1498,10 +1512,10 @@ this.sbSumE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.sbSumE.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumE.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sbSumE.Location = new System.Drawing.Point(1270, 24); + this.sbSumE.Location = new System.Drawing.Point(1087, 24); this.sbSumE.Margin = new System.Windows.Forms.Padding(0); this.sbSumE.Name = "sbSumE"; - this.sbSumE.Size = new System.Drawing.Size(314, 22); + this.sbSumE.Size = new System.Drawing.Size(251, 22); this.sbSumE.TabIndex = 1; this.sbSumE.Text = "--"; this.sbSumE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1527,7 +1541,7 @@ this.panel2.Location = new System.Drawing.Point(1, 47); this.panel2.Margin = new System.Windows.Forms.Padding(0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1583, 31); + this.panel2.Size = new System.Drawing.Size(1337, 31); this.panel2.TabIndex = 2; // // button2 @@ -1766,7 +1780,7 @@ this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb1.SignColor = System.Drawing.Color.Yellow; this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb1.Size = new System.Drawing.Size(1427, 11); + this.prb1.Size = new System.Drawing.Size(1181, 11); this.prb1.TabIndex = 32; this.prb1.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.prb1.TextShadow = false; @@ -1778,9 +1792,9 @@ this.panel3.Controls.Add(this.tableLayoutPanel1); this.panel3.Controls.Add(this.tableLayoutPanel2); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 619); + this.panel3.Location = new System.Drawing.Point(0, 447); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1585, 218); + this.panel3.Size = new System.Drawing.Size(1339, 218); this.panel3.TabIndex = 7; // // toolStrip2 @@ -1803,7 +1817,7 @@ this.cmbSort}); this.toolStrip2.Location = new System.Drawing.Point(5, 34); this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(1355, 39); + this.toolStrip2.Size = new System.Drawing.Size(1109, 39); this.toolStrip2.TabIndex = 8; this.toolStrip2.Text = "toolStrip2"; // @@ -1950,7 +1964,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1585, 79); + this.panel1.Size = new System.Drawing.Size(1339, 79); this.panel1.TabIndex = 9; // // btSearch @@ -1958,7 +1972,7 @@ this.btSearch.Dock = System.Windows.Forms.DockStyle.Right; this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); this.btSearch.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btSearch.Location = new System.Drawing.Point(1360, 5); + this.btSearch.Location = new System.Drawing.Point(1114, 5); this.btSearch.Name = "btSearch"; this.btSearch.Padding = new System.Windows.Forms.Padding(5, 0, 3, 0); this.btSearch.Size = new System.Drawing.Size(122, 69); @@ -1973,7 +1987,7 @@ this.button1.Dock = System.Windows.Forms.DockStyle.Right; this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image"))); this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(1482, 5); + this.button1.Location = new System.Drawing.Point(1236, 5); this.button1.Name = "button1"; this.button1.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); this.button1.Size = new System.Drawing.Size(98, 69); @@ -1994,11 +2008,11 @@ this.tableLayoutPanel3.Controls.Add(this.label17, 0, 0); this.tableLayoutPanel3.Controls.Add(this.prb1, 1, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 575); + this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 403); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1585, 21); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1339, 21); this.tableLayoutPanel3.TabIndex = 34; // // label17 @@ -2021,11 +2035,198 @@ this.timer1.Interval = 300; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // + // tableLayoutPanel4 + // + this.tableLayoutPanel4.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; + this.tableLayoutPanel4.ColumnCount = 12; + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel4.Controls.Add(this.label32, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.label33, 6, 0); + this.tableLayoutPanel4.Controls.Add(this.label34, 2, 0); + this.tableLayoutPanel4.Controls.Add(this.label35, 4, 0); + this.tableLayoutPanel4.Controls.Add(this.lbcnt1, 1, 0); + this.tableLayoutPanel4.Controls.Add(this.lbcnt2, 3, 0); + this.tableLayoutPanel4.Controls.Add(this.lbcnt3, 5, 0); + this.tableLayoutPanel4.Controls.Add(this.lbcnt4, 7, 0); + this.tableLayoutPanel4.Controls.Add(this.label40, 8, 0); + this.tableLayoutPanel4.Controls.Add(this.label41, 10, 0); + this.tableLayoutPanel4.Controls.Add(this.lbcnt5, 9, 0); + this.tableLayoutPanel4.Controls.Add(this.lbcnt6, 11, 0); + this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Top; + this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 79); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + this.tableLayoutPanel4.RowCount = 1; + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(1339, 29); + this.tableLayoutPanel4.TabIndex = 35; + // + // label32 + // + this.label32.BackColor = System.Drawing.Color.Gainsboro; + this.label32.Dock = System.Windows.Forms.DockStyle.Fill; + this.label32.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label32.Location = new System.Drawing.Point(1, 1); + this.label32.Margin = new System.Windows.Forms.Padding(0); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(80, 27); + this.label32.TabIndex = 0; + this.label32.Text = "검토"; + this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label32, "시작일"); + // + // label33 + // + this.label33.BackColor = System.Drawing.Color.Gainsboro; + this.label33.Dock = System.Windows.Forms.DockStyle.Fill; + this.label33.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label33.Location = new System.Drawing.Point(670, 1); + this.label33.Margin = new System.Windows.Forms.Padding(0); + this.label33.Name = "label33"; + this.label33.Size = new System.Drawing.Size(80, 27); + this.label33.TabIndex = 0; + this.label33.Text = "취소"; + this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label33, "완료일"); + // + // label34 + // + this.label34.BackColor = System.Drawing.Color.Gainsboro; + this.label34.Dock = System.Windows.Forms.DockStyle.Fill; + this.label34.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label34.Location = new System.Drawing.Point(224, 1); + this.label34.Margin = new System.Windows.Forms.Padding(0); + this.label34.Name = "label34"; + this.label34.Size = new System.Drawing.Size(80, 27); + this.label34.TabIndex = 0; + this.label34.Text = "진행"; + this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label34, "예상완료일"); + // + // label35 + // + this.label35.BackColor = System.Drawing.Color.Gainsboro; + this.label35.Dock = System.Windows.Forms.DockStyle.Fill; + this.label35.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.label35.Location = new System.Drawing.Point(447, 1); + this.label35.Margin = new System.Windows.Forms.Padding(0); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(80, 27); + this.label35.TabIndex = 0; + this.label35.Text = "보류"; + this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label35, "출고일(프로그램의 경우 설치일)"); + // + // lbcnt1 + // + this.lbcnt1.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbcnt1.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbcnt1.Location = new System.Drawing.Point(85, 1); + this.lbcnt1.Name = "lbcnt1"; + this.lbcnt1.Size = new System.Drawing.Size(135, 27); + this.lbcnt1.TabIndex = 1; + this.lbcnt1.Text = "000"; + this.lbcnt1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lbcnt2 + // + this.lbcnt2.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbcnt2.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbcnt2.Location = new System.Drawing.Point(308, 1); + this.lbcnt2.Name = "lbcnt2"; + this.lbcnt2.Size = new System.Drawing.Size(135, 27); + this.lbcnt2.TabIndex = 1; + this.lbcnt2.Text = "000"; + this.lbcnt2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lbcnt3 + // + this.lbcnt3.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbcnt3.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbcnt3.Location = new System.Drawing.Point(531, 1); + this.lbcnt3.Name = "lbcnt3"; + this.lbcnt3.Size = new System.Drawing.Size(135, 27); + this.lbcnt3.TabIndex = 1; + this.lbcnt3.Text = "000"; + this.lbcnt3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lbcnt4 + // + this.lbcnt4.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbcnt4.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbcnt4.Location = new System.Drawing.Point(754, 1); + this.lbcnt4.Name = "lbcnt4"; + this.lbcnt4.Size = new System.Drawing.Size(135, 27); + this.lbcnt4.TabIndex = 1; + this.lbcnt4.Text = "000"; + this.lbcnt4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label40 + // + this.label40.BackColor = System.Drawing.Color.Gainsboro; + this.label40.Dock = System.Windows.Forms.DockStyle.Fill; + this.label40.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label40.Location = new System.Drawing.Point(893, 1); + this.label40.Margin = new System.Windows.Forms.Padding(0); + this.label40.Name = "label40"; + this.label40.Size = new System.Drawing.Size(80, 27); + this.label40.TabIndex = 0; + this.label40.Text = "완료"; + this.label40.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label41 + // + this.label41.BackColor = System.Drawing.Color.Gainsboro; + this.label41.Dock = System.Windows.Forms.DockStyle.Fill; + this.label41.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label41.Location = new System.Drawing.Point(1116, 1); + this.label41.Margin = new System.Windows.Forms.Padding(0); + this.label41.Name = "label41"; + this.label41.Size = new System.Drawing.Size(80, 27); + this.label41.TabIndex = 0; + this.label41.Text = "완료(보고)"; + this.label41.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lbcnt5 + // + this.lbcnt5.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbcnt5.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbcnt5.Location = new System.Drawing.Point(977, 1); + this.lbcnt5.Name = "lbcnt5"; + this.lbcnt5.Size = new System.Drawing.Size(135, 27); + this.lbcnt5.TabIndex = 1; + this.lbcnt5.Text = "000"; + this.lbcnt5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lbcnt6 + // + this.lbcnt6.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbcnt6.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbcnt6.Location = new System.Drawing.Point(1200, 1); + this.lbcnt6.Name = "lbcnt6"; + this.lbcnt6.Size = new System.Drawing.Size(135, 27); + this.lbcnt6.TabIndex = 1; + this.lbcnt6.Text = "000"; + this.lbcnt6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1585, 862); + this.ClientSize = new System.Drawing.Size(1339, 690); this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.tableLayoutPanel4); this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.panel1); this.Controls.Add(this.label1); @@ -2058,6 +2259,7 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel4.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -2200,5 +2402,18 @@ private dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter taHistD; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.Timer timer1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; + private System.Windows.Forms.Label label32; + private System.Windows.Forms.Label label33; + private System.Windows.Forms.Label label34; + private System.Windows.Forms.Label label35; + private System.Windows.Forms.Label lbcnt1; + private System.Windows.Forms.Label lbcnt2; + private System.Windows.Forms.Label lbcnt3; + private System.Windows.Forms.Label lbcnt4; + private System.Windows.Forms.Label label40; + private System.Windows.Forms.Label label41; + private System.Windows.Forms.Label lbcnt5; + private System.Windows.Forms.Label lbcnt6; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 4aeb47b..98131f3 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -278,6 +278,25 @@ namespace FPJ0000 sbSumO.Text = this.dsMSSQL.Projects.Sum(t => t.costo).ToString("N2"); sbSumI.Text = this.dsMSSQL.Projects.Sum(t => t.costn).ToString("N2"); + lbcnt1.Text = "--"; + lbcnt2.Text = "--"; + lbcnt3.Text = "--"; + lbcnt4.Text = "--"; + lbcnt5.Text = "--"; + lbcnt6.Text = "--"; + + var grps = this.dsMSSQL.Projects.GroupBy(t => t.status); + foreach (var grp in grps) + { + var cnt = grp.Count(); + if (grp.Key == "검토") lbcnt1.Text = cnt.ToString(); + else if (grp.Key == "진행") lbcnt2.Text = cnt.ToString(); + else if (grp.Key == "보류") lbcnt3.Text = cnt.ToString(); + else if (grp.Key == "취소") lbcnt4.Text = cnt.ToString(); + else if (grp.Key == "완료") lbcnt5.Text = cnt.ToString(); + else if (grp.Key == "완료(보고)") lbcnt6.Text = cnt.ToString(); + } + FormattingData(); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); }