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

업무일지 테이블 연결 -

Browse Source 
프로젝트 주간업무내용 편집창 연결 작업
This commit is contained in:
chikyun.kim
2019-03-11 23:18:47 +09:00
parent 9853bed403
commit 417e02a171
26 changed files with 2261 additions and 1922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/History.txt
View File

@@ -1,5 +1,7 @@
* 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인
190305 chi 일반사용자 자동저장되게함
프로젝트편집화면에서 cost n -> o 뒤바껴 있었음
전장담당자 항목 추가
190303 chi 프로젝트관리 추가 - 화면 정리 작업
아웃룩을 통한 메일 전송기능 추가
메일전송완료시 메일전송 기록 및 주간내역의 메일전송 플래그가 설정됨

4
Project/Properties/AssemblyInfo.cs
View File

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

88
Project/fMain.Designer.cs generated
View File

@@ -49,9 +49,6 @@
this.btSetting = new System.Windows.Forms.ToolStripMenuItem();
this.btLog = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.projectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.listToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.workReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.commonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.itemsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.codesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -70,6 +67,7 @@
this.freeBoardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bugReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.todoListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.업무일지ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.equipmentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataFOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -117,7 +115,7 @@
this.toolStripButton5});
this.toolStrip.Location = new System.Drawing.Point(0, 4);
this.toolStrip.Name = "toolStrip";
this.toolStrip.Size = new System.Drawing.Size(32, 165);
this.toolStrip.Size = new System.Drawing.Size(25, 146);
this.toolStrip.TabIndex = 32;
this.toolStrip.Text = "ToolStrip";
this.toolTip1.SetToolTip(this.toolStrip, "NR파트 구매");
@@ -128,7 +126,7 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(30, 24);
this.toolStripButton1.Size = new System.Drawing.Size(23, 24);
this.toolStripButton1.Text = "메일전송";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
@@ -138,7 +136,7 @@
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(30, 24);
this.toolStripButton2.Size = new System.Drawing.Size(23, 24);
this.toolStripButton2.Text = "구매신청";
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
@@ -149,7 +147,7 @@
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(30, 24);
this.toolStripButton3.Size = new System.Drawing.Size(23, 24);
this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.ToolTipText = "프로젝트";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
@@ -160,7 +158,7 @@
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(30, 24);
this.toolStripButton4.Size = new System.Drawing.Size(23, 24);
this.toolStripButton4.Text = "개인 인벤토리";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@@ -170,7 +168,7 @@
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(30, 24);
this.toolStripButton5.Size = new System.Drawing.Size(23, 24);
this.toolStripButton5.Text = "toolStripButton5";
this.toolStripButton5.ToolTipText = "로그인/로그아웃";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
@@ -254,7 +252,6 @@
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.btSetting,
this.btLog,
this.projectToolStripMenuItem,
this.commonToolStripMenuItem,
this.boardsToolStripMenuItem,
this.managementToolStripMenuItem,
@@ -266,30 +263,6 @@
this.menuStrip1.TabIndex = 29;
this.menuStrip1.Text = "menuStrip1";
//
// projectToolStripMenuItem
//
this.projectToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.listToolStripMenuItem,
this.workReportToolStripMenuItem});
this.projectToolStripMenuItem.Name = "projectToolStripMenuItem";
this.projectToolStripMenuItem.Size = new System.Drawing.Size(77, 23);
this.projectToolStripMenuItem.Text = "프로젝트";
//
// listToolStripMenuItem
//
this.listToolStripMenuItem.Name = "listToolStripMenuItem";
this.listToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.listToolStripMenuItem.Text = "목록";
this.listToolStripMenuItem.Click += new System.EventHandler(this.listToolStripMenuItem_Click);
//
// workReportToolStripMenuItem
//
this.workReportToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.workReportToolStripMenuItem.Name = "workReportToolStripMenuItem";
this.workReportToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.workReportToolStripMenuItem.Text = "업무일지";
this.workReportToolStripMenuItem.Click += new System.EventHandler(this.workReportToolStripMenuItem_Click);
//
// commonToolStripMenuItem
//
this.commonToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -307,14 +280,14 @@
// itemsToolStripMenuItem
//
this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.itemsToolStripMenuItem.Text = "품목";
this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
//
// codesToolStripMenuItem
//
this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
this.codesToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.codesToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.codesToolStripMenuItem.Text = "공용코드";
this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
//
@@ -325,7 +298,7 @@
this.myAccouserToolStripMenuItem,
this.aDSUserListToolStripMenuItem});
this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.userInfoToolStripMenuItem.Text = "사용자";
//
// userAccountToolStripMenuItem
@@ -353,20 +326,20 @@
// customerToolStripMenuItem
//
this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
this.customerToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.customerToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.customerToolStripMenuItem.Text = "업체정보";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(136, 6);
this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
//
// staffGridToolStripMenuItem
//
this.staffGridToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.staffGridToolStripMenuItem.Name = "staffGridToolStripMenuItem";
this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.staffGridToolStripMenuItem.Text = "Staff Grid";
this.staffGridToolStripMenuItem.Click += new System.EventHandler(this.staffGridToolStripMenuItem_Click);
//
@@ -374,7 +347,7 @@
//
this.mailFormToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.mailFormToolStripMenuItem.Name = "mailFormToolStripMenuItem";
this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.mailFormToolStripMenuItem.Text = "메일 양식";
this.mailFormToolStripMenuItem.Click += new System.EventHandler(this.mailFormToolStripMenuItem_Click);
//
@@ -386,7 +359,8 @@
this.requestITemToolStripMenuItem,
this.freeBoardToolStripMenuItem,
this.bugReportToolStripMenuItem,
this.todoListToolStripMenuItem});
this.todoListToolStripMenuItem,
this.업무일지ToolStripMenuItem});
this.boardsToolStripMenuItem.Name = "boardsToolStripMenuItem";
this.boardsToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
this.boardsToolStripMenuItem.Text = "문서";
@@ -395,7 +369,7 @@
//
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.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
//
@@ -403,7 +377,7 @@
//
this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem";
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.holidayToolStripMenuItem.Text = "휴가";
this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click);
//
@@ -411,7 +385,7 @@
//
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.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
//
@@ -419,22 +393,30 @@
//
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";
//
// bugReportToolStripMenuItem
//
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";
//
// todoListToolStripMenuItem
//
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.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
//
// 업무일지ToolStripMenuItem
//
this.업무일지ToolStripMenuItem.Name = "업무일지ToolStripMenuItem";
this.업무일지ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.업무일지ToolStripMenuItem.Text = "업무일지";
this.업무일지ToolStripMenuItem.Click += new System.EventHandler(this.업무일지ToolStripMenuItem_Click);
//
// managementToolStripMenuItem
//
@@ -581,7 +563,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(1002, 569);
this.tabControl1.Size = new System.Drawing.Size(1009, 569);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -594,7 +576,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(10);
this.tabPage1.Size = new System.Drawing.Size(994, 536);
this.tabPage1.Size = new System.Drawing.Size(1001, 536);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "요약";
//
@@ -604,7 +586,7 @@
// toolStripContainer1.ContentPanel
//
this.toolStripContainer1.ContentPanel.Controls.Add(this.tabControl1);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1002, 569);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 569);
this.toolStripContainer1.ContentPanel.Load += new System.EventHandler(this.toolStripContainer1_ContentPanel_Load);
this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
//
@@ -666,8 +648,6 @@
private System.Windows.Forms.ToolStripMenuItem btLog;
private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStrip toolStrip;
private System.Windows.Forms.ToolStripMenuItem projectToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem listToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem commonToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem itemsToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel sbLogin;
@@ -700,7 +680,6 @@
private System.Windows.Forms.ToolStripMenuItem aDSUserListToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripMenuItem workReportToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
@@ -714,6 +693,7 @@
private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem projectImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 프로젝트ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 업무일지ToolStripMenuItem;
}
}

19
Project/fMain.cs
View File

@@ -187,6 +187,13 @@ namespace Project
AddForm(formkey, new FPJ0000.fJobReport());
}
void menu_dayhistory()
{
string formkey = "DAYHISTORY";
if (!ShowForm(formkey))
AddForm(formkey, new FPJ0000.fProjectList());
}
void menu_projecT_list()
{
string formkey = "PROJECTS";
@@ -411,7 +418,7 @@ namespace Project
private void workReportToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_work_report();
}
private void toolStripButton4_Click(object sender, EventArgs e)
@@ -513,5 +520,15 @@ namespace Project
menu_projecT_list();
}
private void 업무일지ToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_work_report();
}
private void todoListToolStripMenuItem_Click(object sender, EventArgs e)
{
}
}
}

8
Project/fMain.resx
View File

@@ -143,14 +143,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/vc15/+rr/f5t6C389/Vc6//9
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/nfV5/+rr/f6t6Sz89/Vc6//9
U1J/zq71OLoqNJQZqg0B4hu7PresnfV/1sml//v2z/rfvHXC//I1rf/TF1b+j59T/j9vcfX/hlW1/2vn
FvwqmphyLG52eQxUKwSktXReqZ0//f+uB3sx8Pa7u/+vurLx/9zTy/5PODj3f/jGnr8x8yreQrVCQFJz
FvwqmphyLG52eQxUKwSktXReqZ0//f+uB3sx8Pa7u/+vurLx/9zTy/5PODj3f/DGnr8x8yreQrVCQFJz
8+L43v7fME09+2ZipUF4zqll/5MXVF2AaoWApNbW1PT6+j8wRXFzyrDSIAxyRfy88tVQrRCQ0tEhk1bV
93/7vd0EDajfPvlH3JzSFqhWBHAI6/278Pg6sCJ8Xihe0/4xdk5ZKlQbAiTWd7/rWjcfrhAb3nRr+//o
93/7vd0EDajfPvlH3JzSFqhWBLAP6v278Pg6sCJ8Xihe0/4xdk5ZKlQbAiTWd7/rWjcfrhAb3nRr+//o
eZU/EmZWmEK1IUBSc8cp+66Wv0n9+d9hOHp+xY/o+ZVwnDgl62fygpp+qBZUkFbRl5Fa2bcVyiUdpJb1
6qaVt79Pqeo3gAqRDjJqJx7OqK7/l1kz6X9aZT8KzqiZ+D8+fuLvnLop2L0AAtFV9T/mrDv0Pz2//ztU
CA7wycFBJtD0+PgJv7NrJ/dAheAAVY6BAQA1fKFNPzDvFQAAAABJRU5ErkJggg==
CA7wycFBJtD0+PgJv7NrJ/dAheAAVY6BAQDpyqE0YUO1uQAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">