From 0dd2f5582087d2e9a79c2379961ab53d1f641761 Mon Sep 17 00:00:00 2001 From: "chikyun.kim" Date: Wed, 8 May 2019 09:42:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=AC=B4=EC=9D=BC=EC=A7=80=20/=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=AA=A9=EB=A1=9D=20=20?= =?UTF-8?q?=EC=BB=A8=ED=85=8D=EC=8A=A4=ED=8A=B8=EB=A9=94=EB=89=B4=EC=97=90?= =?UTF-8?q?=20=EB=B3=B5=EC=82=AC/=ED=8E=B8=EC=A7=91/=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FPJ0000/JobReport/fJobReport.Designer.cs | 116 ++++++++++------ SubProject/FPJ0000/JobReport/fJobReport.cs | 36 ++++- SubProject/FPJ0000/fProjectList.Designer.cs | 131 +++++++++++------- SubProject/FPJ0000/fProjectList.cs | 34 +++-- SubProject/FPJ0000/fProjectList.resx | 29 ++-- 5 files changed, 228 insertions(+), 118 deletions(-) diff --git a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs index 5731f4a..1ed0849 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs @@ -30,18 +30,18 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport)); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -84,6 +84,7 @@ this.dtSD = new System.Windows.Forms.ToolStripTextBox(); this.lbEnd = new System.Windows.Forms.ToolStripLabel(); this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.lbTime = new System.Windows.Forms.ToolStripLabel(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.cmbState = new System.Windows.Forms.ToolStripComboBox(); @@ -91,7 +92,10 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); - this.lbTime = new System.Windows.Forms.ToolStripLabel(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); + this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -309,9 +313,13 @@ this.toolStripMenuItem2, this.refreshToolStripMenuItem, this.toolStripMenuItem1, - this.partListToolStripMenuItem}); + this.partListToolStripMenuItem, + this.toolStripMenuItem3, + this.복사ToolStripMenuItem, + this.편집ToolStripMenuItem, + this.삭제ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(226, 160); + this.cm.Size = new System.Drawing.Size(226, 296); // // columnSizeToolStripMenuItem // @@ -441,68 +449,68 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "초과"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType28; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "requestpart"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청부서"; this.fpSpread1_Sheet1.Columns.Get(2).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "package"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "패키지"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType32; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "상태"; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "type"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "업무형태"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 84F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType34; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무분류"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 80F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType35; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "projectName"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "프로젝트(아이템)"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 158F; this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType7; + numberCellType10.DecimalPlaces = 0; + numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType10.MaximumValue = 2147483647D; + numberCellType10.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType10; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pidx"; this.fpSpread1_Sheet1.Columns.Get(8).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 39F; - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType8; + numberCellType11.MaximumValue = 999999999999999D; + numberCellType11.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType11; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "hrs"; this.fpSpread1_Sheet1.Columns.Get(9).Label = "시간"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 52F; - numberCellType9.MaximumValue = 999999999999999D; - numberCellType9.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType9; + numberCellType12.MaximumValue = 999999999999999D; + numberCellType12.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType12; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ot"; this.fpSpread1_Sheet1.Columns.Get(10).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "초과"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType36; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "description"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고"; @@ -567,6 +575,12 @@ this.dtED.Text = "1982-11-23"; this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // lbTime + // + this.lbTime.Name = "lbTime"; + this.lbTime.Size = new System.Drawing.Size(29, 22); + this.lbTime.Text = "{0}h"; + // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; @@ -613,11 +627,31 @@ this.btSearch.Text = "조회(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // - // lbTime + // toolStripMenuItem3 // - this.lbTime.Name = "lbTime"; - this.lbTime.Size = new System.Drawing.Size(29, 22); - this.lbTime.Text = "{0}h"; + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(222, 6); + // + // 복사ToolStripMenuItem + // + this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem"; + this.복사ToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.복사ToolStripMenuItem.Text = "복사"; + this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click); + // + // 편집ToolStripMenuItem + // + this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem"; + this.편집ToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.편집ToolStripMenuItem.Text = "편집"; + this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click); + // + // 삭제ToolStripMenuItem + // + this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.삭제ToolStripMenuItem.Text = "삭제"; + this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // // fJobReport // @@ -698,5 +732,9 @@ private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton btReport; private System.Windows.Forms.ToolStripLabel lbTime; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; + private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs index c276015..245bdcd 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.cs @@ -155,7 +155,7 @@ namespace FPJ0000 RefreshTime(); } - void saveData() + void funcSave() { this.Validate(); this.bs.EndEdit(); @@ -171,7 +171,7 @@ namespace FPJ0000 private void projectsBindingNavigatorSaveItem_Click(object sender, EventArgs e) { - saveData(); + funcSave(); } void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e) @@ -298,9 +298,9 @@ namespace FPJ0000 private void btEdit_Click(object sender, EventArgs e) { - Func_Edit(); + funcEdit(); } - void Func_Edit() + void funcEdit() { var drv = this.bs.Current as DataRowView; if (drv == null) return; @@ -334,6 +334,10 @@ namespace FPJ0000 } private void btCopy_Click(object sender, EventArgs e) + { + + } + void funcCopy() { var drv = this.bs.Current as DataRowView; if (drv == null) return; @@ -362,6 +366,10 @@ namespace FPJ0000 } private void btDel_Click(object sender, EventArgs e) + { + funcDelete(); + } + void funcDelete() { var drv = this.bs.Current as DataRowView; if (drv == null) return; @@ -374,12 +382,11 @@ namespace FPJ0000 //dr.AcceptChanges(); //FCOMMON.Util.MsgI("삭제 완료"); } - catch(Exception ex) + catch (Exception ex) { - FCOMMON.Util.MsgE("삭제실패\n\n"+ex.Message); + FCOMMON.Util.MsgE("삭제실패\n\n" + ex.Message); } } - private void lbStt_Click(object sender, EventArgs e) { var f = new FCOMMON.fSelectMonth(); @@ -406,5 +413,20 @@ namespace FPJ0000 RefreshTime(); } + private void 복사ToolStripMenuItem_Click(object sender, EventArgs e) + { + funcCopy(); + } + + private void 편집ToolStripMenuItem_Click(object sender, EventArgs e) + { + funcEdit(); + } + + private void 삭제ToolStripMenuItem_Click(object sender, EventArgs e) + { + funcDelete(); + } + } } diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index 920b4ad..c3368f0 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -30,23 +30,23 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -135,6 +135,9 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); + this.btCopy = new System.Windows.Forms.ToolStripButton(); + this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -168,8 +171,9 @@ this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, this.btAdd, - this.btDel, + this.btCopy, this.btEdit, + this.btDel, this.btSave, this.toolStripSeparator1, this.toolStripLabel1, @@ -275,7 +279,6 @@ // // btDel // - this.btDel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image"))); this.btDel.Name = "btDel"; this.btDel.RightToLeftAutoMirrorImage = true; @@ -340,10 +343,12 @@ this.toolStripMenuItem3, this.메일발송주소관리ToolStripMenuItem, this.makeRepeatToolStripMenuItem, + this.편집ToolStripMenuItem1, + this.삭제ToolStripMenuItem, this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(305, 332); + this.cm.Size = new System.Drawing.Size(305, 382); // // columnSizeToolStripMenuItem // @@ -535,109 +540,109 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + numberCellType11.DecimalPlaces = 0; + numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType11.MaximumValue = 2147483647D; + numberCellType11.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType11; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType26; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType27; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType28; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userhw2"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "전장"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType32; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType34; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + numberCellType12.DecimalPlaces = 0; + numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType12.MaximumValue = 2147483647D; + numberCellType12.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType12; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 59F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + numberCellType13.MaximumValue = 999999999999999D; + numberCellType13.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType13; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType4; + numberCellType14.MaximumValue = 999999999999999D; + numberCellType14.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType14; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType5; + numberCellType15.MaximumValue = 999999999999999D; + numberCellType15.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType15; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType35; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType36; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -1176,6 +1181,27 @@ this.panel3.Size = new System.Drawing.Size(1084, 218); this.panel3.TabIndex = 7; // + // btCopy + // + this.btCopy.Image = global::FPJ0000.Properties.Resources.copy; + this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btCopy.Name = "btCopy"; + this.btCopy.Size = new System.Drawing.Size(67, 22); + this.btCopy.Text = "복사(&C)"; + this.btCopy.Click += new System.EventHandler(this.btCopy_Click); + // + // 편집ToolStripMenuItem1 + // + this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(304, 36); + this.편집ToolStripMenuItem1.Text = "편집"; + // + // 삭제ToolStripMenuItem + // + this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.삭제ToolStripMenuItem.Text = "삭제"; + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1300,5 +1326,8 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel5; private System.Windows.Forms.ToolStripComboBox cmbSort; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton btCopy; + private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.cs b/SubProject/FPJ0000/fProjectList.cs index aa60029..430094b 100644 --- a/SubProject/FPJ0000/fProjectList.cs +++ b/SubProject/FPJ0000/fProjectList.cs @@ -218,7 +218,7 @@ namespace FPJ0000 this.fpSpread1.ResumeLayout(); } - void saveData(Boolean pmt) + void funcSave(Boolean pmt) { this.Validate(); this.bs.EndEdit(); @@ -243,7 +243,7 @@ namespace FPJ0000 private void projectsBindingNavigatorSaveItem_Click(object sender, EventArgs e) { - saveData(true); + funcSave(true); } void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e) @@ -324,6 +324,10 @@ namespace FPJ0000 } private void makeRepeatToolStripMenuItem_Click(object sender, EventArgs e) + { + funcCopy(); + } + void funcCopy() { var drv = this.bs.Current as DataRowView; if (drv == null) return; @@ -333,9 +337,9 @@ namespace FPJ0000 { var ta = new dsPRJTableAdapters.QueriesTableAdapter(); int? newidx = -1; - var retval = ta.CopyProjectData(dr.idx, FCOMMON.info.Login.no,ref newidx); + var retval = ta.CopyProjectData(dr.idx, FCOMMON.info.Login.no, ref newidx); refreshData(); - if(newidx != null) + if (newidx != null) { var newdr = this.dsMSSQL.Projects.Where(t => t.idx == newidx).FirstOrDefault(); var f = new fProjectData(newdr); @@ -344,7 +348,7 @@ namespace FPJ0000 int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); if (curLevel < 5) { - saveData(false); //자동저장 + funcSave(false); //자동저장 } } } @@ -402,6 +406,10 @@ namespace FPJ0000 } private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) + { + funcDelete(); + } + void funcDelete() { var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?"); if (dlg == System.Windows.Forms.DialogResult.Yes) @@ -412,11 +420,10 @@ namespace FPJ0000 int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); if (curLevel < 5) { - saveData(false); //자동저장 + funcSave(false); //자동저장 } } } - private void 엑셀파일로저장ToolStripMenuItem_Click(object sender, EventArgs e) { SaveFileDialog sd = new SaveFileDialog(); @@ -500,9 +507,9 @@ namespace FPJ0000 private void btEdit_Click(object sender, EventArgs e) { - DataEdit(); + funcEdit(); } - void DataEdit() + void funcEdit() { var drv = this.bs.Current as DataRowView; if (drv == null) return; @@ -513,14 +520,14 @@ namespace FPJ0000 int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); if (curLevel < 5) { - saveData(false); //자동저장 + funcSave(false); //자동저장 } } } private void 편집ToolStripMenuItem_Click(object sender, EventArgs e) { - DataEdit(); + funcEdit(); } private void tbRequest_KeyDown(object sender, KeyEventArgs e) @@ -579,5 +586,10 @@ namespace FPJ0000 break; } } + + private void btCopy_Click(object sender, EventArgs e) + { + funcCopy(); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx index 5c3b60f..1d51c48 100644 --- a/SubProject/FPJ0000/fProjectList.resx +++ b/SubProject/FPJ0000/fProjectList.resx @@ -177,6 +177,16 @@ zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E rkJggg== + + + + + R0lGODlhEAAQAIQAAGB3lYivyMDf/XiZt+Ts9ajT/Mbh/UlVa/P2+bLY/FRlfu3x9ZzN++Xy/rTR4ENL + XN7v/tTk8Jm/1enx96jL3uDo7ykxQz5FVb2JAP+8Bv/RV6HQ/FSr9qfR+jhllf///yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIugA/CBxIsKDACA4cUJAgIUCAARA9eJAg0EEEAhMyTiDA + 0UMHDh4qTjBAkqSABh5BKhBIAUFJASdTekCw8oMElwZgovzoAQJNgTdzxuQJocDPDwEQ6MRAtIDRAwKT + nsSgIUPPAh02EID6YcCCBlQzYCiaVesDgV4jVB2LdcMGBhXOdl2QQIFdBQAGMNhb4QJaBAkSYC0wAIBh + AAv8fgAQAcFGjgQqSF7gwAJavHcPHHjw4MIFCzUNihYYEAA7 @@ -189,16 +199,6 @@ 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - - R0lGODlhEAAQAIQAAGB3lYivyMDf/XiZt+Ts9ajT/Mbh/UlVa/P2+bLY/FRlfu3x9ZzN++Xy/rTR4ENL - XN7v/tTk8Jm/1enx96jL3uDo7ykxQz5FVb2JAP+8Bv/RV6HQ/FSr9qfR+jhllf///yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIugA/CBxIsKDACA4cUJAgIUCAARA9eJAg0EEEAhMyTiDA - 0UMHDh4qTjBAkqSABh5BKhBIAUFJASdTekCw8oMElwZgovzoAQJNgTdzxuQJocDPDwEQ6MRAtIDRAwKT - nsSgIUPPAh02EID6YcCCBlQzYCiaVesDgV4jVB2LdcMGBhXOdl2QQIFdBQAGMNhb4QJaBAkSYC0wAIBh - AAv8fgAQAcFGjgQqSF7gwAJavHcPHHjw4MIFCzUNihYYEAA7 @@ -208,6 +208,9 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 17, 17 + 387, 17 @@ -394,10 +397,16 @@ 561, 17 + + 561, 17 + 883, 17 647, 17 + + 883, 17 + \ No newline at end of file