업무일지 시간 용약표, 날짜 정렬 오류 수정

Project/Properties/AssemblyInfo.cs

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

Project/fMain.Designer.cs

@@ -71,9 +71,9 @@
             this.mn_docu = new System.Windows.Forms.ToolStripMenuItem();
             this.패치내역ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.메일내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
             this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.requestITemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.freeBoardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.bugReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -95,6 +95,7 @@
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -416,7 +417,8 @@
             this.freeBoardToolStripMenuItem,
             this.bugReportToolStripMenuItem,
             this.todoListToolStripMenuItem,
-            this.메일전송ToolStripMenuItem});
+            this.메일전송ToolStripMenuItem,
+            this.toolStripMenuItem5});
             this.mn_docu.Image = ((System.Drawing.Image)(resources.GetObject("mn_docu.Image")));
             this.mn_docu.Name = "mn_docu";
             this.mn_docu.Size = new System.Drawing.Size(65, 23);
@@ -425,44 +427,44 @@
             // 패치내역ToolStripMenuItem1
             // 
             this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
-            this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(152, 24);
+            this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
             this.패치내역ToolStripMenuItem1.Text = "패치 내역";
             this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click);
             // 
             // 메일내역ToolStripMenuItem
             // 
             this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem";
-            this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.메일내역ToolStripMenuItem.Text = "메일 내역";
             this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click);
             // 
-            // toolStripMenuItem3
-            // 
-            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 6);
-            // 
-            // minutesToolStripMenuItem
-            // 
-            this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
-            this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
-            this.minutesToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
-            this.minutesToolStripMenuItem.Text = "회의록";
-            this.minutesToolStripMenuItem.Visible = false;
-            this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
-            // 
             // holidayToolStripMenuItem
             // 
             this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
             this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem";
-            this.holidayToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.holidayToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.holidayToolStripMenuItem.Text = "휴가 내역";
             this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click);
             // 
+            // toolStripMenuItem3
+            // 
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6);
+            // 
+            // minutesToolStripMenuItem
+            // 
+            this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
+            this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
+            this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.minutesToolStripMenuItem.Text = "회의록";
+            this.minutesToolStripMenuItem.Visible = false;
+            this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
+            // 
             // requestITemToolStripMenuItem
             // 
             this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
             this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
-            this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.requestITemToolStripMenuItem.Text = "견적요청";
             this.requestITemToolStripMenuItem.Visible = false;
             this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -471,7 +473,7 @@
             // 
             this.freeBoardToolStripMenuItem.Enabled = false;
             this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
-            this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.freeBoardToolStripMenuItem.Text = "Free Board";
             this.freeBoardToolStripMenuItem.Visible = false;
             // 
@@ -479,7 +481,7 @@
             // 
             this.bugReportToolStripMenuItem.Enabled = false;
             this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
-            this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.bugReportToolStripMenuItem.Text = "Bug Report";
             this.bugReportToolStripMenuItem.Visible = false;
             // 
@@ -487,7 +489,7 @@
             // 
             this.todoListToolStripMenuItem.Enabled = false;
             this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
-            this.todoListToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.todoListToolStripMenuItem.Text = "Todo List";
             this.todoListToolStripMenuItem.Visible = false;
             this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -496,7 +498,7 @@
             // 
             this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
             this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
-            this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.메일전송ToolStripMenuItem.Text = "메일전송";
             this.메일전송ToolStripMenuItem.Visible = false;
             this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click);
@@ -637,6 +639,13 @@
             this.tabControl1.TabIndex = 34;
             this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
             // 
+            // toolStripMenuItem5
+            // 
+            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24);
+            this.toolStripMenuItem5.Text = "123";
+            this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
+            // 
             // fMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -731,6 +740,7 @@
         private System.Windows.Forms.ToolStripMenuItem 메일양식ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 메일내역ToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
     }
 }
 

Project/fMain.cs

@@ -876,5 +876,16 @@ namespace Project
             if (!ShowForm(formkey))
                 AddForm(formkey, new FCM0000.Mail.fMailList()); 
         }
+
+        private void toolStripMenuItem5_Click(object sender, EventArgs e)
+        {
+
+            var f = new FBS0000.fHolyday_Add();
+            f.TopMost = true;
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                //RefreshData();
+            }
+        }
     }
 }

Project/fMain.resx

@@ -153,43 +153,6 @@
         Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA
         kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV
         Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw==
-</value>
-  </data>
-  <data name="commonToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O
-        fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo
-        oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E
-        RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
-</value>
-  </data>
-  <data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
-        AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
-        QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
-        OoWKdGiDBgEBADs=
-</value>
-  </data>
-  <data name="mn_docu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh
-        e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
-        oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
-        ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
-        Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
-</value>
-  </data>
-  <data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
-        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
-        JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
-        jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
-        Ow==
 </value>
   </data>
   <data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -210,6 +173,15 @@
         gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
         SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
         CyQdKlaIsLHjggEBADs=
+</value>
+  </data>
+  <data name="commonToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O
+        fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo
+        oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E
+        RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
 </value>
   </data>
   <data name="mn_purchase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -282,6 +254,34 @@
         gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
         SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
         CyQdKlaIsLHjggEBADs=
+</value>
+  </data>
+  <data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
+        AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
+        QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
+        OoWKdGiDBgEBADs=
+</value>
+  </data>
+  <data name="mn_docu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh
+        e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
+        oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
+        ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
+        Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
+</value>
+  </data>
+  <data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
+        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
+        JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
+        jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
+        Ow==
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">