From b52ef11ec1e19774a3baa1cfac5404617116c97f Mon Sep 17 00:00:00 2001 From: backuppc Date: Fri, 4 Jul 2025 17:25:28 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FBS0000/Holiday/fHolyday.Designer.cs | 87 +++++----- SubProject/FBS0000/Holiday/fHolyday.resx | 98 ++++++------ .../OtConfirm/fHolyRequest.Designer.cs | 58 ++++--- .../FPJ0000/OtConfirm/fOTConfirm.Designer.cs | 21 ++- SubProject/FPJ0000/OtConfirm/fOTConfirm.resx | 151 +++++++++--------- 5 files changed, 205 insertions(+), 210 deletions(-) diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index 164dcd8..6b4930d 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -97,19 +97,19 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.현재사원원장보기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); this.cmO.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.SuspendLayout(); // // bn @@ -151,7 +151,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1333, 27); + this.bn.Size = new System.Drawing.Size(1028, 27); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -189,7 +189,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -370,7 +369,7 @@ this.toolStripButton6}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1333, 31); + this.toolStrip1.Size = new System.Drawing.Size(1028, 31); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked); @@ -397,7 +396,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(100, 31); this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -421,7 +419,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(100, 31); this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -484,14 +481,14 @@ this.fpSpread1.RangeDragFillMode = FarPoint.Win.Spread.DragFillMode.Series; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1333, 628); + this.fpSpread1.Size = new System.Drawing.Size(1028, 628); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown); this.fpSpread1.SetViewportLeftColumn(0, 0, 1); - this.fpSpread1.SetActiveViewport(0, 0, -1); + this.fpSpread1.SetActiveViewport(0, -1, -1); // // cmO // @@ -502,7 +499,7 @@ this.복사ToolStripMenuItem, this.현재사원원장보기ToolStripMenuItem}); this.cmO.Name = "cm1"; - this.cmO.Size = new System.Drawing.Size(305, 118); + this.cmO.Size = new System.Drawing.Size(307, 118); // // toolStripMenuItem2 // @@ -512,14 +509,14 @@ this.toolStripMenuItem5, this.toolStripMenuItem6}); this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(304, 36); + this.toolStripMenuItem2.Size = new System.Drawing.Size(306, 36); this.toolStripMenuItem2.Text = "Column Size"; // // toolStripMenuItem3 // this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image"))); this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(147, 36); + this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 36); this.toolStripMenuItem3.Text = "Auto"; this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click); // @@ -527,7 +524,7 @@ // this.toolStripMenuItem4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem4.Image"))); this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(147, 36); + this.toolStripMenuItem4.Size = new System.Drawing.Size(149, 36); this.toolStripMenuItem4.Text = "Reset"; this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click); // @@ -535,7 +532,7 @@ // this.toolStripMenuItem5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem5.Image"))); this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(147, 36); + this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 36); this.toolStripMenuItem5.Text = "Save"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // @@ -543,53 +540,30 @@ // this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(147, 36); + this.toolStripMenuItem6.Size = new System.Drawing.Size(149, 36); this.toolStripMenuItem6.Text = "Load"; this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(301, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(303, 6); // // 복사ToolStripMenuItem // this.복사ToolStripMenuItem.Enabled = false; this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem"; - this.복사ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.복사ToolStripMenuItem.Size = new System.Drawing.Size(306, 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(304, 36); + this.현재사원원장보기ToolStripMenuItem.Size = new System.Drawing.Size(306, 36); this.현재사원원장보기ToolStripMenuItem.Text = "현재 사원 원장 보기"; this.현재사원원장보기ToolStripMenuItem.Click += new System.EventHandler(this.현재사원원장보기ToolStripMenuItem_Click); // - // bs - // - this.bs.DataMember = "Holyday"; - this.bs.DataSource = this.dsMSSQL; - this.bs.Sort = ""; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // taUser - // - this.taUser.ClearBeforeFill = true; - // - // textBox1 - // - this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.textBox1.Location = new System.Drawing.Point(0, 659); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(1333, 21); - this.textBox1.TabIndex = 5; - this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -632,7 +606,7 @@ dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2024, 3, 3, 10, 46, 54, 215); + dateTimeCellType1.TimeDefault = new System.DateTime(2025, 7, 4, 17, 16, 52, 755); this.fpSpread1_Sheet1.Columns.Get(2).CellType = dateTimeCellType1; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "시작일"; @@ -641,7 +615,7 @@ dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType2.TimeDefault = new System.DateTime(2024, 3, 3, 10, 46, 54, 215); + dateTimeCellType2.TimeDefault = new System.DateTime(2025, 7, 4, 17, 16, 52, 755); this.fpSpread1_Sheet1.Columns.Get(3).CellType = dateTimeCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -781,11 +755,34 @@ this.fpSpread1_Sheet1.ShowRowSelector = true; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // bs + // + this.bs.DataMember = "Holyday"; + this.bs.DataSource = this.dsMSSQL; + this.bs.Sort = ""; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // taUser + // + this.taUser.ClearBeforeFill = true; + // + // textBox1 + // + this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.textBox1.Location = new System.Drawing.Point(0, 659); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(1028, 21); + this.textBox1.TabIndex = 5; + this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); + // // fHolyday // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1333, 707); + this.ClientSize = new System.Drawing.Size(1028, 707); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.textBox1); this.Controls.Add(this.toolStrip1); @@ -802,8 +799,8 @@ this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); this.cmO.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index dcbab32..f60b951 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -212,23 +212,6 @@ - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi - Dwoi+hibG11FTcwyGtlFUBeBROUcYi7J0hzb1E1D99E+8ONE28SWHt2WuuZcE7Zz2pk6nt5zlseGu/CF - H4dz4P+8v/O85+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN - NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4 - gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur - WvRdKhfSef7fVU0G7+po3G6lhQ78fn+uqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg - 6KaBphbOlwqYzpf9G+bQMTyDPmoJM79YhBIcRmdTsH5bxuDYHBKJRJEOPHYYz5YKAXwHHz1RTC2kMRb+ - A88cCzchEOXQ5QzD5/OhpKTkhGhgfqiAo1kOQ3WpWGLbcBh0nINnloGLZjAcTIP6yeGdYwGxWGyrwQQx - 6K06IJbYRd55apGFYzo/zDMxz0E78GPrl2i+L4fthQy9ZzYD7L4oRukUvpIhbziDcbK72ZdGi96EecpS - 3KDntAS5XE44ieUVFt7vcXSTLj64o9ANhfBaP4CAVYdxrRL1NfsaBQO1Wi3prD4Ew7Vj6D4lAU3TCAaD - mJyc5M9bKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv - 0DnH8T7GGj4AAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi @@ -243,6 +226,23 @@ oOe0BLlcTngTyyssvN/j6CZdfHBHoRsK4bV+AAGrDuNaJepr9jUKBmq1WtJZfQiGa8fQfUoCmqYRDAYx OTkJv98vFBYIBISr49MbjLbewtxgMwxNlRlikV+ysl0nHx3Z81gu3a0gt8V+XZG6mr2NnzUXuaFn5/AX yUnH7pGap3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi + CwURXWRzo6eoiVlKI3sI6iGQqJxDzCVZmmPeNhfTzXZh0xO7iC097tJ06VwK2znteBnf/ucsjw334B8+ + HP4Hft//53zPObv4RVFU+dgLOUbqK2CuPgxy6+QOOcgPH3U4HIzHZQflssF0qwwbGxs7QghRq9W7DQbD + 7eFnSjg0SphuliGTyeTBsiwYhhFJpVJYX1/PBeQbWGG8Lt0WsBmySTqdxtraWr6B8akS9hYFjNek4DhO + 4FFnFPW6KB4Q6joiqGuPoJbAW4gBooEzZzB4VYrV1VUBflhnTaCD8G40gfaRBO61hYUA3irPYLBJga+v + azBwpVRI5/n/VBUZvK+lcbeVFjrwer3ZggZ9l0qFgvgAjsvA5o+ixzmN9tEoPtjnMUTFsPJ7EcvLywwJ + OL5loK7B2Cs5+i6W/Bvm0GGZwQC1iJlfLMJJDu7ZFEzeJQx7QkgmkwU6cFphOF8sBPAdfHLGMTWXhify + B84QCwchEOfQNRaBz+dDUVHRKdGgv1EOW7MM+spiscQ2SwR0goNzloGdZmAJpkH95PDeNoeFhYXtBhPE + oLfikFhiF3nmqXkWtuncMM9EjINm6Mf2L7H/oQyjL6vRe24rwOqLw02n8I0MuSIZjJPT+31ptOj6EKOM + hQ16zkqQzWaFN7G0wsL1PYFu0sVHRxxacxhvdEMImLQY1yhQV3WgQTBQqVSSzsoj0N84ge4zEtA0jWAw + iMnJSfj9fqGwQCAgXG2f38Ldegeh4Wbom8ozxCK3qkv2nH58bN8TmXSvnGwL/boitVX7G76oL3Pm5xfw + F8JZx+vnJq2PAAAAAElFTkSuQmCC @@ -284,41 +284,41 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB0KBRRxA9doTEyM - X8AXUWOMCEIRZWuhtOwgqCwqiWtE2tKVAmUtPqEmoEaCUSNG2WSV4510mlAf6L1DAi89yX2+v8zMuf/J - dXPFFVcE5PHJN5cenWgff3i8F3XHyDpqRe0RK2rie1Ad14MHh7tx/1A37h0k60AXqvZ3oTK2E3f3daIi - pgPleztQtqcdpdFkRVlQEmlBsdiCoog2FIa3oUDUCmUYWaEtUIS0ID/YPJ4XZErgt3eeZcZBHmRGTqB5 - jN/eeZYblxdoRm5AM/jtnWclcDJ/FuAScCVRbVBGGJErakK+yICC8FYqnMzPRA9cypNTiPXoffoJM5Nz - 6K7/CFmIjgon3c0AFIrjnlxL+XssTGGcngqXs8tIDxSCKxSb8eRKF+b/zvM04NfQBKRhaipcti8DkBVX - HNmKijMmTI3N8DRgdnoOVeebIQ9upsJl+RjogWw4UooYPX58GOVptryS9CI32ECNy/RmANLiuKNEHq7D - O90XnmVLZ90AOXi1TLgMLxYgJU4RboS5zLEUg73D5LvTMOMyPPX0QBpcQQQpxWXHUox8/QNFrJZ8dyZm - 3J2dDEBnuCIxX4rxWZ5mK0XluWaQoS8Id9tDRw9cDMeNL3mYAQOt33iaLS+SrZAF6QXj0ncwABfDcbM1 - L9SA/hZH4POkHkgD9YJxt9y19MDFcNzgV4rMKD1ldHzFU3MoP0tA/kZBuLTtDMDFcPbBLw8xoj6h06Ek - v0lJZNEaSP0MzDjJtiZ6oDOcfbZKg3QwFr/lebZ8tg4jw7+RGZe6lQVIgbOfc5n+avQ1DfE8WyzV/Uj3 - UTHhUrdo6IG0OK4QsgATskVqfB8Y4Xm2PEvsRrqXhhqXspkBSIuzt5X75pTxOkyOLvhZIKUpPk1Qnloq - 3M1NDEAWnL2tmb5a1F5ocyjNz8ExSLwbqHDJG9X0QFacvRDp3mrolH08z5asCBUVLmkDA1AIzl4Iiddr - dJC/memJWVhq+pHi3kCFu7FeRQ8UirMXQuKhQrL7S4JrRJp7ExUucR0LcAk42kL8j0tc20gPXAnc9TUM - QIIbX27c1dUN9Fcf3EUOd1eynLhrqxou8tu74oor9HFz+wdfrj3zDzZ6jwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djXT1NRHAdw/gjj3ogsZUNbhiIucEZjYmL8 + B3wRNcaIIBRRVgulZYOgMlQSZ6xQ6KSUSlk+oSagRoJRI0ZZMuXrueltQn2g51wSfOk3Oc/nk3vv9/xu + joc77rgjIA+Pv77w4Jh1/P7RXtQfIetwD+oO9aA2oRs18d24d7ALdw904c5+svZ1onpvJ6ribLi9x4bK + 2A5U7O5A+a5XKIshK9qK0igrSiKtKJa0o0jcjkKRBaoIssLboAxrQ0GoeTw/xJTIb+86y4yDIsSM3GDz + GL+96yw3Lj/YjLygVvDbu87/wMkDWYBLwJVGt0MlMSJP1IICkQGFYgsVTh5gogcu5ckpI/XoffwRM5Nz + 6Gr4AHmYjgon28kAFIrjnlxbxTssTFG8ngqXu8NIDxSCK4o049GlTsz/medpwM+hCcgiNFS4HH8GICuu + JMqCylMmTI3N8DRgdnoO1WdboQhtpcJl+xnogWw4UopYPb6/H+Vp9ryQ9iIv1ECNy/JlANLiuKNEIdbh + re4zz7LHVj9ADl4tEy7ThwVIiVOKjTCXO5disHeYfHfNzLhMbz09kAZXKCGluOhcipEvv6GM05LvzsSM + u7WdAegKVxzJl2J8lqfZS1F1phVk6AvC3fTS0QMXw3HjSxFhwIDlK0+z51lKD+QhesG4jG0MwMVw3GzN + Dzegv80Z+DS5G7JgvWDcDU8tPXAxHDf4VSIzyk4YnV/x1BwqThNQoFEQLn0rA3AxnGPwK8KMaEi0OZXk + FymJPKYZsgADM066pYUe6ArnmK2yEB2MJW94nj2feoaRGdjIjEvbzAKkwDnOuaxADfpahniePdaafmT4 + NTHh0jY10wNpcVwh5EEm5Ig0+DYwwvPseZLUhQyfZmpc6kYGIC3O0Vbum1Ml6DA5uuBngZSm5CRBeWup + cNc3MABZcI62ZvlrUXeu3ak0PwbHIPVVU+FS1mvogaw4RyEyfDXQqfp4nj3ZkiYqXPI6BqAQnKMQUp+X + 6CB/M9MTs7DW9iPVU02Fu7a2iR4oFOcohNSrCSmezwmuEemeLVS4pDUswCXgaAvxLy5pdSM98H/grq5i + ABLc+HLjLq9U0199cBc53F3JcuKurFCf57d3xx136OPh8Rc0ez3xKe5elAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djZTxNRGAVw/gjjvq8tawtYEAqCO+6J0cQH - 331RMTEqKC5YC5SlFLAIuLNpVEyUpdvQaSullO1JggkKiVuiRhOpkUU5zjDTCDGh944JvvQk9/n+MnfO - fDcTEkwwwUjI/X296fV7Pb66PT2o3c2tXd2o2dmN6rQu3NvRhbvbO3FnWydub+XWFi9ubfbi5qYO3Ejt - QFWKB5UbPahIbsf1JG6p3ShPdMOY4Ma1DW0oi29DadxzlKi4td4FQ6wLxTFOX1E0e0LcPnBmGQd9tBM6 - pXNY3D5wZhtXpHSiUOGAuH3g/A9cQRQNkBBXleqBMdkBg9qKMjWL8iS3ZFxBJEsOJH1yZUkseh4NYuzH - T/Q2DKEkkZGMy4+gABIf634WU+Oq7Ich3i4Jpwu3kwNJ37nSFAZf330XecDErwk8POmFIc5BjcsLowCS - FsKobsPdI67JI/Zn1DeOyoMsDConFS43tJUcSILzt7U0wYGnWT0iT8jnoWHoky0ojnUS43LkFEBSnL8Q - elUrvPWvRJ6Ql+wH6KLNxDitjAZIgfMXoiDOjEHvJ5EnxG7sQ57CRoTTrmPIgbQ4vhAGFfeupVjw9e2U - 0kwAD9I9yI20BcRdXUsBpMX526qPceDGYRbjI39KMzI8htJdNugiWmfEadbYyIFScP625isZPMnsEnlC - Xjo+QBNqmhF3ZTUFUCqOL4ROwaAhYzqw3/6eA5pnxGWvspIDpeIKFCwqDtn/OmJDmhU5ocyMuMsrKYBS - cIVKB/LVJnx54xNpQknqj7VDIzcHxF1aYSEH0uL475xW0YzX3o8iTQhT8gJX5CYi3MXlNEBKXE6kBe01 - AyJLSB/zDtmhTcS4i8vM5EAaXF6UDY/PdIosIZ9ef4M2thlaOUOMu7CUAkiKy4+yo/yAfdplYYS7LJTs - tFLjspZQAElw/PjKUbZMLwV33ao+2gaNzEKNO7/YRA4kwfGzVZ9qEWlC+FJky0yScOcWUQBJcPxsvRpm - QkfdAEa/j8NTO4DL8ibJuMyFLeRAEhw/+PPCWycnxCXZs396cjwuYwENkAAXaPDT4jLmN5MD/wfu7DwK - IIfzzTbu1NxG8l8f/I8c/l/JbOJOz2k8Lm4fTDDBkCck5Df9Wj6YCpGtogAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji + g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6etQCnbkwQSBBJFEjGSSIksynGGmUaJSXvvmOBLT3Kf7y9z + 58x3MwH++OOPhDw+3HWu9lCL+9HBTjw8wK2kDtQkdqB6fzse7GtH1d423N/Thnu7ubXLhbs7XbizoxWV + Ca24He9ExXYnbsW14GYst1TNKI9pRll0M25sa0Lp1iaURL1FsZJbWxzQRzpQFGF3Xw9nz4rb+84846AL + t0OrsI+J2/vOfOOuK+wolNsgbu87/wNXEEYDJMTdTnCiLM4GvcqMUhWL8thmybiCUJYcSPrkSmNZdD4b + wNT3H+iqG0RxDCMZlx9CASQ+1iMs/oyjogf6rVZJOG2wlRxI+s6VxDMYHRoXecDMzxk8Pe+CPspGjcvb + TAEkLUSZqglVJx2zR+zJpHsaFcdY6JV2KlxuUCM5kATnaWtJtA0vUztFnpAvg2PQxZlQFGknxuXIKICk + OE8hdMpGuGrfizwhvewwtOFGYpwmkAZIgfMUoiDKiAHXiMgTYi3rRp7cQoTTbGLIgbQ4vhB6JfeuxZsw + +vGP0swAT845kRtq8YnL3kgBpMV52qqLsKHyBIvpid+lmRibQkmSBdqQRq849QYLOVAKztPWfAWDFynt + Ik9Ir20Y6iCDV1zWegqgVBxfCK2cQV3yXGCP9RMHNHrFZa4zkwOl4grkLG4dt/51xPr9ZuQEMV5xGWsp + gFJwhQob8lUGfP3gFmlCSWpPt0AtM/rEpa8xkQNpcfx3TiNvQL/rs0gTwhS/Q5bMQIRLW00DpMTlhJrQ + UtMnsoR0M0PIDHpNjEtbZSQH0uDywix4fqlNZAkZ6f8GTWQDNDKGGHdtJQWQFJcfZkX5Ueucy8IEd1ko + TjRT41JXUABJcPz4ylG8mVsK7rpVfaoJ6kATNe7qcgM5kATHz1ZdgkmkCeFLkRlokIS7sowCSILjZ2v2 + ZgNaH/Vhcnwazod9yJC9loxLWfqGHEiC4wd/XnDj7IRID3z1T0+OxyUvoQES4HwNflpc8uIGcuD/wF1e + RAHkcO75xl1YWE/+64P/kcP/K5lP3MUF9WfE7f3xxx/yBAT8AtInPpbTa5zAAAAAAElFTkSuQmCC @@ -388,7 +388,7 @@ cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////AQgAAP////8AAQgAAAs= + AAD///////////////8A/////ws= @@ -398,7 +398,7 @@ cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////AQgAAP////8AAQgAAAs= + AAD///////////////8A/////ws= diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs index 1a31afc..b099f00 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs @@ -77,9 +77,6 @@ this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.dv1 = new arCtl.arDatagridView(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.외출완료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -97,6 +94,9 @@ this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.외출완료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -144,7 +144,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1213, 25); + this.bn.Size = new System.Drawing.Size(1028, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -193,7 +193,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -236,7 +235,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -326,7 +324,7 @@ this.sbtime}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1213, 37); + this.toolStrip1.Size = new System.Drawing.Size(1028, 37); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -352,7 +350,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -376,7 +373,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -442,7 +438,7 @@ this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(1213, 74); + this.richTextBox1.Size = new System.Drawing.Size(1028, 74); this.richTextBox1.TabIndex = 5; this.richTextBox1.Text = ""; // @@ -460,7 +456,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); - this.splitContainer1.Size = new System.Drawing.Size(1213, 571); + this.splitContainer1.Size = new System.Drawing.Size(1028, 571); this.splitContainer1.SplitterDistance = 487; this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; @@ -521,28 +517,10 @@ this.dv1.Name = "dv1"; this.dv1.RowTemplate.Height = 30; this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv1.Size = new System.Drawing.Size(1213, 487); + this.dv1.Size = new System.Drawing.Size(1028, 487); this.dv1.TabIndex = 3; this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.외출완료ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26); - // - // 외출완료ToolStripMenuItem - // - this.외출완료ToolStripMenuItem.Name = "외출완료ToolStripMenuItem"; - this.외출완료ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); - this.외출완료ToolStripMenuItem.Text = "외출 완료"; - this.외출완료ToolStripMenuItem.Click += new System.EventHandler(this.외출완료ToolStripMenuItem_Click); - // - // ta - // - this.ta.ClearBeforeFill = true; - // // uidDataGridViewTextBoxColumn // this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid"; @@ -686,11 +664,29 @@ this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn"; this.remarkDataGridViewTextBoxColumn.Width = 64; // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.외출완료ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26); + // + // 외출완료ToolStripMenuItem + // + this.외출완료ToolStripMenuItem.Name = "외출완료ToolStripMenuItem"; + this.외출완료ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); + this.외출완료ToolStripMenuItem.Text = "외출 완료"; + this.외출완료ToolStripMenuItem.Click += new System.EventHandler(this.외출완료ToolStripMenuItem_Click); + // + // ta + // + this.ta.ClearBeforeFill = true; + // // fHolyRequest // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1213, 633); + this.ClientSize = new System.Drawing.Size(1028, 633); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs index f946c38..d2b0635 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs @@ -137,14 +137,14 @@ this.btConf, this.toolStripSeparator4, this.btConfAll}); - this.bn.Location = new System.Drawing.Point(0, 730); + this.bn.Location = new System.Drawing.Point(0, 724); 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(1364, 25); + this.bn.Size = new System.Drawing.Size(1028, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -157,7 +157,6 @@ // dsMSSQL // this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.Namespace = "http://tempuri.org/dsPRJ.xsd"; this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // // bindingNavigatorCountItem @@ -315,7 +314,7 @@ this.toolStripButton2}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1364, 37); + this.toolStrip1.Size = new System.Drawing.Size(1028, 37); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -428,7 +427,7 @@ // this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbUser.Name = "cmbUser"; - this.cmbUser.Size = new System.Drawing.Size(200, 37); + this.cmbUser.Size = new System.Drawing.Size(200, 23); this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); // // btSearch @@ -458,7 +457,7 @@ this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(1364, 91); + this.richTextBox1.Size = new System.Drawing.Size(1028, 91); this.richTextBox1.TabIndex = 5; this.richTextBox1.Text = ""; // @@ -476,8 +475,8 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); - this.splitContainer1.Size = new System.Drawing.Size(1364, 693); - this.splitContainer1.SplitterDistance = 592; + this.splitContainer1.Size = new System.Drawing.Size(1028, 687); + this.splitContainer1.SplitterDistance = 586; this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; // @@ -518,7 +517,7 @@ this.dv1.Location = new System.Drawing.Point(0, 0); this.dv1.Name = "dv1"; this.dv1.RowTemplate.Height = 23; - this.dv1.Size = new System.Drawing.Size(1364, 592); + this.dv1.Size = new System.Drawing.Size(1028, 586); this.dv1.TabIndex = 3; this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); // @@ -663,7 +662,7 @@ dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); dataGridViewCellStyle7.Format = "N1"; this.otPMS.DefaultCellStyle = dataGridViewCellStyle7; - this.otPMS.HeaderText = "대체(PMS)"; + this.otPMS.HeaderText = "승인(PMS)"; this.otPMS.Name = "otPMS"; this.otPMS.Width = 91; // @@ -722,7 +721,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1364, 755); + this.ClientSize = new System.Drawing.Size(1028, 749); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx index 44861be..ebf854f 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx @@ -1,17 +1,17 @@  - @@ -117,11 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + - 122, 17 + 188, 17 - 17, 17 + 83, 17 @@ -178,20 +181,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZJZTxNRGIZ7JT/BoBdekhiFKEaNXigIWMAE - NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgbKUrS2lbSjKUlbZt4SlAl1moDPl9cy0AiYkfsmTc3Hm - fTLfOyPgxv+xMuZaoU4RUqT7HSDVUeSkeYq5U0+HFGrpoBca40WJuvR46MdDfGj/BD7rUq+Y6TWj0cia - rFswWfZYM3PQGFkyI+fbHCKKRm3CVLmbK+qc4HzNitE4xGpn7NDPMtDPMdDNMNBMb0P5awtNw1ZsMUD9 - KIWcL7OIf2Wk/pEESJuoTds2eudZ/JhnyMmgh5dsQzWxhZZhGxE40LvEQr9oR558Dr6P2j/w4fBin6k7 - 0tAdccUtxJffRnlzDXJri+Er9YQPQZh3Af6ysyipL+FXsdAMltdt8I9WMbwgrND3c/tgAxrG36Jcl8VL - osuCkPU+Cmk1ERBVXkdcZRzq+5fRYLTg+8AmNkhPAbIumhcIS4VuntJ0VjfWiXeDMhQoU3lJTEUwCd9A - 0utEqCes/Cpt4xQUpId1qx0Bud1OATeB+So6oyoWhgkNKvUP8bw1E+HFVxBTFgrDjA0GUixXsHrS2YmJ - CPxl+wSXnkjt57KPIapUiN5JLfI6kyGTZyDipR9qlF/Rt8DAQIrVTtvRTVgx2+H71CU4LXEXe0uOIq06 - EncrAhFZcpWXZMijIKlNJG/iB+6+d45FD/eJCWZSpFe6xinwlhxe8JYcIQ+5wzvLHTcL/JDyJhbqYQXy - FNlI/hQLUUUYDESgJ/+Gjghou4MIlHsrXE7vopc2aPQvsDyqsUU8qEpCAgmKKyOQWX1/947Dts0SQd2e - gLPNm/YE/8PKrZC4T3A+o8PW0t23c9DDBzE4POo4GV1vccVJkUmtU7ObNnOHdsAxtUphaoXChItVi52H - a95Cs/g5OOKgKGrD417jkCsuEJxJak7xEjW1nhIrTF7iOnqXBCeefxHV0R6ixvUTcY1tnrHyeIFAIPgD - q6OfJyXVylwAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3qv6EsF70UohUyqioF6WpTQ3s + ZjrMvM0pmprowiBbTCNTF5qoUCFK0YsK7aJTm7dtzm24Veq85v0GXpa6yzm6s/ntOWdLDYR+8OF58Tzf + D+f5nofHTvBDZfyVEp0iolT3O0Sio8hKc8jYVU9HlGjpsGca03mxuvxY5PsDXGjvhD7pVi9b6FWTyeQ0 + 2zZhtu6yamGhMbxoQf6XWQhKR+z8DPlBT9Q94UWaZTasnXZAP8NAP8tAN81AM7UF5a9NtAzZsMkAjSMU + 8j/NIOmFifpHEiJpoTbsWzDOOfF9jiErg15OsgXV+Ca+DdmJwAXjohP6BQcK5bMIfNDxjgtHywImb0ki + t0VVN5BUeROVrXUoqJchUOKLAAK/8ByCpadR1ljGXcVKM1hasyM4TsVwgqiSwI8dA01oGnuNSl0uJ4mr + CEPu21hk1gkgrL6KxOpENPYtoclkxdf+DayTnkKk3TQn4JfzD/pIspy60S68GZCiWJnBSeKrwkn4GlJf + pkA9buOu0j5GQUF6WLM5EFLQ4xawE1qkorNrEmAY16Bafx9P23IQLbuE+IpIGKbtMJBi2YLVE+5OzEQQ + LN0juPBI4jiTdxSx5XwYJ7Qo7EqDVJ4NwfMg1Ck/4+c8AwMpVjvlQA9h2eJA4GOP4KTYS+QvPoLM2hjc + rgpFTNllTpItj4W4PoV8SRDYfeOsE73sLyZYSJF+WRq3wF98aN5ffJgc8oJ/rheuFwch/VUC1EMKFCry + kPYhAcKqKBiIQE/eho4IaIeLCJS7V7iY1U0vrtPom3dyqEYXcK8mFckkKKoWIKf27s4ei33LSQQNuwLW + NmfeFfwPG3uFlD2Cs9md9lbNj+39Du9H/+Cwyyeu0eqJkyJT2yZnNuyWzp4+1+QKhcllCuMeVqwODrZ5 + K02eev+Qi6Kode87zYOeOI93KrU13U/Y0nZCpDD7iRroHZLd+P5F2EB7C5vXjic2t/smyJN4PB7vD5/y + nxrD4VALAAAAAElFTkSuQmCC @@ -225,46 +228,46 @@ - 261, 17 + 325, 17 iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djXT1NRHAdw/gjj3ogsZUNbhiIucEZjYmL8 - B3wRNcaIIBRRVgulZYOgMlQSZ6xQ6KSUSlk+oSagRoJRI0ZZMuXrueltQn2g51wSfOk3Oc/nk3vv9/xu - joc77rgjIA+Pv77w4Jh1/P7RXtQfIetwD+oO9aA2oRs18d24d7ALdw904c5+svZ1onpvJ6ribLi9x4bK - 2A5U7O5A+a5XKIshK9qK0igrSiKtKJa0o0jcjkKRBaoIssLboAxrQ0GoeTw/xJTIb+86y4yDIsSM3GDz - GL+96yw3Lj/YjLygVvDbu87/wMkDWYBLwJVGt0MlMSJP1IICkQGFYgsVTh5gogcu5ckpI/XoffwRM5Nz - 6Gr4AHmYjgon28kAFIrjnlxbxTssTFG8ngqXu8NIDxSCK4o049GlTsz/medpwM+hCcgiNFS4HH8GICuu - JMqCylMmTI3N8DRgdnoO1WdboQhtpcJl+xnogWw4UopYPb6/H+Vp9ryQ9iIv1ECNy/JlANLiuKNEIdbh - re4zz7LHVj9ADl4tEy7ThwVIiVOKjTCXO5disHeYfHfNzLhMbz09kAZXKCGluOhcipEvv6GM05LvzsSM - u7WdAegKVxzJl2J8lqfZS1F1phVk6AvC3fTS0QMXw3HjSxFhwIDlK0+z51lKD+QhesG4jG0MwMVw3GzN - Dzegv80Z+DS5G7JgvWDcDU8tPXAxHDf4VSIzyk4YnV/x1BwqThNQoFEQLn0rA3AxnGPwK8KMaEi0OZXk - FymJPKYZsgADM066pYUe6ArnmK2yEB2MJW94nj2feoaRGdjIjEvbzAKkwDnOuaxADfpahniePdaafmT4 - NTHh0jY10wNpcVwh5EEm5Ig0+DYwwvPseZLUhQyfZmpc6kYGIC3O0Vbum1Ml6DA5uuBngZSm5CRBeWup - cNc3MABZcI62ZvlrUXeu3ak0PwbHIPVVU+FS1mvogaw4RyEyfDXQqfp4nj3ZkiYqXPI6BqAQnKMQUp+X - 6CB/M9MTs7DW9iPVU02Fu7a2iR4oFOcohNSrCSmezwmuEemeLVS4pDUswCXgaAvxLy5pdSM98H/grq5i - ABLc+HLjLq9U0199cBc53F3JcuKurFCf57d3xx136OPh8Rc0ez3xKe5elAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx + C/giaowRQSiibC0Uyg6CyqKSuEaEQvdCK7tPqAmokWDUiFGgyCrHO+k0oT609w4JvvQk9/n+MjPn/ifX + wx133BGQh8dfX3hwzGy9f7QfDUfIOtyH+kN9qEvoRW18L+4d7MHdAz24s5+sfd2o2duN6rgu3N7TharY + TlTu7kTFrlcojyEr2oKyKAtKIy0oiTCjONyMIkkHlGFkhbajMKQdBcEma36QIZHf3nWWGQdFkAm5gaYJ + fnvXWW5cfqAJeQFG8Nu7zv/AycUswCXgyqLNUEbokSdpQ4FEh6LwDiqc3N9AD1zKkyuM1KL/8UfMTs2j + p/ED5CEaKpxsJwNQKI57cu2V77A4xfFaKlzuDj09UAiuONKER5e6sfBngacBP0cmIQtTUeFy/BiArLjS + qA5UnTJgemKWpwFzM/OoOWuEIthIhcv21dED2XCkFLFafH8/ztNseSHtR16wjhqX5cMApMVxR4kiXIO3 + ms88y5auhiFy8KqZcJneLEBKXGG4HqYKx1IM94+S766VGZfppaUH0uCKIkgpLjqWYuzLbxTGqcl3Z2DG + 3drOAHSFK4nkS2Gd42m2UlSfMYIMfUG4m54aeqAzHDe+FGE6DHV85Wm2PEvpgzxIKxiXsY0B6AzHzdb8 + UB0G2x2BT5N7IQvUCsbdEKnpgc5w3OBXSkwoP6F3fMXT86g8TUBivSBc+lYGoDOcffArQvRoTOxyKMkv + UhJ5TCtk/jpmnHRLGz3QFc4+W2VBGuhL3/A8Wz71jSJT3MyMS9vMAqTA2c+5LLEKA20jPM8WS+0gMnxb + mHBpm1rpgbQ4rhDyAANyJCp8GxrjebY8SepBhncrNS51IwOQFmdvK/fNKRM0mBpf9LNASlN6kqC81FS4 + 6xsYgCw4e1uz/NSoP2d2KM2P4QlIfZqocCnrVfRAVpy9EBk+KmiUAzzPluyIFipc8joGoBCcvRBS75fo + JH8zM5NzsNQNIlXURIW7traFHigUZy+E1LMFKaLnBNeMdFEbFS5pDQtwCTjaQvyLS1rdTA/8H7irqxiA + BGddbtzllU30Vx/cRQ53V7KcuCsrms7z27vjjjv08fD4CwlIPe+HvHrCAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji - g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6etQCnbkwQSBBJFEjGSSIksynGGmUaJSXvvmOBLT3Kf7y9z - 58x3MwH++OOPhDw+3HWu9lCL+9HBTjw8wK2kDtQkdqB6fzse7GtH1d423N/Thnu7ubXLhbs7XbizoxWV - Ca24He9ExXYnbsW14GYst1TNKI9pRll0M25sa0Lp1iaURL1FsZJbWxzQRzpQFGF3Xw9nz4rb+84846AL - t0OrsI+J2/vOfOOuK+wolNsgbu87/wNXEEYDJMTdTnCiLM4GvcqMUhWL8thmybiCUJYcSPrkSmNZdD4b - wNT3H+iqG0RxDCMZlx9CASQ+1iMs/oyjogf6rVZJOG2wlRxI+s6VxDMYHRoXecDMzxk8Pe+CPspGjcvb - TAEkLUSZqglVJx2zR+zJpHsaFcdY6JV2KlxuUCM5kATnaWtJtA0vUztFnpAvg2PQxZlQFGknxuXIKICk - OE8hdMpGuGrfizwhvewwtOFGYpwmkAZIgfMUoiDKiAHXiMgTYi3rRp7cQoTTbGLIgbQ4vhB6JfeuxZsw - +vGP0swAT845kRtq8YnL3kgBpMV52qqLsKHyBIvpid+lmRibQkmSBdqQRq849QYLOVAKztPWfAWDFynt - Ik9Ir20Y6iCDV1zWegqgVBxfCK2cQV3yXGCP9RMHNHrFZa4zkwOl4grkLG4dt/51xPr9ZuQEMV5xGWsp - gFJwhQob8lUGfP3gFmlCSWpPt0AtM/rEpa8xkQNpcfx3TiNvQL/rs0gTwhS/Q5bMQIRLW00DpMTlhJrQ - UtMnsoR0M0PIDHpNjEtbZSQH0uDywix4fqlNZAkZ6f8GTWQDNDKGGHdtJQWQFJcfZkX5Ueucy8IEd1ko - TjRT41JXUABJcPz4ylG8mVsK7rpVfaoJ6kATNe7qcgM5kATHz1ZdgkmkCeFLkRlokIS7sowCSILjZ2v2 - ZgNaH/Vhcnwazod9yJC9loxLWfqGHEiC4wd/XnDj7IRID3z1T0+OxyUvoQES4HwNflpc8uIGcuD/wF1e - RAHkcO75xl1YWE/+64P/kcP/K5lP3MUF9WfE7f3xxx/yBAT8AtInPpbTa5zAAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18 + 8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5 + c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24 + VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS + /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L + A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18 + CiBpIWzqIK7vCgwfcSzfo4Oo3s7CnOWnwp1ReMiBJLhYW61LfHh0vFXkCfn8phemPCcqMv3EOK2cAkiK + ixXClOVBpPaVyBPSwX6EPt1BjNPIaIAUuFghjNkOdEW6RZ4Qr60dOqWbCKeZx5ADaXF8IcxZ3LuW70TP + uz9KMwTcLQzjTKo7Ia5sLgWQFhdrqynDh0s7WQz2/y5Nf+8ArBvc0C/0xMWVznGTA6XgYm01qBg8PNIi + 8oR0+D6iVGGPizs9mwIoFccXQq9kUFc0EvjS+4EDOuLiSma5yIFScUYliws7vH8dsXmdC1oFExd3aiYF + UAquXOWDQW3Hl7dRkSaUpHZPI0rljoS4kzOc5EBaHP+d0ygb8DrySaQJYSwvcFpuJ8IVT6cBUuK0qU40 + 3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs + 613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN + t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH + UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC @@ -314,9 +317,9 @@ True - 186, 17 + 252, 17 - 368, 17 + 431, 17 \ No newline at end of file