From d0f201cf83ee783ee4144fd19640669adcb7c02c Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 19 Jun 2023 08:41:36 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=B1=94=ED=94=BC=EC=96=B8=EC=97=90=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EA=B8=B0=EA=B0=84=20=EC=9E=85=EB=A0=A5=20=EC=B6=94=EA=B0=80(?= =?UTF-8?q?=EC=A7=84=EC=8A=B9=EB=A6=ACp)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/EETGW.csproj | 4 +- .../FPJ0000/Project/fProjectListU.Designer.cs | 670 ++++++++++-------- SubProject/FPJ0000/Project/fProjectListU.cs | 8 +- .../Project/fProjectSummary.Designer.cs | 36 +- .../FPJ0000/Project/fProjectSummary.resx | 40 +- 5 files changed, 399 insertions(+), 359 deletions(-) diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index d9c9f5d..3c778b8 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -176,7 +176,9 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\System.dll + ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll diff --git a/SubProject/FPJ0000/Project/fProjectListU.Designer.cs b/SubProject/FPJ0000/Project/fProjectListU.Designer.cs index 4b760ff..235b64b 100644 --- a/SubProject/FPJ0000/Project/fProjectListU.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectListU.Designer.cs @@ -30,7 +30,6 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectListU)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); @@ -46,6 +45,7 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -98,17 +98,33 @@ this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bsHist = new System.Windows.Forms.BindingSource(this.components); this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.prb1 = new arCtl.arLabel(); this.panel3 = new System.Windows.Forms.Panel(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.rt_cmp = new System.Windows.Forms.RichTextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.rt_aft = new System.Windows.Forms.RichTextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.rt_bef = new System.Windows.Forms.RichTextBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.richTextBox2 = new System.Windows.Forms.RichTextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.arDatagridView1 = new arCtl.arDatagridView(); + this.prjDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.perc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bsProjectHRS = new System.Windows.Forms.BindingSource(this.components); this.dsProjectSummary1 = new FPJ0000.Project.DSProjectSummary(); - this.arDatagridView1 = new arCtl.arDatagridView(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.dte = new System.Windows.Forms.DateTimePicker(); + this.dts = new System.Windows.Forms.DateTimePicker(); this.button4 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); @@ -116,36 +132,25 @@ this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.cmbUserList = new System.Windows.Forms.ComboBox(); this.projectHrsTableAdapter = new FPJ0000.Project.DSProjectSummaryTableAdapters.ProjectHrsTableAdapter(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.richTextBox2 = new System.Windows.Forms.RichTextBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.rt_cmp = new System.Windows.Forms.RichTextBox(); - this.rt_bef = new System.Windows.Forms.RichTextBox(); - this.rt_aft = new System.Windows.Forms.RichTextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.prjDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.perc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.grpsum = new System.Windows.Forms.GroupBox(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit(); this.panel3.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsProjectHRS)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsProjectSummary1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); this.tableLayoutPanel3.SuspendLayout(); this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); + this.grpsum.SuspendLayout(); this.SuspendLayout(); // // bn @@ -601,231 +606,6 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // - // bsHist - // - this.bsHist.DataMember = "ProjectsHistory"; - this.bsHist.DataSource = this.dsMSSQL; - this.bsHist.Sort = "pdate desc"; - this.bsHist.CurrentChanged += new System.EventHandler(this.bsHist_CurrentChanged); - // - // taHist - // - this.taHist.ClearBeforeFill = true; - // - // prb1 - // - this.prb1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.prb1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); - this.prb1.BackgroundImagePadding = new System.Windows.Forms.Padding(0); - this.prb1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); - this.prb1.BorderColorOver = System.Drawing.Color.Red; - this.prb1.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); - this.prb1.ColorTheme = arCtl.arLabel.eColorTheme.Custom; - this.tableLayoutPanel3.SetColumnSpan(this.prb1, 4); - this.prb1.Cursor = System.Windows.Forms.Cursors.Arrow; - this.prb1.Dock = System.Windows.Forms.DockStyle.Fill; - this.prb1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.prb1.ForeColor = System.Drawing.Color.Black; - this.prb1.GradientEnable = true; - this.prb1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; - this.prb1.GradientRepeatBG = false; - this.prb1.isButton = false; - this.prb1.Location = new System.Drawing.Point(153, 5); - this.prb1.Margin = new System.Windows.Forms.Padding(5); - this.prb1.MouseDownColor = System.Drawing.Color.Yellow; - this.prb1.MouseOverColor = System.Drawing.Color.Yellow; - this.prb1.msg = null; - this.prb1.Name = "prb1"; - this.prb1.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); - this.prb1.ProgressBorderColor = System.Drawing.Color.Black; - this.prb1.ProgressColor1 = System.Drawing.Color.Lime; - this.prb1.ProgressColor2 = System.Drawing.Color.Green; - this.prb1.ProgressEnable = true; - this.prb1.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); - this.prb1.ProgressForeColor = System.Drawing.Color.White; - this.prb1.ProgressMax = 100F; - this.prb1.ProgressMin = 0F; - this.prb1.ProgressPadding = new System.Windows.Forms.Padding(0); - this.prb1.ProgressValue = 50F; - this.prb1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.prb1.Sign = ""; - 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.TabIndex = 32; - this.prb1.TextAlign = System.Drawing.ContentAlignment.TopCenter; - this.prb1.TextShadow = false; - this.prb1.TextVisible = true; - this.toolTip1.SetToolTip(this.prb1, "구매대상 중 구매완료 율"); - // - // panel3 - // - this.panel3.Controls.Add(this.groupBox3); - this.panel3.Controls.Add(this.groupBox2); - this.panel3.Controls.Add(this.groupBox1); - this.panel3.Controls.Add(this.arDatagridView1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 399); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1585, 438); - this.panel3.TabIndex = 7; - // - // bsProjectHRS - // - this.bsProjectHRS.DataMember = "ProjectHrs"; - this.bsProjectHRS.DataSource = this.dsProjectSummary1; - // - // dsProjectSummary1 - // - this.dsProjectSummary1.DataSetName = "DSProjectSummary"; - this.dsProjectSummary1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // arDatagridView1 - // - this.arDatagridView1.A_DelCurrentCell = true; - this.arDatagridView1.A_EnterToTab = true; - this.arDatagridView1.A_KoreanField = null; - this.arDatagridView1.A_UpperField = null; - this.arDatagridView1.A_ViewRownumOnHeader = true; - this.arDatagridView1.AllowUserToAddRows = false; - this.arDatagridView1.AllowUserToDeleteRows = false; - this.arDatagridView1.AllowUserToResizeColumns = false; - this.arDatagridView1.AllowUserToResizeRows = false; - this.arDatagridView1.AutoGenerateColumns = false; - this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.prjDataGridViewTextBoxColumn, - this.perc}); - this.arDatagridView1.DataSource = this.bsProjectHRS; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.arDatagridView1.DefaultCellStyle = dataGridViewCellStyle2; - this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Left; - this.arDatagridView1.Location = new System.Drawing.Point(0, 0); - this.arDatagridView1.Name = "arDatagridView1"; - this.arDatagridView1.ReadOnly = true; - this.arDatagridView1.RowHeadersVisible = false; - this.arDatagridView1.RowTemplate.Height = 23; - this.arDatagridView1.Size = new System.Drawing.Size(412, 438); - this.arDatagridView1.TabIndex = 1; - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 5; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 148F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - 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, 378); - 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.TabIndex = 34; - // - // label17 - // - this.label17.Dock = System.Windows.Forms.DockStyle.Fill; - this.label17.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(3, 0); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(142, 21); - this.label17.TabIndex = 0; - this.label17.Text = "구매 진행"; - this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panel2 - // - this.panel2.Controls.Add(this.button4); - this.panel2.Controls.Add(this.button3); - this.panel2.Controls.Add(this.button2); - this.panel2.Controls.Add(this.button1); - this.panel2.Controls.Add(this.linkLabel1); - this.panel2.Controls.Add(this.cmbUserList); - this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1585, 68); - this.panel2.TabIndex = 35; - // - // button4 - // - this.button4.Dock = System.Windows.Forms.DockStyle.Right; - this.button4.Location = new System.Drawing.Point(1491, 0); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(94, 68); - this.button4.TabIndex = 5; - this.button4.Text = "닫기"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // - // button3 - // - this.button3.Location = new System.Drawing.Point(561, 12); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(94, 45); - this.button3.TabIndex = 4; - this.button3.Text = "조회"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click); - // - // button2 - // - this.button2.Location = new System.Drawing.Point(461, 12); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(94, 45); - this.button2.TabIndex = 3; - this.button2.Text = "다음"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click_2); - // - // button1 - // - this.button1.Location = new System.Drawing.Point(361, 12); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(94, 45); - this.button1.TabIndex = 2; - this.button1.Text = "이전"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click_2); - // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.linkLabel1.Location = new System.Drawing.Point(12, 15); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(98, 37); - this.linkLabel1.TabIndex = 1; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "담당자"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // - // cmbUserList - // - this.cmbUserList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbUserList.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.cmbUserList.FormattingEnabled = true; - this.cmbUserList.Location = new System.Drawing.Point(116, 12); - this.cmbUserList.Name = "cmbUserList"; - this.cmbUserList.Size = new System.Drawing.Size(239, 45); - this.cmbUserList.TabIndex = 0; - // - // projectHrsTableAdapter - // - this.projectHrsTableAdapter.ClearBeforeFill = true; - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -969,55 +749,75 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // groupBox1 + // bsHist // - this.groupBox1.Controls.Add(this.richTextBox1); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left; - this.groupBox1.Location = new System.Drawing.Point(412, 0); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(10); - this.groupBox1.Size = new System.Drawing.Size(378, 438); - this.groupBox1.TabIndex = 2; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "요청사항"; + this.bsHist.DataMember = "ProjectsHistory"; + this.bsHist.DataSource = this.dsMSSQL; + this.bsHist.Sort = "pdate desc"; + this.bsHist.CurrentChanged += new System.EventHandler(this.bsHist_CurrentChanged); // - // richTextBox1 + // taHist // - this.richTextBox1.BackColor = System.Drawing.Color.WhiteSmoke; - this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true)); - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Location = new System.Drawing.Point(10, 24); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(358, 404); - this.richTextBox1.TabIndex = 0; - this.richTextBox1.Text = ""; - this.richTextBox1.ZoomFactor = 1.5F; + this.taHist.ClearBeforeFill = true; // - // groupBox2 + // prb1 // - this.groupBox2.Controls.Add(this.richTextBox2); - this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left; - this.groupBox2.Location = new System.Drawing.Point(790, 0); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(10); - this.groupBox2.Size = new System.Drawing.Size(378, 438); - this.groupBox2.TabIndex = 3; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "금주진행사항"; + this.prb1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.prb1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); + this.prb1.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.prb1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); + this.prb1.BorderColorOver = System.Drawing.Color.Red; + this.prb1.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); + this.prb1.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.tableLayoutPanel3.SetColumnSpan(this.prb1, 4); + this.prb1.Cursor = System.Windows.Forms.Cursors.Arrow; + this.prb1.Dock = System.Windows.Forms.DockStyle.Fill; + this.prb1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.prb1.ForeColor = System.Drawing.Color.Black; + this.prb1.GradientEnable = true; + this.prb1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; + this.prb1.GradientRepeatBG = false; + this.prb1.isButton = false; + this.prb1.Location = new System.Drawing.Point(153, 5); + this.prb1.Margin = new System.Windows.Forms.Padding(5); + this.prb1.MouseDownColor = System.Drawing.Color.Yellow; + this.prb1.MouseOverColor = System.Drawing.Color.Yellow; + this.prb1.msg = null; + this.prb1.Name = "prb1"; + this.prb1.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.prb1.ProgressBorderColor = System.Drawing.Color.Black; + this.prb1.ProgressColor1 = System.Drawing.Color.Lime; + this.prb1.ProgressColor2 = System.Drawing.Color.Green; + this.prb1.ProgressEnable = true; + this.prb1.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); + this.prb1.ProgressForeColor = System.Drawing.Color.White; + this.prb1.ProgressMax = 100F; + this.prb1.ProgressMin = 0F; + this.prb1.ProgressPadding = new System.Windows.Forms.Padding(0); + this.prb1.ProgressValue = 50F; + this.prb1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.prb1.Sign = ""; + 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.TabIndex = 32; + this.prb1.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.prb1.TextShadow = false; + this.prb1.TextVisible = true; + this.toolTip1.SetToolTip(this.prb1, "구매대상 중 구매완료 율"); // - // richTextBox2 + // panel3 // - this.richTextBox2.BackColor = System.Drawing.Color.WhiteSmoke; - this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "lasthistory", true)); - this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox2.Location = new System.Drawing.Point(10, 24); - this.richTextBox2.Name = "richTextBox2"; - this.richTextBox2.Size = new System.Drawing.Size(358, 404); - this.richTextBox2.TabIndex = 0; - this.richTextBox2.Text = ""; - this.richTextBox2.ZoomFactor = 1.5F; + this.panel3.Controls.Add(this.groupBox3); + this.panel3.Controls.Add(this.groupBox2); + this.panel3.Controls.Add(this.groupBox1); + this.panel3.Controls.Add(this.grpsum); + this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel3.Location = new System.Drawing.Point(0, 399); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1585, 438); + this.panel3.TabIndex = 7; // // groupBox3 // @@ -1027,7 +827,7 @@ this.groupBox3.Controls.Add(this.label1); this.groupBox3.Controls.Add(this.rt_bef); this.groupBox3.Dock = System.Windows.Forms.DockStyle.Left; - this.groupBox3.Location = new System.Drawing.Point(1168, 0); + this.groupBox3.Location = new System.Drawing.Point(1162, 0); this.groupBox3.Name = "groupBox3"; this.groupBox3.Padding = new System.Windows.Forms.Padding(10); this.groupBox3.Size = new System.Drawing.Size(378, 438); @@ -1047,17 +847,16 @@ this.rt_cmp.Text = ""; this.rt_cmp.ZoomFactor = 1.5F; // - // rt_bef + // label2 // - this.rt_bef.BackColor = System.Drawing.Color.WhiteSmoke; - this.rt_bef.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.rt_bef.Dock = System.Windows.Forms.DockStyle.Bottom; - this.rt_bef.Location = new System.Drawing.Point(10, 317); - this.rt_bef.Name = "rt_bef"; - this.rt_bef.Size = new System.Drawing.Size(358, 111); - this.rt_bef.TabIndex = 1; - this.rt_bef.Text = ""; - this.rt_bef.ZoomFactor = 1.5F; + this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label2.Location = new System.Drawing.Point(10, 166); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(358, 20); + this.label2.TabIndex = 4; + this.label2.Text = "After"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // rt_aft // @@ -1082,16 +881,102 @@ this.label1.Text = "Before"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // label2 + // rt_bef // - this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label2.Location = new System.Drawing.Point(10, 166); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(358, 20); - this.label2.TabIndex = 4; - this.label2.Text = "After"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.rt_bef.BackColor = System.Drawing.Color.WhiteSmoke; + this.rt_bef.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.rt_bef.Dock = System.Windows.Forms.DockStyle.Bottom; + this.rt_bef.Location = new System.Drawing.Point(10, 317); + this.rt_bef.Name = "rt_bef"; + this.rt_bef.Size = new System.Drawing.Size(358, 111); + this.rt_bef.TabIndex = 1; + this.rt_bef.Text = ""; + this.rt_bef.ZoomFactor = 1.5F; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.richTextBox2); + this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left; + this.groupBox2.Location = new System.Drawing.Point(784, 0); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Padding = new System.Windows.Forms.Padding(10); + this.groupBox2.Size = new System.Drawing.Size(378, 438); + this.groupBox2.TabIndex = 3; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "금주진행사항"; + // + // richTextBox2 + // + this.richTextBox2.BackColor = System.Drawing.Color.WhiteSmoke; + this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "lasthistory", true)); + this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox2.Location = new System.Drawing.Point(10, 24); + this.richTextBox2.Name = "richTextBox2"; + this.richTextBox2.Size = new System.Drawing.Size(358, 404); + this.richTextBox2.TabIndex = 0; + this.richTextBox2.Text = ""; + this.richTextBox2.ZoomFactor = 1.5F; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.richTextBox1); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left; + this.groupBox1.Location = new System.Drawing.Point(406, 0); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(10); + this.groupBox1.Size = new System.Drawing.Size(378, 438); + this.groupBox1.TabIndex = 2; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "요청사항"; + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.WhiteSmoke; + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true)); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(10, 24); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(358, 404); + this.richTextBox1.TabIndex = 0; + this.richTextBox1.Text = ""; + this.richTextBox1.ZoomFactor = 1.5F; + // + // arDatagridView1 + // + this.arDatagridView1.A_DelCurrentCell = true; + this.arDatagridView1.A_EnterToTab = true; + this.arDatagridView1.A_KoreanField = null; + this.arDatagridView1.A_UpperField = null; + this.arDatagridView1.A_ViewRownumOnHeader = true; + this.arDatagridView1.AllowUserToAddRows = false; + this.arDatagridView1.AllowUserToDeleteRows = false; + this.arDatagridView1.AllowUserToResizeColumns = false; + this.arDatagridView1.AllowUserToResizeRows = false; + this.arDatagridView1.AutoGenerateColumns = false; + this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.prjDataGridViewTextBoxColumn, + this.perc}); + this.arDatagridView1.DataSource = this.bsProjectHRS; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.arDatagridView1.DefaultCellStyle = dataGridViewCellStyle2; + this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.arDatagridView1.Location = new System.Drawing.Point(3, 17); + this.arDatagridView1.Name = "arDatagridView1"; + this.arDatagridView1.ReadOnly = true; + this.arDatagridView1.RowHeadersVisible = false; + this.arDatagridView1.RowTemplate.Height = 23; + this.arDatagridView1.Size = new System.Drawing.Size(400, 418); + this.arDatagridView1.TabIndex = 1; // // prjDataGridViewTextBoxColumn // @@ -1113,6 +998,162 @@ this.perc.ReadOnly = true; this.perc.Width = 40; // + // bsProjectHRS + // + this.bsProjectHRS.DataMember = "ProjectHrs"; + this.bsProjectHRS.DataSource = this.dsProjectSummary1; + // + // dsProjectSummary1 + // + this.dsProjectSummary1.DataSetName = "DSProjectSummary"; + this.dsProjectSummary1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 5; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 148F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + 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, 378); + 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.TabIndex = 34; + // + // label17 + // + this.label17.Dock = System.Windows.Forms.DockStyle.Fill; + this.label17.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label17.Location = new System.Drawing.Point(3, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(142, 21); + this.label17.TabIndex = 0; + this.label17.Text = "구매 진행"; + this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panel2 + // + this.panel2.Controls.Add(this.panel1); + this.panel2.Controls.Add(this.dte); + this.panel2.Controls.Add(this.dts); + this.panel2.Controls.Add(this.button4); + this.panel2.Controls.Add(this.button3); + this.panel2.Controls.Add(this.button2); + this.panel2.Controls.Add(this.button1); + this.panel2.Controls.Add(this.linkLabel1); + this.panel2.Controls.Add(this.cmbUserList); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1585, 68); + this.panel2.TabIndex = 35; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.panel1.Location = new System.Drawing.Point(661, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(10, 45); + this.panel1.TabIndex = 8; + // + // dte + // + this.dte.Location = new System.Drawing.Point(676, 36); + this.dte.Name = "dte"; + this.dte.Size = new System.Drawing.Size(200, 21); + this.dte.TabIndex = 7; + // + // dts + // + this.dts.Location = new System.Drawing.Point(676, 12); + this.dts.Name = "dts"; + this.dts.Size = new System.Drawing.Size(200, 21); + this.dts.TabIndex = 6; + // + // button4 + // + this.button4.Dock = System.Windows.Forms.DockStyle.Right; + this.button4.Location = new System.Drawing.Point(1491, 0); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(94, 68); + this.button4.TabIndex = 5; + this.button4.Text = "닫기"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // button3 + // + this.button3.Location = new System.Drawing.Point(561, 12); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(94, 45); + this.button3.TabIndex = 4; + this.button3.Text = "조회"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(461, 12); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(94, 45); + this.button2.TabIndex = 3; + this.button2.Text = "다음"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click_2); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(361, 12); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(94, 45); + this.button1.TabIndex = 2; + this.button1.Text = "이전"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click_2); + // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel1.Location = new System.Drawing.Point(12, 15); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(98, 37); + this.linkLabel1.TabIndex = 1; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "담당자"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // + // cmbUserList + // + this.cmbUserList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUserList.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.cmbUserList.FormattingEnabled = true; + this.cmbUserList.Location = new System.Drawing.Point(116, 12); + this.cmbUserList.Name = "cmbUserList"; + this.cmbUserList.Size = new System.Drawing.Size(239, 45); + this.cmbUserList.TabIndex = 0; + // + // projectHrsTableAdapter + // + this.projectHrsTableAdapter.ClearBeforeFill = true; + // + // grpsum + // + this.grpsum.Controls.Add(this.arDatagridView1); + this.grpsum.Dock = System.Windows.Forms.DockStyle.Left; + this.grpsum.Location = new System.Drawing.Point(0, 0); + this.grpsum.Name = "grpsum"; + this.grpsum.Size = new System.Drawing.Size(406, 438); + this.grpsum.TabIndex = 5; + this.grpsum.TabStop = false; + this.grpsum.Text = "집계기간"; + // // fProjectListU // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1133,18 +1174,19 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit(); this.panel3.ResumeLayout(false); + this.groupBox3.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsProjectHRS)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsProjectSummary1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); this.tableLayoutPanel3.ResumeLayout(false); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.groupBox2.ResumeLayout(false); - this.groupBox3.ResumeLayout(false); + this.grpsum.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1234,5 +1276,9 @@ private System.Windows.Forms.RichTextBox rt_bef; private System.Windows.Forms.DataGridViewTextBoxColumn prjDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn perc; + private System.Windows.Forms.DateTimePicker dte; + private System.Windows.Forms.DateTimePicker dts; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.GroupBox grpsum; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectListU.cs b/SubProject/FPJ0000/Project/fProjectListU.cs index 13189fa..9b1599d 100644 --- a/SubProject/FPJ0000/Project/fProjectListU.cs +++ b/SubProject/FPJ0000/Project/fProjectListU.cs @@ -82,6 +82,9 @@ namespace FPJ0000 //} //this.cmbYearS.Text = DateTime.Now.AddYears(-2).Year.ToString("0000"); //this.cmbYearE.Text = DateTime.Now.Year.ToString("0000"); + dts.Value = DateTime.Now.AddDays(-7); + dte.Value = DateTime.Now.AddDays(-1); + Refresh_UserList(); // refreshData(); @@ -202,10 +205,11 @@ namespace FPJ0000 { var ta = new Project.DSProjectSummaryTableAdapters.ProjectHrsTableAdapter(); var uid = cmbUserList.Text.Split('|')[1].Trim(); - var sd = DateTime.Now.AddDays(-7); - var ed = DateTime.Now; + var sd = dts.Value;// DateTime.Now.AddDays(-7); + var ed = dte.Value;// DateTime.Now; ta.Fill(dsProjectSummary1.ProjectHrs, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString()); + grpsum.Text =$"집계기간:{sd.ToShortDateString()}~{ed.ToShortDateString()}"; //var ss = chart1.Series[0]; //ss.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.String; //ss.YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Double; diff --git a/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs b/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs index 3bbbec3..cd0edae 100644 --- a/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs @@ -76,6 +76,7 @@ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tbFind = new System.Windows.Forms.ToolStripTextBox(); this.btFind = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -140,7 +141,6 @@ this.label17 = new System.Windows.Forms.Label(); this.fpSpread2 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread2_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.taSchedule = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -383,6 +383,17 @@ this.btFind.Text = "toolStripButton1"; this.btFind.Click += new System.EventHandler(this.btFind_Click); // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(23, 22); + this.toolStripButton2.Text = "toolStripButton2"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // cm // this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -1293,10 +1304,6 @@ this.fpSpread2_Sheet1.ActiveColumnIndex = -1; this.fpSpread2_Sheet1.ActiveRowIndex = -1; this.fpSpread2_Sheet1.AutoGenerateColumns = false; - this.fpSpread2_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "상태"; this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; @@ -1388,28 +1395,9 @@ this.fpSpread2_Sheet1.Columns.Get(13).DataField = "memo"; this.fpSpread2_Sheet1.Columns.Get(13).Width = 63F; this.fpSpread2_Sheet1.DataAutoSizeColumns = false; - this.fpSpread2_Sheet1.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread2_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread2_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread2_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread2_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripButton2 - // - this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(23, 22); - this.toolStripButton2.Text = "toolStripButton2"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // // taSchedule // this.taSchedule.ClearBeforeFill = true; diff --git a/SubProject/FPJ0000/Project/fProjectSummary.resx b/SubProject/FPJ0000/Project/fProjectSummary.resx index a067122..f43d961 100644 --- a/SubProject/FPJ0000/Project/fProjectSummary.resx +++ b/SubProject/FPJ0000/Project/fProjectSummary.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigpL15TLXGlrrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9psBGKzvoR+Yx/H+N9Ayrx6JYwl9o1Fd78jiQu/DCMyuMLofhEEl07+Qq3r6OidmJDDu6Pdc - L3XS2wKDRwf9iBbHXI3kZ53pGcSMhB73VzLvn7sExn8R5pnzoJCDYDhwYXbVAtNwmMyzoSyeELIlGPaf - 80kKqiwKVQWzA2Vdcqi7FRI/ZR0Pil0ZwvE0NKenlguqLKUqJV3CNQ83oW20GeVntpGgwMBYMFNgnwzB - PhGEczqIt18S2N0xQQrUfaUqBb2V096txy5TOYpPFEDeugmD3hCsgsbZvzd4/SmOilYvVMz2yjJazjU6 - 6yCjC7kiOm+L8dYC4qkl2CZZ4rXzX1JAtuA3sPGqse6DsqcE1Vf34LDjIDbS67j19NrNwkZttg+IJZfg - mGJxezojaugJi0Rq5WU1lyuhd2txyF6DYrqAy2/KhAVaBt9h8dtP3PFlNrg/wx+S8zGLbKm7lJC1F6JI - n4f8o2uWwwK6a/OkYIgPCmFScIN/iGxeBGLQGL2r3oH2yktE+QLX0zDxuv18gRDI1YYO928xI6GBeY5I - 4gfYWBqfIykE2CSonQYPciVruGcXMxKOmOfGajv9ydrOWVSf9WHvqZV7+Uco6g/42Cyvdv6y6QAAAABJ + SKESs3bThpqMigpL15TLXDnWWotRWW7pZGrq0pb01b7Mvmy3NjdbWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G6PyI9ltBGGzvoR+Yx8n+N9Ayrx6LYwl9IzFd7/DiQu+jKMzuCLofRkAl07+Qq3rayokZCYwn9j3X + S532tcDg1UE/rMUJdyP5WWd6BjEjocfzlcz7566ACVyGeeYiKOQgGA5dml2zwDQUIfNsKIs3jGwJhoMX + /JKCKotCVcHsQlmXHOpuhcRP2cZCYleGSCINzdnJlYIqS6lKSZdwzUNNaBtpRvm5HSQoMDAayhQ4JsJw + jIfgmgrh7Zcl7O0YJwXqvlKVgt7Oae/VY4+pHMWnCiBv3QKrLwyboDH27w1ef0qgotUHFbOzsoyWc42u + OsjoQq6IzttmvL2ARGoZ9gmWeB38lxSQLfgN7LxqbAeg7ClB9fV9OOo8jM30Bm4jvX6rsFGb/QPiyWU4 + J1ncmcqIGnzCYim1+rKaq5XQe7Q44qhBMV3A5TdlwgIt1ndY/PYTd/2ZDR7M8IfkmmaRLXWXErL2QhTp + 85B/fN1KWEB3Y54UDPJBIUwKbvIPkc2LYBwao2/NO9Bee4kYX+B+GiFeT4AvEAK52tTh+S1mJDQwzxFd + +gE2nsbnaApBNglqt8GLXMka7jvEjIRj5rnR2s5AsrZzFtXn/dh/ZvVe/hGK+gP1YSyu+L7jcgAAAABJ RU5ErkJggg== @@ -247,17 +247,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ - Eg8mGi9gosGEgwcqMSBoxPBQEiQYBXkLypCwGbJgYBsgDNnEMrbZjTHpBDra9bGu69f/RhU1MfHxTb/p - I//P9/co9d9aHi1aDI+c1SK/eHXsZDDw4sj+YH9R3k9+U5TncJTsM3GKcndaVMPIADDIlfXuc1qJI+oo - S625LqjfHJu/poRdFWHm1bHzJk5RvuHihKErUKMNkEKNkNgnkMODMNI8yUrC0EXind339DY4jksxQxaf - iVOUv/uokNF2CNyCZKAZwodqbM2WIT53Fby3BvzSLfCLN7HtqSSuIJ1x8A8dF02cBAwUa2l5A7yvBdsL - deAmb0DmZkhVwayevSe+d5AdzzNQqJh4toMTWm7+jEosA7qUA3WZgRp7CJ+vD1anGx0TLHqm1mH3RJDd - m4mTgBZLytBl6IIbad4GbXMQqY12KGv34F3qxOg8h9XPEj5tqpgJChhf/IIRK62bOPkLbRY1ownQtqxI - cV25qkqkBnKoEv3OGJajImZZGc6QhGlib0xF71sWJk5RngeFiqHxBH4Kdb0RSriawBWQ/JdzbQfiKpzB - JKYCSUwwIuYjKromo3sBK/UFMTnhS8w5ejLJ1Q6I/kcQmQaIH2vRS2ZeXpcw6d+Fs363pqJtbGUvgKnN - v87UHe723TkU99QVKD/69TCtzwQELBDIxSqYI9Wt70XQdL1hqzp10Yz4vZps7IE2O0sPkF30Tcfw2O7I - 0PR9wzveDndzqfC8PL/UPPrnell15oqr9RIfsjVh7HaJZH7+Oz0rP1g6Tp+W7XfP7e3i30RRXwHASCOy - TBzbmAAAAABJRU5ErkJggg== + Eg8mGi9gosGEgwcqMeB8BMNDTZBgFOQtKEPCZsiCgW2AMGQVx9hmN8akE+ho18e6rl//G1XUxMTHN/2m + j/w/39+j1H9raaRkITJ8Wov+4pXR46Hgi0N7Q30lBT/5TUmB01m2x8QpytNhUQ0jC8AgV847zxklgZiz + Ir3qPqd+c3zuihJxV0X8r46cNXGKYoZKk4auQI01QAo3QmKfQI4MwMjwJCsFQxeJt3feM1vgOC7tH7Qw + Jk5Rga7DQlbbJnALUsFmCB9qsTlTgcTsZfC+OvCLN8AvXMeWt5q4inTGITB4VDRxEtBfqmXkdfBMC7bm + reAmrkHmpklVwayeuye/d5Abz9tfrJh4roNjWn7+rEosA7qUB3XZDzX+AAzTC5vLg/ZxFt2Ta3B4o8jt + zcRJQIslbegydMGDDG+HtjGA9HoblNW78C12YGSOw8pnCZ82VEyHBIwtfMGwjdZNnPyFVoua1QRomzak + uc58VSVaBzlcjT5XHEsxETOsDFdYwhSxL66i5y0LE6co7/1ixdB4Aj+FutYIJVJL4CpIgYv5toMJFa5Q + CpPBFMb9IuaiKjonYrsBy7eL4nKSSc44u7OplXaIgYcQ/Q0QP9ajh8y8tCZhIrAD5/xuVUXr6PJugL++ + 8KrferCLuXUg4bUWKT/69RCtTwcFzBPIzSqYJdVt70XQtNWw15w4b0b8Xk12dl+rg6X7yS56p+J47HBm + afqe4Rtrg6e5XHheWVhuHv1zvaw5dcn96AIftjdh9GaZZH7+Oz2r3F8+Rp+UHXfO7O7i30RRXwG87COv + NeyO8wAAAABJRU5ErkJggg==