diff --git a/Project/History.txt b/Project/History.txt index cd82826..3443fdb 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,5 @@ -* 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인\ +191129 chi 휴가내역 추가 +* 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인\ 191024 chi 프로젝트 공유폴더 눌렀을떄 \\ 가 연속으로 붙는현상 수정 191018 chi 열저장방식 변경(필드명으로 저장) 파트리스트 열 순서를 기존 사용 엑셀과 동일하게 정렬 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 265744b..c8460cc 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("19.10.24.1330")] -[assembly: AssemblyFileVersion("19.10.24.1330")] +[assembly: AssemblyVersion("19.11.29.1630")] +[assembly: AssemblyFileVersion("19.11.29.1630")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 950f3a3..ed83bb3 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -409,9 +409,9 @@ this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.패치내역ToolStripMenuItem1, this.메일내역ToolStripMenuItem, + this.holidayToolStripMenuItem, this.toolStripMenuItem3, this.minutesToolStripMenuItem, - this.holidayToolStripMenuItem, this.requestITemToolStripMenuItem, this.freeBoardToolStripMenuItem, this.bugReportToolStripMenuItem, @@ -425,45 +425,44 @@ // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(152, 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(149, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(152, 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(146, 6); + 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(149, 24); + 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.HotPink; + this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem"; - this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 24); - this.holidayToolStripMenuItem.Text = "휴가내역"; - this.holidayToolStripMenuItem.Visible = false; + this.holidayToolStripMenuItem.Size = new System.Drawing.Size(152, 24); + this.holidayToolStripMenuItem.Text = "휴가 내역"; this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click); // // requestITemToolStripMenuItem // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(152, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -472,7 +471,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(152, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -480,7 +479,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(152, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -488,7 +487,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(152, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -497,7 +496,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(152, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); diff --git a/Project/fMain.resx b/Project/fMain.resx index 3a3149e..264260a 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -153,6 +153,43 @@ Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw== + + + + + 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 + + + + + R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA + AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 + QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl + OoWKdGiDBgEBADs= + + + + + R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh + e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI + oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui + ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC + Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= + + + + + R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// + /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY + JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP + jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA + Ow== @@ -173,15 +210,6 @@ gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG CyQdKlaIsLHjggEBADs= - - - - - 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 @@ -254,34 +282,6 @@ gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG CyQdKlaIsLHjggEBADs= - - - - - R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA - AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 - QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl - OoWKdGiDBgEBADs= - - - - - R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh - e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI - oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui - ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC - Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= - - - - - R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// - /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY - JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP - jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA - Ow==