휴가신청화면의 남은 잔량 게산식 수정,

업무일지 추가시 프로젝트 이름 제대로 보이게 함

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("22.02.03.0150")]
+[assembly: AssemblyVersion("22.02.06.1300")]
-[assembly: AssemblyFileVersion("22.02.03.0150")]
+[assembly: AssemblyFileVersion("22.02.06.1300")]

Project/_Common/fAddNewUser.Designer.cs

@@ -370,7 +370,7 @@
             this.chkUserSt.Name = "chkUserSt";
             this.chkUserSt.Size = new System.Drawing.Size(93, 25);
             this.chkUserSt.TabIndex = 36;
-            this.chkUserSt.Text = "포함인원";
+            this.chkUserSt.Text = "업무일지";
             this.chkUserSt.UseVisualStyleBackColor = true;
             this.chkUserSt.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged);
             // 

SubProject/FBS0000/Holiday/fHolyday.Designer.cs

@@ -75,9 +75,9 @@
             this.dsMSSQL = new FBS0000.dsMSSQL();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.lbStt = new System.Windows.Forms.ToolStripLabel();
-            this.tbSD = new System.Windows.Forms.ToolStripTextBox();
+            this.dtSD = new System.Windows.Forms.ToolStripTextBox();
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
-            this.tbED = new System.Windows.Forms.ToolStripTextBox();
+            this.dtED = new System.Windows.Forms.ToolStripTextBox();
             this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
             this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
@@ -96,6 +96,9 @@
             this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
             this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
             this.textBox1 = new System.Windows.Forms.TextBox();
+            this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton9 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
@@ -352,10 +355,13 @@
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton8,
             this.lbStt,
-            this.tbSD,
+            this.dtSD,
             this.toolStripLabel2,
-            this.tbED,
+            this.toolStripLabel4,
+            this.dtED,
+            this.toolStripButton9,
             this.toolStripLabel3,
             this.cmbUser,
             this.toolStripButton1,
@@ -372,18 +378,18 @@
             this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.lbStt.ForeColor = System.Drawing.Color.Blue;
             this.lbStt.Name = "lbStt";
-            this.lbStt.Size = new System.Drawing.Size(31, 28);
+            this.lbStt.Size = new System.Drawing.Size(43, 28);
-            this.lbStt.Text = "기간";
+            this.lbStt.Text = "시작일";
             this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
             // 
-            // tbSD
+            // dtSD
             // 
-            this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
-            this.tbSD.Name = "tbSD";
+            this.dtSD.Name = "dtSD";
-            this.tbSD.Size = new System.Drawing.Size(100, 31);
+            this.dtSD.Size = new System.Drawing.Size(100, 31);
-            this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.tbSD.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown);
+            this.dtSD.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown);
             // 
             // toolStripLabel2
             // 
@@ -391,14 +397,14 @@
             this.toolStripLabel2.Size = new System.Drawing.Size(15, 28);
             this.toolStripLabel2.Text = "~";
             // 
-            // tbED
+            // dtED
             // 
-            this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
-            this.tbED.Name = "tbED";
+            this.dtED.Name = "dtED";
-            this.tbED.Size = new System.Drawing.Size(100, 31);
+            this.dtED.Size = new System.Drawing.Size(100, 31);
-            this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.tbED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown);
+            this.dtED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown);
             // 
             // toolStripLabel3
             // 
@@ -551,6 +557,35 @@
             this.textBox1.TabIndex = 5;
             this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
             // 
+            // toolStripButton8
+            // 
+            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
+            this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton8.Name = "toolStripButton8";
+            this.toolStripButton8.Size = new System.Drawing.Size(28, 28);
+            this.toolStripButton8.Text = "toolStripButton7";
+            this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click);
+            // 
+            // toolStripButton9
+            // 
+            this.toolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image")));
+            this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton9.Name = "toolStripButton9";
+            this.toolStripButton9.Size = new System.Drawing.Size(28, 28);
+            this.toolStripButton9.Text = "toolStripButton7";
+            this.toolStripButton9.Click += new System.EventHandler(this.toolStripButton9_Click);
+            // 
+            // toolStripLabel4
+            // 
+            this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
+            this.toolStripLabel4.Name = "toolStripLabel4";
+            this.toolStripLabel4.Size = new System.Drawing.Size(43, 28);
+            this.toolStripLabel4.Text = "종료일";
+            this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
+            // 
             // fpSpread1_Sheet1
             // 
             this.fpSpread1_Sheet1.Reset();
@@ -587,7 +622,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(2022, 2, 3, 1, 27, 37, 403);
+            dateTimeCellType1.TimeDefault = new System.DateTime(2022, 2, 3, 16, 27, 10, 432);
             this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate";
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "시작일";
@@ -711,12 +746,13 @@
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "소스";
             this.fpSpread1_Sheet1.Columns.Get(15).Tag = "src";
             this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType8;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "wuid";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "등록";
             this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Width = 108F;
+            this.fpSpread1_Sheet1.Columns.Get(16).Width = 70F;
             this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
             this.fpSpread1_Sheet1.DataSource = this.bs;
             this.fpSpread1_Sheet1.FrozenColumnCount = 1;
@@ -770,9 +806,9 @@
         private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
         private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
         private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.ToolStripTextBox tbSD;
+        private System.Windows.Forms.ToolStripTextBox dtSD;
         private System.Windows.Forms.ToolStripLabel toolStripLabel2;
-        private System.Windows.Forms.ToolStripTextBox tbED;
+        private System.Windows.Forms.ToolStripTextBox dtED;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
         private System.Windows.Forms.ToolStripLabel toolStripLabel3;
         private System.Windows.Forms.ToolStripComboBox cmbUser;
@@ -805,6 +841,9 @@
         private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton3;
         private System.Windows.Forms.ToolStripButton toolStripButton7;
+        private System.Windows.Forms.ToolStripButton toolStripButton8;
+        private System.Windows.Forms.ToolStripButton toolStripButton9;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel4;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FBS0000/Holiday/fHolyday.cs

@@ -41,8 +41,8 @@ namespace FBS0000
             im.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
             im2.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
 
-            tbSD.Text = DateTime.Now.ToString("yyyy-01") + "-01";
+            dtSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
-            tbED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
+            dtED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
 
             //현재 사용자의 그룹명을 가져옴
             var taQuery = new dsMSSQLTableAdapters.QueriesTableAdapter();
@@ -137,14 +137,14 @@ namespace FBS0000
 
             //update data
             seluid = GetUIDValue();
-            var sd = DateTime.Parse(tbSD.Text + " 00:00:00");
+            var sd = DateTime.Parse(dtSD.Text + " 00:00:00");
-            var ed = DateTime.Parse(tbED.Text + " 23:59:59");
+            var ed = DateTime.Parse(dtED.Text + " 23:59:59");
             //sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00"));
             //this.tbSD.Text = sd.ToShortDateString();
 
             try
             {
-                this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, FCOMMON.info.Login.gcode, seluid, tbED.Text);
+                this.ta.Fill(this.dsMSSQL.Holyday, dtSD.Text, FCOMMON.info.Login.gcode, seluid, dtED.Text);
                 this.dsMSSQL.Holyday.AcceptChanges();
             }
             catch (Exception ex)
@@ -403,7 +403,7 @@ namespace FBS0000
                 return;
             }
             string uid = GetUIDValue();
-            var f = new fHolydayJobReport(tbSD.Text, tbED.Text, uid);
+            var f = new fHolydayJobReport(dtSD.Text, dtED.Text, uid);
             f.Show();
         }
 
@@ -541,8 +541,8 @@ namespace FBS0000
         {
             var drv = this.bs.Current as DataRowView;
             var dr = drv.Row as dsMSSQL.HolydayRow;
-            this.tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
+            this.dtSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
-            this.tbED.Text = DateTime.Now.Year.ToString("0000") + "-12-31";
+            this.dtED.Text = DateTime.Now.Year.ToString("0000") + "-12-31";
             var username = string.Format("[{0}] {1}", dr.uid, dr.UserName);
             this.cmbUser.Text = username;
             RefreshData();
@@ -553,8 +553,8 @@ namespace FBS0000
             var f = new FCOMMON.fSelectMonth();
             if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
             var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
-            tbSD.Text = sdDate.ToShortDateString();
+            dtSD.Text = sdDate.ToShortDateString();
-            tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
+            dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
             this.RefreshData();
         }
 
@@ -635,7 +635,7 @@ namespace FBS0000
         private void toolStripButton7_Click(object sender, EventArgs e)
         {
             seluid = GetUIDValue();
-            var f = new fHolyDayData(tbED.Text, seluid != "%" ? cmbUser.Text : string.Empty );
+            var f = new fHolyDayData(dtED.Text, seluid != "%" ? cmbUser.Text : string.Empty );
             f.Show();
         }
 
@@ -643,5 +643,30 @@ namespace FBS0000
         {
 
         }
+
+        private void toolStripLabel4_Click(object sender, EventArgs e)
+        {
+            var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text));
+            if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
+            dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
+        }
+
+        private void toolStripButton8_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(dtSD.Text);
+            var sd = DateTime.Parse(sdo.AddMonths(-1).ToString("yyyy-MM-01"));
+            var ed = sd.AddMonths(1).AddDays(-1);
+            dtSD.Text = sd.ToShortDateString();
+            dtED.Text = ed.ToShortDateString();
+        }
+
+        private void toolStripButton9_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(dtSD.Text);
+            var sd = DateTime.Parse(sdo.AddMonths(1).ToString("yyyy-MM-01"));
+            var ed = sd.AddMonths(1).AddDays(-1);
+            dtSD.Text = sd.ToShortDateString();
+            dtED.Text = ed.ToShortDateString();
+        }
     }
 }

SubProject/FBS0000/Holiday/fHolyday.resx

@@ -212,23 +212,6 @@
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi
-        CwURXcam0lPUxCylkT0E9RBIVE6RtSVZmjJvm4bu0i54OdE2cUuPc0tdc64J2zntuAvf/ucsjw334B8+
-        HP4Hft//53zPObv4RVFUufWFAuMNFRiVHQa5dXKHHOSHj9rtdmbSaQPltMB4qwyZTGZHCCEqlWq3Xq+/
-        PfKsFnZ1LYw3y5BMJvNgWRYMw4jE43Gk0+lcQL6BGYbr0m0BmyGbJBIJpFKpfAPD01rYWmtguCYFx3EC
-        jzqDaNAF8YBQrw2gXhNAHYG3EANEA0fOYOiqFBsbGwL8sM4cgZbwzhSBZjyCex2LQgBvlWcw1FyDr6+r
-        MXilVEjn+f9UJRm8307jbhstdOD1erMFDfovlQoF8QEcl4TFHUSPYw4aUxAfbCsYppaw/nsVsViMIQHH
-        twxU1bC+UqD/Ysm/YQ7asXkMUquY/8ViMcphYiEO4/c1jEz6EY1GC3TgMEN/vlgI4Dv45AhhdjmBycAf
-        OPws7ARPiEOXNQCXy4WioqJTosFAkwKWFjn6KovFEjvGAqAjHBwLDGw0gzFfAtRPDu8tywiHw9sNpolB
-        b8UhscQu8syzKywsc7lhnuklDurhH9u/xIGHcpheytB7bivA7Aphgo7jGxlyBpKYIqcPuBJo1fVjiTIU
-        Nug5K0E2mxXexNo6C6c3gm7SxUd7CO2ji3ijG4bH2I4pdQ3qqw40CgZKpVLSWXkEfTdOoPuMBDRNw+fz
-        YWZmBm63WyjM4/EIV8vnt5houwP/SAv6msuTxCK3ZCV7Tj8+tu+JXLpXQbaFfl2Ruqr9jV9Ul7nR5xfw
-        F/LpyADMWHdSAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7GF3XVVdRps4uIogougsKQlGi
@@ -243,6 +226,23 @@
         G/SfLkEulxPexMoaC9f3GPpIFx8cUahNIbzWjMJnUGNSJUdTzb4WwUChUJT0VB/C4LVj6DtVApqmEQwG
         4ff74fV6hcJ8Pp9wtX16g4mOW5gztmGwtTJFLPKrtmzXyUdH9jyuk+6WkW2xX1eksWZvy2flRc707Bz+
         Auv5x/1fRd3rAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqqsoU2cXEUQU3QUFoSjR
+        BwURfYhzo6uoiVlGI7sI6iKQqNQh5pIsTZnTfRi6j/bBpifah7b06LbUNedS2M5px83x9J6zPDbchS/8
+        OLwH/s/7O885Zwe/KIqqsD6XYqyxEiM1B0FuHd8m+/nhw3a7nXE7baCcFhhulGN9fX1bCCFKpXKnRqO5
+        aXwqh71NDsP1cqRSqTxYlgXDMCKJRAKZTCYXkG9ghv6qZEvARsgGyWQS6XQ630D/RA5bqwz6KxJwHCfw
+        oDuMRnUY9wgNXSE0dIZQT+AtxADRwJEzGL4swdramgA/rDbH0EV4a4qhcyyGOx1BIYC3yjMYbpbhy6s6
+        DF0qE9J5/j9VQQbvqmjcbqeFDiYnJ7MFDQYvlAkF8QEcl4LFG0afYxqdpjDe2xaho+ax+nsJKysrDAk4
+        ummgrIP1pRSD50v/DXPoGp3BELWEmV8sgnEOrtkEDN+WYXTPIR6PF+jAYYbmbIkQwHfw0RHB1EIS7tAf
+        OOZY2Am+CIceawgejwdFRUUnRAPtQyksLbUYqCoRS+wYDYGOcXDMMrDRDEYDSVA/ObyzLCAajW41mCAG
+        /ZUHxBJ7yDNPLbKwTOeGeSbmObTpfmz9ErX3a2F6UYP+M5sBZk8ELjqBr2TIGUphnJyu9STRqh7EPKUv
+        bNB3uhjZbFZ4E8urLJzfY+glXXywR6AaCeK1WgefQYXxNhkaqvc1CQYKhaK4u+oQBq4dQ++pYtA0jUAg
+        AL/fD6/XKxTm8/mEq+XTG7jab2HO2IKB5ooUscitmtJdJx8d2fO4VrJbSraFfl2R+uq9TZ+VF7mRZ+fw
+        F+UJx/ryG7vdAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -281,6 +281,46 @@
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>188, 17</value>
   </metadata>
+  <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
+        C/giaowRQSiibC0Uyg6CyqKSuEaEQvcCFSjgE2oCaiQYNWIUKLLK8U46TagP7b1Dgi89yX2+v8zMuf/J
+        9XDHHXcE5OHx1xceHLNY7x/tR8MRsg73of5QH+oSelEb34t7By24e8CCO/vJ2teDmr09qI7rxu093aiK
+        7ULl7i5U7HqF8hiyos0oizKjNNKMkohOFId3okjSAWUYWaHtKAxpR0GwyZofZEjkt3edZcZBEWRCbqBp
+        gt/edZYblx9oQl6AEfz2rvM/cHIxC3AJuLLoTigj9MiTtKFAokNReAcVTu5voAcu5ckVRmrR//gjZqfm
+        YWn8AHmIhgon28kAFIrjnlx75TssTnG8lgqXu0NPDxSCK4404dGlHiz8WeBpwM+RScjCVFS4HD8GICuu
+        NKoDVacMmJ6Y5WnA3Mw8as4aoQg2UuGyfXX0QDYcKUWsFt/fj/M0W15I+5EXrKPGZfkwAGlx3FGiCNfg
+        reYzz7Klu2GIHLxqJlymNwuQElcYroepwrEUw/2j5LtrZcZlemnpgTS4oghSiouOpRj78huFcWry3RmY
+        cbe2MwBd4Uoi+VJY53iarRTVZ4wgQ18Q7qanhh7oDMeNL0WYDkMdX3maLc9S+iAP0grGZWxjADrDcbM1
+        P1SHwXZH4NPkXsgCtYJxN0RqeqAzHDf4lRITyk/oHV/x9DwqTxOQWC8Il76VAegMZx/8ihA9GhO7HUry
+        i5REHtMKmb+OGSfd0kYPdIWzz1ZZkAb60jc8z5ZPfaPIFDcz49I2swApcPZzLkuswkDbCM+zxVw7iAzf
+        FiZc2qZWeiAtjiuEPMCAHIkK34bGeJ4tT5IsyPBupcalbmQA0uLsbeW+OWWCBlPji34WSGlKTxKUl5oK
+        d30DA5AFZ29rlp8a9ec6HUrzY3gCUp8mKlzKehU9kBVnL0SGjwoa5QDPsyU7ooUKl7yOASgEZy+E1Psl
+        usjfzMzkHMx1g0gVNVHhrq1toQcKxdkLIfVsQYroOcE1I13URoVLWsMCXAKOthD/4pJWN9MD/wfu6ioG
+        IMFZlxt3eWUT/dUHd5HD3ZUsJ+7Kiqbz/PbuuOMOfTw8/gIMiT37T9A/6AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANTSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBwaUguAtuidHE
+        B999cUuMCi4oYktpsbbFoogLgqJRMVHEbkOnrUApBZ40kqCQuCVqJJESWZTjDDONEpP23jGpLz3Jfb6/
+        zJ0z380kxBNPPBJyd3vnodptwdCdrR24vYVbue2oyWlH9eYgbm0KompjG25uaMON9dxaF8D1tQFcW9OK
+        yuxWXM3yo2K1H1cyW3A5g1vqZpSvaoZ1ZTMurWhC2fImWNKfw5zGrWU+mFJ9uJjiDV1IZg+K20dPjHEw
+        JnuhV3n7xe2jJ9a4CyovSpUeiNtHz//AGZJogIS4q9l+WDM9MKmdKFOzKM9olowzJLLkQNInV5bBouNB
+        D4a//0BnXS/MqxjJOP1SCiDxse5g8Wd8Fa9gWu6WhCtZ4iYHkr5zliwGfe8HRB4w+nMU9w8HYEr3UON0
+        iymApIWwqptQtdc3dsThDIVGULGLhSnNS4UrVjSSA0lw4bZaVnrw+FSHyBPypbcfxkwHLqZ6iXFaOQWQ
+        FBcuhDGtEYHa1yJPSBf7ESXJdmKcRkYDpMCFC2FIt6Mn8FnkCXFbX0KndBHhNIsYciAtji+EKY1717Ic
+        6Hv3R2lGgXuH/ChOdEXFnV9IAaTFhdtqTPGgcg+LkcHfpRnsH4Yl14WSpY0RcUULXORAKbhwW/UqBo/y
+        gyJPSJfnI4oUtoi4c/MpgFJxfCFKlAzq8sYDX7k/cEB7RFzhPCc5UCrOoGRxZbf7ryM2bXZCq2Ai4s7O
+        pQBKwZWqPNCrbfj6NiTShJLU7m9BkdweFXdmjoMcSIvjv3MaZQPeBD6JNCGM+QXOyW1EuILZNEBKnDbR
+        gZaabpEl5CXzHoWKp8S4gll2ciANTpfkwsNjbSJLyOc336BJbYBGzhDjTs+kAJLi9ElulO90j7ssDHKX
+        BXOOkxp3agYFkATHjy+t6tn4UnDXrep9TSiSOahxJ6fbyIEkOH62GrMdIk0IX4pCmU0S7sQ0CiAJjp+t
+        5xfb0HqnG0MDI/Df7sZZ+VPJuPypz8iBJDh+8OuWNI5NiDOyJ//05Hhc3hQaIAEu2uCnxeVNbiAH/g/c
+        8UkUQA4XijXuyMR68l8f/I8c/l9JLHFHJ9QfELePJ554yJOQ8AvCuz6iy+fZHAAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

SubProject/FCOMMON/DataBaseManager.cs

@@ -723,21 +723,28 @@ namespace FCOMMON
             System.Data.DataTable retval = new System.Data.DataTable();
             retval.Columns.Add("Code");
             retval.Columns.Add("Value");
+            retval.Columns.Add("NameOnly");
 
             var cn = getCn();
             cn.Open();
-            var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),pdate  from Projects" +
+            var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),isnull(name,'')  from Projects" +
                 " where gcode='{0}'" +
                 " and  (isnull(userManager,'') like '%{1}%'" +
                 " or  isnull(userMain,'') like '%{1}%'" +
                 " or  isnull(usersub,'') like '%{1}%')" +
-                " order by pdate desc,name";
+                " and status not in ('보류', '취소', '완료(보고)')" +
+                " order by status desc,pdate desc,name";
+            //" order by pdate desc,name";
             sql = string.Format(sql, FCOMMON.info.Login.gcode, userName);
             var cmd = new SqlCommand(sql, cn);
             var rdr = cmd.ExecuteReader();
             while (rdr.Read())
             {
-                retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString() });
+                retval.Rows.Add(new string[] {
+                    rdr[0].ToString(),
+                    rdr[1].ToString(),
+                    rdr[2].ToString()
+                });
             }
             rdr.Close();
             cmd.Dispose();

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -81,7 +81,7 @@ namespace FPJ0000.JobReport_
             var userProject = FCOMMON.DBM.getUserProjectList(FCOMMON.info.Login.nameK);
             this.tbProject.DataSource = userProject;
             this.tbProject.ValueMember = "Code";
-            this.tbProject.DisplayMember = "Value";
+            this.tbProject.DisplayMember = "NameOnly";
 
             //상태
             var stateList = FCOMMON.DBM.getCodeTable("12");

SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs

@@ -30,12 +30,12 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyRequest));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dSKuntae = new FPJ0000.DSKuntae();
@@ -65,6 +65,9 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.btSearch = new System.Windows.Forms.ToolStripSplitButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.sbday = new System.Windows.Forms.ToolStripLabel();
+            this.sbtime = new System.Windows.Forms.ToolStripLabel();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.dv1 = new arCtl.arDatagridView();
@@ -84,9 +87,8 @@
             this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
-            this.sbday = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
-            this.sbtime = new System.Windows.Forms.ToolStripLabel();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -284,11 +286,13 @@
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton8,
             this.lbStt,
             this.dtSD,
             this.lbEnd,
             this.toolStripLabel4,
             this.dtED,
+            this.toolStripButton7,
             this.toolStripSeparator2,
             this.btSearch,
             this.toolStripButton2,
@@ -330,8 +334,8 @@
             this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
             this.toolStripLabel4.Name = "toolStripLabel4";
-            this.toolStripLabel4.Size = new System.Drawing.Size(43, 34);
+            this.toolStripLabel4.Size = new System.Drawing.Size(31, 34);
-            this.toolStripLabel4.Text = "시작일";
+            this.toolStripLabel4.Text = "선택";
             this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
             // 
             // dtED
@@ -368,6 +372,23 @@
             this.toolStripButton2.Text = "닫기";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
             // 
+            // toolStripSeparator3
+            // 
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
+            // 
+            // sbday
+            // 
+            this.sbday.Name = "sbday";
+            this.sbday.Size = new System.Drawing.Size(51, 34);
+            this.sbday.Text = "합계(일)";
+            // 
+            // sbtime
+            // 
+            this.sbtime.Name = "sbtime";
+            this.sbtime.Size = new System.Drawing.Size(63, 34);
+            this.sbtime.Text = "합계(시간)";
+            // 
             // richTextBox1
             // 
             this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro;
@@ -411,15 +432,15 @@
             this.dv1.AutoGenerateColumns = false;
             this.dv1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
             this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(5);
+            dataGridViewCellStyle13.Padding = new System.Windows.Forms.Padding(5);
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
             this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.uidDataGridViewTextBoxColumn,
@@ -438,15 +459,15 @@
             this.HolyBackup,
             this.remarkDataGridViewTextBoxColumn});
             this.dv1.DataSource = this.bs;
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(3);
+            dataGridViewCellStyle18.Padding = new System.Windows.Forms.Padding(3);
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dv1.DefaultCellStyle = dataGridViewCellStyle6;
+            this.dv1.DefaultCellStyle = dataGridViewCellStyle18;
             this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dv1.Location = new System.Drawing.Point(0, 0);
             this.dv1.Name = "dv1";
@@ -523,8 +544,8 @@
             // cmbCf
             // 
             this.cmbCf.DataPropertyName = "conf";
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.cmbCf.DefaultCellStyle = dataGridViewCellStyle2;
+            this.cmbCf.DefaultCellStyle = dataGridViewCellStyle14;
             this.cmbCf.HeaderText = "관리자 승인";
             this.cmbCf.Items.AddRange(new object[] {
             "선택안함",
@@ -537,8 +558,8 @@
             // Response
             // 
             this.Response.DataPropertyName = "Response";
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.Response.DefaultCellStyle = dataGridViewCellStyle3;
+            this.Response.DefaultCellStyle = dataGridViewCellStyle15;
             this.Response.HeaderText = "관리자 비고";
             this.Response.Name = "Response";
             this.Response.Width = 104;
@@ -546,10 +567,10 @@
             // HolyDays
             // 
             this.HolyDays.DataPropertyName = "HolyDays";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.HolyDays.DefaultCellStyle = dataGridViewCellStyle4;
+            this.HolyDays.DefaultCellStyle = dataGridViewCellStyle16;
             this.HolyDays.HeaderText = "사용일";
             this.HolyDays.Name = "HolyDays";
             this.HolyDays.Width = 76;
@@ -557,11 +578,11 @@
             // HolyTimes
             // 
             this.HolyTimes.DataPropertyName = "HolyTimes";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
+            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
-            this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle5;
+            this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle17;
             this.HolyTimes.HeaderText = "대체시간";
             this.HolyTimes.Name = "HolyTimes";
             this.HolyTimes.Width = 88;
@@ -584,22 +605,25 @@
             // 
             this.ta.ClearBeforeFill = true;
             // 
-            // toolStripSeparator3
+            // toolStripButton8
             // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
+            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
+            this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton8.Name = "toolStripButton8";
+            this.toolStripButton8.Size = new System.Drawing.Size(34, 34);
+            this.toolStripButton8.Text = "toolStripButton7";
+            this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click);
             // 
-            // sbday
+            // toolStripButton7
             // 
-            this.sbday.Name = "sbday";
+            this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.sbday.Size = new System.Drawing.Size(51, 34);
+            this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
-            this.sbday.Text = "합계(일)";
+            this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
-            // 
+            this.toolStripButton7.Name = "toolStripButton7";
-            // sbtime
+            this.toolStripButton7.Size = new System.Drawing.Size(34, 34);
-            // 
+            this.toolStripButton7.Text = "toolStripButton7";
-            this.sbtime.Name = "sbtime";
+            this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
-            this.sbtime.Size = new System.Drawing.Size(63, 34);
-            this.sbtime.Text = "합계(시간)";
             // 
             // fHolyRequest
             // 
@@ -682,5 +706,7 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private System.Windows.Forms.ToolStripLabel sbday;
         private System.Windows.Forms.ToolStripLabel sbtime;
+        private System.Windows.Forms.ToolStripButton toolStripButton8;
+        private System.Windows.Forms.ToolStripButton toolStripButton7;
     }
 }

SubProject/FPJ0000/OtConfirm/fHolyRequest.cs

@@ -49,7 +49,7 @@ namespace FPJ0000
             curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
 
             this.dtED.Text = DateTime.Now.AddMonths(1).ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
-            this.dtSD.Text = DateTime.Now.AddMonths(-3).ToShortDateString();
+            this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
 
             this.dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
 
@@ -119,9 +119,9 @@ namespace FPJ0000
             var sum_time2 = dSKuntae.EETGW_HolydayRequest.AsEnumerable().Where(t => t.conf == 0).Sum(t => t.HolyTimes);
 
             sbday.Text = $"합계(일) = 승인:{sum_day}/미승인:{sum_day2}";
-            sbday.ForeColor = sum_day == sum_day2 ? Color.Black : Color.Red;
+            sbday.ForeColor =  sum_day2 == 0 ? Color.Black : Color.Red;
             sbtime.Text = $"합계(시간) = 승인:{sum_time}/미승인:{sum_time2}";
-            sbtime.ForeColor = sum_time == sum_time2 ? Color.Black : Color.Red;
+            sbtime.ForeColor =  sum_time2 == 0 ? Color.Black : Color.Red;
             ////색상처리
             //dv1.SuspendLayout();
             //foreach(DataGridViewRow dr in this.dv1.Rows)
@@ -363,5 +363,24 @@ namespace FPJ0000
             if (cnt == 0)
                 FCOMMON.Util.MsgQ("삭제가 완료되지 않았습니다");
         }
+
+        private void toolStripButton8_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(dtSD.Text);
+            var sd = DateTime.Parse(sdo.AddMonths(-1).ToString("yyyy-MM-01"));
+            var ed = sd.AddMonths(1).AddDays(-1);
+            dtSD.Text = sd.ToShortDateString();
+            dtED.Text = ed.ToShortDateString();
+
+        }
+
+        private void toolStripButton7_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(dtSD.Text);
+            var sd = DateTime.Parse(sdo.AddMonths(1).ToString("yyyy-MM-01"));
+            var ed = sd.AddMonths(1).AddDays(-1);
+            dtSD.Text = sd.ToShortDateString();
+            dtED.Text = ed.ToShortDateString();
+        }
     }
 }

SubProject/FPJ0000/OtConfirm/fHolyRequest.resx

@@ -234,9 +234,52 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="dSKuntae.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>253, 17</value>
+  </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>147, 17</value>
   </metadata>
+  <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
+        C/giaowRQSiibC0Uyg6CyqKSuEaEQvcCFSjgE2oCaiQYNWIUKLLK8U46TagP7b1Dgi89yX2+v8zMuf/J
+        9XDHHXcE5OHx1xceHLNY7x/tR8MRsg73of5QH+oSelEb34t7By24e8CCO/vJ2teDmr09qI7rxu093aiK
+        7ULl7i5U7HqF8hiyos0oizKjNNKMkohOFId3okjSAWUYWaHtKAxpR0GwyZofZEjkt3edZcZBEWRCbqBp
+        gt/edZYblx9oQl6AEfz2rvM/cHIxC3AJuLLoTigj9MiTtKFAokNReAcVTu5voAcu5ckVRmrR//gjZqfm
+        YWn8AHmIhgon28kAFIrjnlx75TssTnG8lgqXu0NPDxSCK4404dGlHiz8WeBpwM+RScjCVFS4HD8GICuu
+        NKoDVacMmJ6Y5WnA3Mw8as4aoQg2UuGyfXX0QDYcKUWsFt/fj/M0W15I+5EXrKPGZfkwAGlx3FGiCNfg
+        reYzz7Klu2GIHLxqJlymNwuQElcYroepwrEUw/2j5LtrZcZlemnpgTS4oghSiouOpRj78huFcWry3RmY
+        cbe2MwBd4Uoi+VJY53iarRTVZ4wgQ18Q7qanhh7oDMeNL0WYDkMdX3maLc9S+iAP0grGZWxjADrDcbM1
+        P1SHwXZH4NPkXsgCtYJxN0RqeqAzHDf4lRITyk/oHV/x9DwqTxOQWC8Il76VAegMZx/8ihA9GhO7HUry
+        i5REHtMKmb+OGSfd0kYPdIWzz1ZZkAb60jc8z5ZPfaPIFDcz49I2swApcPZzLkuswkDbCM+zxVw7iAzf
+        FiZc2qZWeiAtjiuEPMCAHIkK34bGeJ4tT5IsyPBupcalbmQA0uLsbeW+OWWCBlPji34WSGlKTxKUl5oK
+        d30DA5AFZ29rlp8a9ec6HUrzY3gCUp8mKlzKehU9kBVnL0SGjwoa5QDPsyU7ooUKl7yOASgEZy+E1Psl
+        usjfzMzkHMx1g0gVNVHhrq1toQcKxdkLIfVsQYroOcE1I13URoVLWsMCXAKOthD/4pJWN9MD/wfu6ioG
+        IMFZlxt3eWUT/dUHd5HD3ZUsJ+7Kiqbz/PbuuOMOfTw8/gIMiT37T9A/6AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANTSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBwaUguAtuidHE
+        B999cUuMCi4oYktpsbbFoogLgqJRMVHEbkOnrUApBZ40kqCQuCVqJJESWZTjDDONEpP23jGpLz3Jfb6/
+        zJ0z380kxBNPPBJyd3vnodptwdCdrR24vYVbue2oyWlH9eYgbm0KompjG25uaMON9dxaF8D1tQFcW9OK
+        yuxWXM3yo2K1H1cyW3A5g1vqZpSvaoZ1ZTMurWhC2fImWNKfw5zGrWU+mFJ9uJjiDV1IZg+K20dPjHEw
+        JnuhV3n7xe2jJ9a4CyovSpUeiNtHz//AGZJogIS4q9l+WDM9MKmdKFOzKM9olowzJLLkQNInV5bBouNB
+        D4a//0BnXS/MqxjJOP1SCiDxse5g8Wd8Fa9gWu6WhCtZ4iYHkr5zliwGfe8HRB4w+nMU9w8HYEr3UON0
+        iymApIWwqptQtdc3dsThDIVGULGLhSnNS4UrVjSSA0lw4bZaVnrw+FSHyBPypbcfxkwHLqZ6iXFaOQWQ
+        FBcuhDGtEYHa1yJPSBf7ESXJdmKcRkYDpMCFC2FIt6Mn8FnkCXFbX0KndBHhNIsYciAtji+EKY1717Ic
+        6Hv3R2lGgXuH/ChOdEXFnV9IAaTFhdtqTPGgcg+LkcHfpRnsH4Yl14WSpY0RcUULXORAKbhwW/UqBo/y
+        gyJPSJfnI4oUtoi4c/MpgFJxfCFKlAzq8sYDX7k/cEB7RFzhPCc5UCrOoGRxZbf7ryM2bXZCq2Ai4s7O
+        pQBKwZWqPNCrbfj6NiTShJLU7m9BkdweFXdmjoMcSIvjv3MaZQPeBD6JNCGM+QXOyW1EuILZNEBKnDbR
+        gZaabpEl5CXzHoWKp8S4gll2ciANTpfkwsNjbSJLyOc336BJbYBGzhDjTs+kAJLi9ElulO90j7ssDHKX
+        BXOOkxp3agYFkATHjy+t6tn4UnDXrep9TSiSOahxJ6fbyIEkOH62GrMdIk0IX4pCmU0S7sQ0CiAJjp+t
+        5xfb0HqnG0MDI/Df7sZZ+VPJuPypz8iBJDh+8OuWNI5NiDOyJ//05Hhc3hQaIAEu2uCnxeVNbiAH/g/c
+        8UkUQA4XijXuyMR68l8f/I8c/l9JLHFHJ9QfELePJ554yJOQ8AvCuz6iy+fZHAAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs

@@ -336,14 +336,14 @@ namespace FPJ0000.OtConfirm
                     var perc = 0f;
                     if (val[0] != "0") perc = float.Parse(val[1]) / float.Parse(val[0]);
                     if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc*100:N1}%사용)");
                 }
                 else if (val[5] != "0")
                 {
                     var perc = 0f;
                     if (val[3] != "0") perc = float.Parse(val[4]) / float.Parse(val[3]);
                     if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc*100:N1}%사용)");
                 }
 
             }