Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

메모장 추가

Browse Source
This commit is contained in:
chi
2020-05-26 13:21:41 +09:00
parent 117d7a3ba2
commit 2bb7472cb0
17 changed files with 3896 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

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

56
Project/fMain.Designer.cs generated
View File

@@ -70,6 +70,8 @@
this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.mn_docu = new System.Windows.Forms.ToolStripMenuItem();
this.메모장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
this.패치내역ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.메일내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -97,8 +99,8 @@
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -419,6 +421,8 @@
// mn_docu
//
this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.메모장ToolStripMenuItem,
this.toolStripMenuItem4,
this.패치내역ToolStripMenuItem1,
this.메일내역ToolStripMenuItem,
this.holidayToolStripMenuItem,
@@ -435,17 +439,29 @@
this.mn_docu.Size = new System.Drawing.Size(65, 23);
this.mn_docu.Text = "문서";
//
// 메모장ToolStripMenuItem
//
this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem";
this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.메모장ToolStripMenuItem.Text = "메모장";
this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(146, 6);
//
// 패치내역ToolStripMenuItem1
//
this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 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(180, 24);
this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.메일내역ToolStripMenuItem.Text = "메일 내역";
this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click);
//
@@ -453,20 +469,20 @@
//
this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem";
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 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);
this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6);
//
// minutesToolStripMenuItem
//
this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.minutesToolStripMenuItem.Text = "회의록";
this.minutesToolStripMenuItem.Visible = false;
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
@@ -475,7 +491,7 @@
//
this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Visible = false;
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -484,7 +500,7 @@
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
this.freeBoardToolStripMenuItem.Visible = false;
//
@@ -492,7 +508,7 @@
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
this.bugReportToolStripMenuItem.Visible = false;
//
@@ -500,7 +516,7 @@
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
this.todoListToolStripMenuItem.Visible = false;
this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -509,7 +525,7 @@
//
this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.메일전송ToolStripMenuItem.Text = "메일전송";
this.메일전송ToolStripMenuItem.Visible = false;
this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click);
@@ -517,7 +533,7 @@
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24);
this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 24);
this.toolStripMenuItem5.Text = "123";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
@@ -651,6 +667,13 @@
this.pMP데이터베이스업데이트ToolStripMenuItem.Text = "PMP 데이터베이스 업데이트";
this.pMP데이터베이스업데이트ToolStripMenuItem.Click += new System.EventHandler(this.pMP데이터베이스업데이트ToolStripMenuItem_Click);
//
// mailBackupToolStripMenuItem
//
this.mailBackupToolStripMenuItem.Name = "mailBackupToolStripMenuItem";
this.mailBackupToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.mailBackupToolStripMenuItem.Text = "Mail Backup";
this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click);
//
// tabControl1
//
this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
@@ -666,13 +689,6 @@
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
//
// mailBackupToolStripMenuItem
//
this.mailBackupToolStripMenuItem.Name = "mailBackupToolStripMenuItem";
this.mailBackupToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.mailBackupToolStripMenuItem.Text = "Mail Backup";
this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -771,6 +787,8 @@
private System.Windows.Forms.ToolStripMenuItem pMP데이터베이스업데이트ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pMP현황ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mailBackupToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 메모장ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
}
}

26
Project/fMain.cs
View File

@@ -87,6 +87,8 @@ namespace Project
Update_Site();
bw.RunWorkerAsync(); //background worker
//사용기록추적
Pub.CheckNRegister2(Application.ProductName, "chi", Application.ProductVersion);
}
@@ -150,6 +152,9 @@ namespace Project
var menu_kuntaeVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
Menu_Note();
//시작폼 확인
if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible == true)
{
@@ -171,7 +176,10 @@ namespace Project
{
Menu_InventoryList();
}
}
@@ -741,6 +749,12 @@ namespace Project
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fInventoryJagoList());
}
void Menu_Note()
{
string formkey = "NOTELIST";
if (!ShowForm(formkey))
AddForm(formkey, new FPJ0000.Note.fNote());
}
private void 재고현황ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_InventoryList();
@@ -910,5 +924,15 @@ namespace Project
f.TopMost = true;
f.Show();
}
private void 메모장ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_Note();
}
private void toolStripButton1_Click_1(object sender, EventArgs e)
{
Menu_Note();
}
}
}