휴가 승인자 정보 추적

This commit is contained in:
chi
2024-05-08 14:53:55 +09:00
parent 7eb2dbd2cd
commit e4f8981491
201 changed files with 1355 additions and 3219 deletions

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -10,13 +11,17 @@ using System.Windows.Forms;
namespace Project.Dev
{
public partial class fDisableItem : Form
public partial class fDisableItem : fBase
{
public fDisableItem()
{
InitializeComponent();
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
private void button1_Click(object sender, EventArgs e)
{

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -10,13 +11,18 @@ using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fDashboard : Form
public partial class fDashboard : fBase
{
public fDashboard()
{
InitializeComponent();
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
private void label1_Click(object sender, EventArgs e)
{

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fDebug : Form
public partial class fDebug : fBase
{
public fDebug()
{
@@ -17,7 +18,11 @@ namespace Project.Dialog
this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); };
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
private void button1_Click(object sender, EventArgs e)
{
Pub.barcode.RaiseRecvData("RECV BCD");

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project
{
public partial class fErrorException : Form
public partial class fErrorException : fBase
{
public fErrorException(string err)
{
@@ -28,7 +29,7 @@ namespace Project
private void fErrorException_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
private void button2_Click(object sender, EventArgs e)

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -11,7 +12,7 @@ using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fLogin : Form
public partial class fLogin : fBase
{
public fLogin()
{
@@ -27,6 +28,7 @@ namespace Project.Dialog
}
private void fLogin_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
var list = Pub.setting.lastid.Split(';');
foreach (var item in list)
if (item != "") tbID.Items.Add(item);

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -10,7 +11,7 @@ using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fMsgWindow : Form
public partial class fMsgWindow : fBase
{
private Boolean fMove = false;
private Point MDownPos;
@@ -48,7 +49,7 @@ namespace Project.Dialog
private void fMsg_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
public void SetText(string m)

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fPassword : Form
public partial class fPassword : fBase
{
public fPassword()
{
@@ -20,6 +21,11 @@ namespace Project.Dialog
if (e1.KeyCode == Keys.Escape) this.Close();
};
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
private void button1_Click(object sender, EventArgs e)
{

View File

@@ -23,7 +23,7 @@ namespace Project.Dialog
private void fSelectDept_Load(object sender, EventArgs e)
{
// TODO: 이 코드는 데이터를 'dsMSSQL.UserGroup' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다.
EnsureVisibleAndUsableSize();
this.ta.Fill(this.dsMSSQL.UserGroup);
var ta = new dsMSSQLTableAdapters.UserGroupTableAdapter();

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fTouchKeyFull : Form
public partial class fTouchKeyFull : fBase
{
public fTouchKeyFull(string title,string value)
{
@@ -28,6 +29,7 @@ namespace Project.Dialog
private void fTouchKeyFull_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();
this.tbInput.SelectAll();

View File

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

View File

@@ -25,6 +25,7 @@ namespace Project._Common
private void fADSUserList_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.lbDomain.Text = this.DomainName();
this.btInsert.Visible = (FCOMMON.info.Login.level > 9);
this.tbEntry.Text = "LDAP://OU=Office,OU=Users,OU=People,OU=K4,DC=kr,DC=ds,DC=amkor,DC=com";

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project._Common
{
public partial class fAddNewUser : Form // FCOMMON.fBase
public partial class fAddNewUser : fBase // FCOMMON.fBase
{
string p_dept = string.Empty;
string p_id = string.Empty;
@@ -74,6 +75,7 @@ namespace Project._Common
private void fUserInfo_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account));
if (this.deflevel < 1)

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project._Common
{
public partial class fNewID : Form
public partial class fNewID : fBase
{
public fNewID(string userid)
{
@@ -19,7 +20,7 @@ namespace Project._Common
private void fNewPassword_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
private void button1_Click(object sender, EventArgs e)

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project._Common
{
public partial class fNewPassword : Form
public partial class fNewPassword : fBase
{
public string newpassword { get; set; }
public fNewPassword(string userid)
@@ -20,6 +21,7 @@ namespace Project._Common
private void fNewPassword_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account));
if (curLevel >= 5)

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project._Common
{
public partial class fUserInfo : Form // FCOMMON.fBase
public partial class fUserInfo : fBase
{
public fUserInfo()
{
@@ -20,7 +21,7 @@ namespace Project._Common
private void fUserInfo_Load(object sender, EventArgs e)
{
//
EnsureVisibleAndUsableSize();
this.ta.FillID(this.dsMSSQL.Users,FCOMMON.info.Login.no);
dr = this.dsMSSQL.Users.Rows[0] as dsMSSQL.UsersRow;
tbKJPath.Text = FCOMMON.DBM.getPathKJ(FCOMMON.info.Login.dept);

View File

@@ -71,6 +71,7 @@ namespace Project._Common
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
var form = this as Form;
Pub.SetFormStatus(ref form, this.Name, true);
this.Show();

View File

@@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace Project._Info
{
public partial class fInfo_Staff : Form
public partial class fInfo_Staff : FCOMMON.fBase
{
public fInfo_Staff()
{
@@ -24,6 +24,7 @@ namespace Project._Info
private void fInfo_Staff_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
var Item = this.grid1.Items;
Item.Clear();
Item.Add(new StaffLayoutCtl.grid.CItem(r: 1, c: 1, rs: 2, cs: 2, text: "김치균", bg: Color.White.ToArgb()));

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project._Management
{
public partial class fLineCode : Form
public partial class fLineCode : fBase
{
public fLineCode()
{
@@ -22,17 +23,9 @@ namespace Project._Management
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, false);
}
private void lineCodeBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
this.Validate();
this.bs.EndEdit();
this.tam.UpdateAll(this.dsMSSQL);
}
private void fLineCode_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, true);
this.Show();
@@ -45,6 +38,15 @@ namespace Project._Management
}
private void lineCodeBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
this.Validate();
this.bs.EndEdit();
this.tam.UpdateAll(this.dsMSSQL);
}
void LineCode_TableNewRow(object sender, DataTableNewRowEventArgs e)
{

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project
{
public partial class fLog : Form
public partial class fLog : fBase
{
public fLog()
{
@@ -29,7 +30,7 @@ namespace Project
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}

View File

@@ -82,12 +82,6 @@
this.mn_jago = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pMP현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_eq = new System.Windows.Forms.ToolStripMenuItem();
this.aLLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -137,9 +131,7 @@
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.accessDBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -384,7 +376,6 @@
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.mn_jago,
this.mn_eq,
this.ToolStripMenuItem,
this.personalInventoryToolStripMenuItem});
this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image")));
@@ -568,8 +559,7 @@
//
this.mn_jago.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.pMP현황ToolStripMenuItem});
this.ToolStripMenuItem});
this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image")));
this.mn_jago.Name = "mn_jago";
this.mn_jago.Size = new System.Drawing.Size(203, 24);
@@ -589,57 +579,6 @@
this.ToolStripMenuItem.Text = "재고 현황";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// pMP현황ToolStripMenuItem
//
this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem";
this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.pMP현황ToolStripMenuItem.Text = "PMP 현황";
this.pMP현황ToolStripMenuItem.Visible = false;
this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click);
//
// mn_eq
//
this.mn_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.aLLToolStripMenuItem,
this.toolStripMenuItem2,
this.ToolStripMenuItem,
this.ToolStripMenuItem});
this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
this.mn_eq.Name = "mn_eq";
this.mn_eq.Size = new System.Drawing.Size(203, 24);
this.mn_eq.Text = "장비 목록";
//
// aLLToolStripMenuItem
//
this.aLLToolStripMenuItem.Enabled = false;
this.aLLToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.aLLToolStripMenuItem.Name = "aLLToolStripMenuItem";
this.aLLToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
this.aLLToolStripMenuItem.Text = "데이터 및 레포트";
this.aLLToolStripMenuItem.Click += new System.EventHandler(this.aLLToolStripMenuItem_Click);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(230, 6);
//
// 라인코드관리ToolStripMenuItem
//
this.ToolStripMenuItem.Enabled = false;
this.ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
this.ToolStripMenuItem.Text = "라인코드관리";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 프로그램사용관련알림ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "프로그램사용관련알림ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
this.ToolStripMenuItem.Text = "프로그램 사용 관련 알림";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 휴가관리ToolStripMenuItem
//
this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -663,7 +602,6 @@
this.ToolStripMenuItem.Name = "휴가관리ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
this.ToolStripMenuItem.Text = "근태관리";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 휴일연장근무승인ToolStripMenuItem
//
@@ -799,39 +737,39 @@
// 메모장ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "메모장ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 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);
this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6);
//
// 패치내역ToolStripMenuItem1
//
this.ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(149, 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(149, 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(146, 6);
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(149, 24);
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);
@@ -840,7 +778,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(180, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Visible = false;
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -849,7 +787,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(180, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
this.freeBoardToolStripMenuItem.Visible = false;
//
@@ -857,7 +795,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(180, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
this.bugReportToolStripMenuItem.Visible = false;
//
@@ -865,7 +803,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(180, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
this.todoListToolStripMenuItem.Visible = false;
this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -874,7 +812,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(180, 24);
this.ToolStripMenuItem.Text = "메일전송";
this.ToolStripMenuItem.Visible = false;
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
@@ -927,9 +865,7 @@
this.ToolStripMenuItem1,
this.toolStripMenuItem1,
this.ToolStripMenuItem,
this.pMP데이터베이스업데이트ToolStripMenuItem,
this.mailBackupToolStripMenuItem,
this.accessDBToolStripMenuItem,
this.ToolStripMenuItem,
this.toolStripMenuItem5,
this.ToolStripMenuItem,
@@ -1051,15 +987,6 @@
this.ToolStripMenuItem.Text = "구매내역 suuply 다시 설정 하기";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// pMP데이터베이스업데이트ToolStripMenuItem
//
this.pMP데이터베이스업데이트ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.pMP데이터베이스업데이트ToolStripMenuItem.Name = "pMP데이터베이스업데이트ToolStripMenuItem";
this.pMP데이터베이스업데이트ToolStripMenuItem.Size = new System.Drawing.Size(302, 24);
this.pMP데이터베이스업데이트ToolStripMenuItem.Text = "PMP 데이터베이스 업데이트";
this.pMP데이터베이스업데이트ToolStripMenuItem.Visible = false;
this.pMP데이터베이스업데이트ToolStripMenuItem.Click += new System.EventHandler(this.pMP데이터베이스업데이트ToolStripMenuItem_Click);
//
// mailBackupToolStripMenuItem
//
this.mailBackupToolStripMenuItem.Name = "mailBackupToolStripMenuItem";
@@ -1067,13 +994,6 @@
this.mailBackupToolStripMenuItem.Text = "Mail Backup";
this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click);
//
// accessDBToolStripMenuItem
//
this.accessDBToolStripMenuItem.Name = "accessDBToolStripMenuItem";
this.accessDBToolStripMenuItem.Size = new System.Drawing.Size(302, 24);
this.accessDBToolStripMenuItem.Text = "Access DB";
this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click);
//
// 메일자동발신테스트ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "메일자동발신테스트ToolStripMenuItem";
@@ -1151,7 +1071,6 @@
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// toolStrip1
//
@@ -1224,7 +1143,6 @@
this.toolStripButton1.Text = "구매진행상황";
this.toolStripButton1.ToolTipText = "구매진행상황";
this.toolStripButton1.Visible = false;
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2);
//
// toolStripButton2
//
@@ -1258,11 +1176,9 @@
this.Controls.Add(this.statusStrip1);
this.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
this.MainMenuStrip = this.menuStrip1;
this.Name = "fMain";
this.Padding = new System.Windows.Forms.Padding(1, 1, 1, 3);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = " ";
this.Load += new System.EventHandler(this.@__Load);
this.cmTab.ResumeLayout(false);
@@ -1298,7 +1214,6 @@
private System.Windows.Forms.ToolStripMenuItem bugReportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem todoListToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem managementToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mn_eq;
private System.Windows.Forms.ToolStripMenuItem personalInventoryToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem userInfoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem minutesToolStripMenuItem;
@@ -1312,8 +1227,6 @@
private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem projectImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mn_project;
@@ -1338,8 +1251,6 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
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;
@@ -1360,8 +1271,6 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem accessDBToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem aLLToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem layoutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
@@ -1387,7 +1296,6 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem12;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cR구매ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem sPR구매ToolStripMenuItem;

View File

@@ -14,7 +14,7 @@ using FBS0000;
namespace Project
{
public partial class fMain : Form
public partial class fMain : fBase
{
string SearchKey = string.Empty;
ServiceHost host;
@@ -109,6 +109,7 @@ namespace Project
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Text = Application.ProductName + " v" + Application.ProductVersion;
Pub.init();
@@ -212,7 +213,7 @@ namespace Project
this.mn_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
this.mn_dailyhistory.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history);
this.mn_jago.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago);
this.mn_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
//this.mn_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
this.mn_kuntae.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
this.mn_docu.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_docu);
//this.mn_logdata.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
@@ -932,13 +933,6 @@ namespace Project
{
}
private void pMP현황ToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "PMPDB";
if (!ShowForm(formkey))
AddForm(formkey, new FPM0000.fSPMaster());
}
private void mailBackupToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -968,17 +962,7 @@ namespace Project
menu_work_report();
}
private void toolStripButton4_Click_1(object sender, EventArgs e)
{
string formkey = "PMPDB";
if (!ShowForm(formkey))
AddForm(formkey, new FPM0000.fSPMaster());
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -1002,10 +986,7 @@ namespace Project
menu_projecT_list();
}
private void toolStripButton1_Click_2(object sender, EventArgs e)
{
// menu_projectPartStatus_list();
}
private void toolStripButton2_Click_1(object sender, EventArgs e)
{
@@ -1041,18 +1022,6 @@ namespace Project
//f.Show();
}
private void accessDBToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void aLLToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "EQALL";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.ALL), "ALL");
}
private void layoutToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -1088,10 +1057,6 @@ namespace Project
AddForm(formkey, new FED0000.fLicenseList());
}
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{

View File

@@ -252,17 +252,6 @@
8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW
GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R
v3gHemD5QK4HtBMSEyRplOTBgAA7
</value>
</data>
<data name="mn_eq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIUkAHBwcMXFxaioqJqamtHR0XNzc6SkpJeXl6CgoNXV1ZiYmHd3d8fHx6Kioo2NjZub
m6GhoX9/f4qKipSUlKenp5CQkJOTk6Ojo3t7e6WlpZ2dnX19fZ+fn4SEhHJycn5+foWFhZ6entra2v//
/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAkACwAAAAAEAAQ
AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v
LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL
hQnTql2rNiAAOw==
</value>
</data>
<data name="휴가관리ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -468,14 +457,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
/U7m/E+5XP8/92TF/3lzYj/UTMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
/U7m/E+5XP8/92TF/3lzYj/UTMj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
/4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3t9r/vV7o9blnWyHc
gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr
2d+jAdUG1LhtIjtQcP7VafX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
BQB1R6qRWIAd8wAAAABJRU5ErkJggg==
2d+jAdUG1LhtIjtQcP6VqfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
BQBvTaqMgm6frAAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace Project
{
public partial class fSetting : Form
public partial class fSetting : fBase
{
@@ -33,6 +34,7 @@ namespace Project
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.propertyGrid1.SelectedObject = Pub.setting;
this.propertyGrid1.Refresh();

File diff suppressed because one or more lines are too long

View File

@@ -28,9 +28,10 @@ namespace FBS0000
//this.dv1.CellFormatting += dv1_CellFormatting;
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
if (curLevel >= 5)

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -10,7 +11,7 @@ using System.Windows.Forms;
namespace FBS0000.Holiday
{
public partial class fErrorChk : Form
public partial class fErrorChk : fBase
{
public fErrorChk()
{
@@ -23,41 +24,10 @@ namespace FBS0000.Holiday
private void fErrorChk_Load(object sender, EventArgs e)
{
//기본 이번달 설정한다
EnsureVisibleAndUsableSize();
button2.PerformClick();
}
//void dtSD_KeyDown(object sender, KeyEventArgs e)
//{
// if (e.KeyCode != Keys.Enter) return;
// var tb = sender as TextBox;
// var input = tb.Text.Trim();
// if (input == "") tb.Text = DateTime.Now.ToShortDateString();
// else
// {
// string dt = string.Empty;
// if (!FCOMMON.Util.MakeDateString(input, out dt))
// {
// FCOMMON.Util.MsgE("입력값이 올바르지 않습니다.");
// tb.SelectAll();
// tb.Focus();
// return;
// }
// else
// {
// tb.Text = dt;
// }
// }
// if (tb == dtSD)
// {
// dtED.Focus();
// dtED.SelectAll();
// }
// else
// {
// // btSearch.PerformClick();
// tb.SelectAll();
// }
//}
private void listView1_SelectedIndexChanged(object sender, EventArgs e)
{

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FBS0000
{
public partial class fHolyDayData : Form
public partial class fHolyDayData : fBase
{
bool binit = false;
public fHolyDayData(string sdate, string uid)
@@ -37,10 +38,13 @@ namespace FBS0000
private void rJobReport_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
binit = true;
}
string GetUIDValue()
{
string uid = "%";

View File

@@ -37,10 +37,29 @@ namespace FBS0000
private void rJobReport_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
binit = true;
}
private void EnsureVisibleAndUsableSize()
{
var visibleBounds = Screen.GetWorkingArea(this);
var isOutOfView = (Left > visibleBounds.Right) || (Top > visibleBounds.Bottom) ||
(Right < visibleBounds.Left) || (Bottom < visibleBounds.Top);
if (isOutOfView)
{
CenterToScreen();
}
var minW = Math.Max(320, this.MinimumSize.Width);
var minH = Math.Max(240, this.MinimumSize.Height);
if (Width < minW || Height < minH)
{
this.Size = new Size(minW, minH);
}
}
//string GetUIDValue()
//{
// string uid = "%";

View File

@@ -33,8 +33,10 @@ namespace FBS0000
//else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black;
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
//엔터키누르면 아래로 이동하게함ㄷ
FarPoint.Win.Spread.InputMap im = this.fpSpread1.GetInputMap(FarPoint.Win.Spread.InputMapMode.WhenFocused);

View File

@@ -26,7 +26,7 @@ namespace FBS0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//udpate user list
var userList = FCOMMON.DBM.getUserList();
this.cmbUser.Items.Clear();

View File

@@ -56,9 +56,9 @@ namespace FBS0000
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
cmbUser.SelectedValue = dr.uid;// FCOMMON.info.Login.no;// .Text = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
dateTimePicker1.Value = dr.sdate;
dateTimePicker2.Value = dr.edate;

View File

@@ -20,7 +20,7 @@ namespace FBS0000.Holiday
private void fImpKunTae_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
private void button2_Click(object sender, EventArgs e)

View File

@@ -36,6 +36,7 @@ namespace FBS0000
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
UpdateGrpList();
if (cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0;
//일반사용자의경우에는 상태를 변경하지 못한다.

View File

@@ -33,8 +33,10 @@ namespace FBS0000
//else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black;
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
//엔터키누르면 아래로 이동하게함ㄷ
FarPoint.Win.Spread.InputMap im = this.fpSpread1.GetInputMap(FarPoint.Win.Spread.InputMapMode.WhenFocused);

View File

@@ -2,6 +2,7 @@
using FarPoint.Excel.EntityClassLibrary.DrawingVML;
using FarPoint.Win.Spread;
using FarPoint.Win.Spread.CellType.BarCode;
using FCOMMON;
using NetOffice.Extensions.Invoker;
using System;
using System.Collections.Generic;
@@ -14,7 +15,7 @@ using System.Windows.Forms;
namespace FBS0000
{
public partial class rHolidaySummary : Form
public partial class rHolidaySummary : fBase
{
public rHolidaySummary()
{
@@ -25,17 +26,7 @@ namespace FBS0000
private void rJobReport_Load(object sender, EventArgs e)
{
// TODO: 이 코드는 데이터를 'dsReport.holydata' 테이블에 로드합니다. 필요 시 이 코드를 이동하거나 제거할 수 있습니다.
//this.ta.Fill(this.dsReport.holydata);
//this.tbProcess.Items.Clear();
//tbProcess.Items.Add("전체");
//var taProcess = new dsReportTableAdapters.holydataTableAdapter();
//var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
//foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
// tbProcess.Items.Add(dr.processs);
//this.tbProcess.Text = FCOMMON.info.Login.process;
//if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
EnsureVisibleAndUsableSize();
this.tbMon.Text = DateTime.Now.ToShortDateString();
@@ -310,22 +301,54 @@ namespace FBS0000
for (int i = 0; i < fpSpread1_Sheet1.RowCount; i++)
fpSpread1_Sheet1.Cells[i, 0].BackColor = Color.White;
for (int i = 4; i <= grpend2; i++)
{
var colname = fpSpread1_Sheet1.Columns[i - 1].Label;
var cellf = fpSpread1_Sheet1.Cells.Get(row, i - 1).CellType;
if (colname.Contains("%") == false)
if (colname.Contains("%") == false) //일반 컬럼은 합계를 ㅏㅎㄴ다
{
fpSpread1_Sheet1.SetFormula(row, i - 1, $"SUM(R1C{i}:R{row}C{i})");
}
else
{
fpSpread1_Sheet1.SetFormula(row, i - 1, $"AVERAGE(R1C{i}:R{row}C{i})");
var startindex = colname.StartsWith("소진율") ? 2 : 3;
//이월
var o이월 = fpSpread1_Sheet1.Cells[row, i - (startindex + 4)].Value;
//발생
var o발생 = fpSpread1_Sheet1.Cells[row, i - (startindex + 3)].Value;
//사용
var o사용 = fpSpread1_Sheet1.Cells[row, i - (startindex + 2)].Value;
//잔여
var o잔여 = fpSpread1_Sheet1.Cells[row, i - (startindex + 1)].Value;
//초과
var o초과 = fpSpread1_Sheet1.Cells[row, i - (startindex + 0)].Value;
float , , , , ;
= o이월 != null ? float.Parse(o이월.ToString()) : 0;
= o발생 != null ? float.Parse(o발생.ToString()) : 0;
= o사용 != null ? float.Parse(o사용.ToString()) : 0;
= o잔여 != null ? float.Parse(o잔여.ToString()) : 0;
= o초과 != null ? float.Parse(o초과.ToString()) : 0;
var = 0f;
if (( + ) != 0) = ( / ( + )) * 100f;
var 2 = 0f;
if ( != 0) 2 = (( - ) / ) * 100f;
if (colname.StartsWith("소진율"))
{
fpSpread1_Sheet1.SetValue(row, i - 1, );//.SetFormula(row, i - 1, $"AVERAGE(R1C{i}:R{row}C{i})");
fpSpread1_Sheet1.Cells[row, i - 1].CellType = numcell1;
}
else
{
fpSpread1_Sheet1.SetValue(row, i - 1, 2);// fpSpread1_Sheet1.SetFormula(row, i - 1, $"AVERAGE(R1C{i}:R{row}C{i})");
fpSpread1_Sheet1.Cells[row, i - 1].CellType = numcell1;
}
//var 발생 = (double)fpSpread1_Sheet1.GetValue(row, i - 1 - 4);
//var 사용 = (double)fpSpread1_Sheet1.GetValue(row, i - 1 - 3);
//var 사용률 = 0.0;

View File

@@ -75,7 +75,6 @@
this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.arDatagridView1.Size = new System.Drawing.Size(313, 496);
this.arDatagridView1.TabIndex = 0;
this.arDatagridView1.DoubleClick += new System.EventHandler(this.arDatagridView1_DoubleClick);
this.arDatagridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.arDatagridView1_KeyDown);
//
// bs

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FBS0000
{
public partial class fLovWorkUser : Form
public partial class fLovWorkUser : fBase
{
public dsMSSQL.EETGW_WorkTableUserRow dr = null;
public fLovWorkUser(List<dsMSSQL.EETGW_WorkTableUserRow> users)
@@ -22,16 +23,12 @@ namespace FBS0000
private void fLovWorkUser_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();
this.arDatagridView1.AutoResizeColumns();
}
private void arDatagridView1_DoubleClick(object sender, EventArgs e)
{
}
private void arDatagridView1_KeyDown(object sender, KeyEventArgs e)
{
if(e.KeyCode == Keys.Enter)

View File

@@ -30,11 +30,13 @@ namespace FBS0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();
refreshData();
}
void refreshData()
{
//refresh data

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FBS0000
{
public partial class fMinutesDetail : Form
public partial class fMinutesDetail : fBase
{
int idx = -1;
public fMinutesDetail(int idx_)
@@ -27,13 +28,13 @@ namespace FBS0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();
//refresh Data
this.ta.FillByIDX(this.dsMSSQL.minutes,this.idx);
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
var f = new FCM0000.fLovProject("");

File diff suppressed because one or more lines are too long

View File

@@ -32,6 +32,7 @@ namespace FCM0000
private void fRequestItem_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
if (FCOMMON.info.Login.level >= 9 || FCOMMON.info.Login.no == "395552")
{
bn.Enabled = true;
@@ -54,11 +55,6 @@ namespace FCM0000
}
private void fillToolStripButton_Click(object sender, EventArgs e)
{
}
void refreshData()
{

View File

@@ -31,6 +31,7 @@ namespace FCM0000
private void fRequestItem_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.dtSD.Text = DateTime.Now.AddDays(-15).ToShortDateString();
this.dtED.Text = DateTime.Now.ToShortDateString();
refreshData();
@@ -41,14 +42,8 @@ namespace FCM0000
this.Validate();
this.bs.EndEdit();
this.tam.UpdateAll(this.dsMSSQL);
}
private void fillToolStripButton_Click(object sender, EventArgs e)
{
}
void refreshData()
{

View File

@@ -23,6 +23,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//프로젝트 리스트를 가져와서 cmb에 연결해준다.
var projectDT = FCOMMON.DBM.getProjectData();
this.cmProject.DataSource = projectDT;
@@ -58,6 +59,7 @@ namespace FCM0000
}
}
private void requestItemBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
this.Validate();

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class Customer_Import : Form
public partial class Customer_Import : fBase
{
DataTable dt = new dsMSSQL.CustomsDataTable();
DataTable dtExcel = new DataTable();
@@ -22,6 +23,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.sd.Value = DateTime.Now.AddMonths(-1);
this.ed.Value = DateTime.Now;
}

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -10,11 +11,18 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class Form2 : Form
public partial class Form2 : fBase
{
public Form2()
{
InitializeComponent();
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
}
}

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000.Inventory
{
public partial class RepInvStock : Form
public partial class RepInvStock : fBase
{
public RepInvStock()
{
@@ -17,8 +18,10 @@ namespace FCM0000.Inventory
Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
}
private void RepInvStock_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();

View File

@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fInventory : Form
public partial class fInventory : fBase
{
string fn_fpcolsize = "";
public fInventory()
@@ -65,8 +65,10 @@ namespace FCM0000
cmbPlace.Items.Add(item);
cmbPlace.SelectedIndex = 0;
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, true);
this.Show();

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fInventoryJagoList : Form
public partial class fInventoryJagoList : fBase
{
string fn_fpcolsize = "";
public fInventoryJagoList()
@@ -53,6 +54,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, true);
this.Show();

View File

@@ -24,6 +24,7 @@ namespace FCM0000.Inventory
private void fInventoryJagoPlace_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();
button1.PerformClick();

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fInventoryUser : Form
public partial class fInventoryUser : fBase
{
public fInventoryUser()
{
@@ -63,7 +64,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
// TODO: 이 코드는 데이터를 'dsMSSQL.InventoryUser' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다.
EnsureVisibleAndUsableSize();
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, true);
this.Show();

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class finventoryAdd : Form
public partial class finventoryAdd : fBase
{
BindingSource bsManu;
BindingSource bsModel;
@@ -42,6 +43,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//담당자목록
var userList = FCOMMON.DBM.getUserList();//.getGroupList("name", "Users", "[level] > 0 and [level] < 10");
foreach (var user in userList)

View File

@@ -380,7 +380,6 @@
this.MinimumSize = new System.Drawing.Size(685, 448);
this.Name = "fItemAdd";
this.Text = "품목 추가";
this.Load += new System.EventHandler(this.fItemAdd_Load);
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

View File

@@ -1,4 +1,5 @@
using FCOMMON;
using FarPoint.Excel.EntityClassLibrary.SpreadsheetML;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -43,14 +44,10 @@ namespace FCM0000.Item
}
}
private void fItemAdd_Load(object sender, EventArgs e)
protected override void OnLoad(EventArgs e)
{
if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
{
this.Location = new Point(0, 0);
}
this.Show();
base.OnLoad(e);
EnsureVisibleAndUsableSize();
//Application.DoEvents();
if (tbSid.Text.isEmpty()) tbSid.Focus();
@@ -77,7 +74,8 @@ namespace FCM0000.Item
else
{
//이떄는 sid가 정상이어야 한다.
if (tbSid.Text.StartsWith("10") == false || tbSid.TextLength != 9)
var siddata = tbSid.Text.Split('-')[0].Trim();
if (siddata.StartsWith("10") == false || siddata.Length != 9)
{
Util.MsgE("SID는 9자리 숫자이며 10으로 시작 합니다\n입력값을 확인 하세요");
tbSid.Focus();
@@ -87,11 +85,14 @@ namespace FCM0000.Item
if (ta.ExistSID(FCOMMON.info.Login.gcode, tbSid.Text) > 0)
{
Util.MsgE("동일한 SID정보가 있습니다\n화면을 닫은 후 SID 검색세요");
this.Close();
var dlg = Util.MsgQ("동일한 SID정보가 있습니다\n강제입력을 진행할까요?\n입력값을 다시 확인하세요.\n품목정보에서 해당 SID정보를 검색해보세요");
if(dlg != DialogResult.Yes)
{
return;
}
}
}
var pumName = tbName.Text.Trim();
var pumModel = tbModel.Text.Trim();

View File

@@ -50,11 +50,8 @@ namespace FCM0000.Item
private void fItemAdd_Load(object sender, EventArgs e)
{
if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
{
this.Location = new Point(0, 0);
}
EnsureVisibleAndUsableSize();
tbSid.Text = dr.IssidNull() == false ? dr.sid : string.Empty;
tbName.Text = dr.IsnameNull() == false ? dr.name : string.Empty;

View File

@@ -28,9 +28,10 @@ namespace FCM0000
void fItems_FormClosed(object sender, FormClosedEventArgs e)
{
}
private void fItems_Load(object sender, EventArgs e)
{
//get catelist
EnsureVisibleAndUsableSize();
var cateList = FCOMMON.DBM.getGroupTable("cate", "Items", "isnull(cate,'') <> ''");
this.cmbCate.Items.Clear();
this.cmbCate.Items.Add("-- All --");

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fLovItem : Form
public partial class fLovItem : fBase
{
string fn_fpcolsize = "";
@@ -62,7 +63,7 @@ namespace FCM0000
private void fLovItem_Load(object sender, EventArgs e)
{
this.Show();
EnsureVisibleAndUsableSize();
Application.DoEvents();

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fLovOneItem : Form
public partial class fLovOneItem : fBase
{
public string Title { get; set; }
DataTable dt;
@@ -49,8 +50,10 @@ namespace FCM0000
};
}
private void fLovItem_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.bs.DataSource = this.dt;
this.bn.BindingSource = this.bs;
this.dv.DataSource = this.bs;

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000.Mail
{
public partial class fAutoSendSetting : Form
public partial class fAutoSendSetting : fBase
{
string fn_fpcolsize = "";
public fAutoSendSetting()
@@ -28,6 +29,7 @@ namespace FCM0000.Mail
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
}
private void refreshData()

View File

@@ -30,6 +30,7 @@ namespace FCM0000
private void fMailform_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
}

View File

@@ -21,10 +21,9 @@ namespace FCM0000
PredefinedButtonSets.SetupDefaultButtons(this.tbBody);
this.dr = dr_;
}
private void fMailform_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//시작일을 오늘로
this.dtSd.Value = DateTime.Now;

View File

@@ -10,10 +10,11 @@ using NetOffice;
using Outlook = NetOffice.OutlookApi;
using NetOffice.OutlookApi.Enums;
using NetOffice.OutlookApi;
using FCOMMON;
namespace FCM0000.Mail
{
public partial class fMailBackup : Form
public partial class fMailBackup : fBase
{
public fMailBackup()
{
@@ -23,6 +24,11 @@ namespace FCM0000.Mail
dateTimePicker1.Value = DateTime.Now.AddYears(-2);
dateTimePicker2.Value = DateTime.Now.AddYears(-1);
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
int cntp = 0;
// int cnte = 0;

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000.Mail
{
public partial class fMailList : Form
public partial class fMailList : fBase
{
string fn_fpcolsize = "";
public fMailList()
@@ -33,7 +34,7 @@ namespace FCM0000.Mail
}
private void __Load(object sender, EventArgs e)
{
//한달전으로 처리
EnsureVisibleAndUsableSize();
this.dtEd.Value = DateTime.Now;
this.dtSd.Value = DateTime.Now.AddDays(-10);
refreshData();

View File

@@ -32,6 +32,7 @@ namespace FCM0000
private void fMailform_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
}

View File

@@ -32,10 +32,12 @@ namespace FCM0000
private void fMailform_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.bs.AddNew();
LoadNRData();
}
void LoadNRData()
{
//자로에서 불러와서 그 값을 가져온다.

View File

@@ -51,6 +51,7 @@ namespace FCM0000
private void fLovItem_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Text = string.Format("사용자선택({0})",this.keyword);
this.Show();
Application.DoEvents();

View File

@@ -21,11 +21,12 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
this.dSUser.Auth.TableNewRow += Customs_TableNewRow;
}
void Customs_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fUserGroup : Form
public partial class fUserGroup : fBase
{
public fUserGroup()
{
@@ -19,6 +20,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
}

View File

@@ -21,7 +21,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
refreshData();
this.dSUser.UserGroup.TableNewRow += Customs_TableNewRow;
}

View File

@@ -21,6 +21,7 @@ namespace FCM0000
private void fUserGroupPermission_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
foreach(var ctl in this.Controls)
{
if(ctl.GetType() == typeof(CheckBox))

View File

@@ -38,8 +38,10 @@ namespace FCM0000
e.Row["grp"] = grp;
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
tbFind.Text = string.Empty;
if (this.defaultgubun.isEmpty() == false)
{

View File

@@ -23,7 +23,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
// TODO: 이 코드는 데이터를 'dsMSSQL.Staff' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다.
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fHolidaytable : Form
public partial class fHolidaytable : fBase
{
public string Title { get; set; }
// DataTable dt;
@@ -31,13 +32,10 @@ namespace FCM0000
private void fLovItem_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.textBox1.Text = DateTime.Now.ToString("yyyy-MM");
refreshData();
//if(dv.Columns.Count > 1)
// this.dv.Columns[1].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
//else
// this.dv.Columns[0].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
}
void refreshData()
{

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fLovProject : Form
public partial class fLovProject : fBase
{
public string Title { get; set; }
public int Index { get; set; }
@@ -39,7 +40,7 @@ namespace FCM0000
private void fLovItem_Load(object sender, EventArgs e)
{
//search data
EnsureVisibleAndUsableSize();
// var dt = this.ta.GetSearch(this.keyword);
var statekey = this.keyword2;

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fLovSupply : Form
public partial class fLovSupply : fBase
{
public string Title { get; set; }
public int Index { get; set; }
@@ -33,6 +34,7 @@ namespace FCM0000
private void fLovItem_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.ta.FillSearch(this.dsMSSQL.Customs, "%" + this.keyword + "%",FCOMMON.info.Login.gcode);
}

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fMaterial_Import : Form
public partial class fMaterial_Import : fBase
{
DataTable dt = new dsMSSQL.ItemsDataTable();// dsPurchase.PurchaseDataTable();
DataTable dtExcel = new DataTable();
@@ -22,8 +23,7 @@ namespace FCM0000
private void __Load(object sender, EventArgs e)
{
// TODO: 이 코드는 데이터를 'dsMSSQL.Items' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다.
//this.ta.Fill(this.dsMSSQL.Items);
EnsureVisibleAndUsableSize();
}

View File

@@ -12,7 +12,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fSIDListSelect : Form
public partial class fSIDListSelect : fBase
{
public string selectbatch = "";
public fSIDListSelect(string sid,DataTable dt)
@@ -49,9 +49,11 @@ namespace FCM0000
private void fSIDListSelect_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.dv1.AutoResizeColumns();
}
private void btopenspm_Click(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FCM0000
{
public partial class fSelectDate : Form
public partial class fSelectDate : fBase
{
private DateTime _dtSelect = DateTime.Now;
public DateTime dtSelect
@@ -34,7 +35,7 @@ namespace FCM0000
private void fSelectDate_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
private void btOK_Click(object sender, EventArgs e)

View File

@@ -4,6 +4,7 @@ using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.ServiceModel.Security;
using System.Text;
using System.Windows.Forms;
@@ -41,12 +42,28 @@ namespace FCOMMON
{
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, true);
}
if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
this.Location = new Point(0, 0);
EnsureVisibleAndUsableSize();
}
protected void EnsureVisibleAndUsableSize()
{
var visibleBounds = Screen.GetWorkingArea(this);
var isOutOfView = (Left > visibleBounds.Right) || (Top > visibleBounds.Bottom) ||
(Right < visibleBounds.Left) || (Bottom < visibleBounds.Top);
if (isOutOfView)
{
CenterToScreen();
}
var minW = Math.Max(320, this.MinimumSize.Width);
var minH = Math.Max(240, this.MinimumSize.Height);
if (Width < minW || Height < minH)
{
this.Size = new Size(minW, minH);
}
}
}
}

View File

@@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fFTPExplorer : Form
public partial class fFTPExplorer : fBase
{
string homePath = string.Empty;
string curPath = string.Empty;
@@ -74,6 +74,7 @@ namespace FCOMMON
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.tbpath.Text = this.curPath;// Pub.setting.ftp_path;
if (this.tbpath.Text == "") tbpath.Text = "/";
timer1.Start();
@@ -90,6 +91,7 @@ namespace FCOMMON
}
btQuery.PerformClick();
}
void listView1_DragOver(object sender, DragEventArgs e)
{
this.Cursor = Cursors.Hand;

View File

@@ -1,4 +1,5 @@
using System;
using FarPoint.Win.Spread.Model;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -10,7 +11,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fFileExplorer : Form
public partial class fFileExplorer : fBase
{
string p = string.Empty;
public fFileExplorer(string path_)
@@ -22,11 +23,12 @@ namespace FCOMMON
private void fFileExplorer_Load(object sender, EventArgs e)
{
this.Show();
EnsureVisibleAndUsableSize();
Application.DoEvents();
RefreshPath();
}
void RefreshPath()
{
if (System.IO.Directory.Exists(this.p) == false)

View File

@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fInputTextBox : Form
public partial class fInputTextBox : fBase
{
public fInputTextBox()
{
@@ -21,5 +21,12 @@ namespace FCOMMON
{
DialogResult = DialogResult.OK;
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
}
}

View File

@@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fLovDateList : Form
public partial class fLovDateList : fBase
{
public string selectedDate = string.Empty;
public fLovDateList(List<string> dateList)
@@ -24,8 +24,9 @@ namespace FCOMMON
}
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
void fLovDateList_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape) this.Close();

View File

@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fMagam : Form
public partial class fMagam : fBase
{
public fMagam()
{
@@ -19,7 +19,7 @@ namespace FCOMMON
private void fMagam_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
button2.Enabled = curLevel >= 5;

View File

@@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fProgress : Form
public partial class fProgress : fBase
{
public fProgress()
{
@@ -18,7 +18,7 @@ namespace FCOMMON
private void fProgress_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
private string _title = string.Empty;

View File

@@ -11,7 +11,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fSFI : Form
public partial class fSFI : fBase
{
public fSFI(string sfi_type, double time, double cnt, double shiftcount, int itemcnt)
{
@@ -102,6 +102,7 @@ namespace FCOMMON
private void fSFI_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
nudMSaveCnt.DecimalPlaces = 1;
}

View File

@@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fSelectDay : Form
public partial class fSelectDay : fBase
{
public fSelectDay(DateTime dt)
{
@@ -25,7 +25,7 @@ namespace FCOMMON
private void fSelectDay_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
}
}

View File

@@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fSelectDays : Form
public partial class fSelectDays : fBase
{
public fSelectDays(DateTime dt,DateTime dte)
{
@@ -29,7 +29,7 @@ namespace FCOMMON
private void fSelectDay_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
}
}
}

View File

@@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fSelectMonth : Form
public partial class fSelectMonth : fBase
{
public int selectmon { get; set; }
public fSelectMonth()
@@ -21,6 +21,7 @@ namespace FCOMMON
private void fSelectMonth_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
for(int i = 1 ; i <=12;i++)
{
Button newbt = new Button();

View File

@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace FCOMMON
{
public partial class fSelectProcess : Form
public partial class fSelectProcess : fBase
{
public List<string> values = new List<string>();
string[] curlist = new string[] { };
@@ -23,7 +23,7 @@ namespace FCOMMON
private void fSelectProcess_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//공정목록
cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");

View File

@@ -96,6 +96,7 @@ namespace FED0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
this.dtSD.Text = DateTime.Now.ToString("yyyy-01-01");

View File

@@ -59,7 +59,7 @@ namespace FED0000
{
EnsureVisibleAndUsableSize();
refreshData();
}

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FEQ0000
{
public partial class EQFilterApply : Form
public partial class EQFilterApply : fBase
{
//fEquipment.eTabletype divtype;
@@ -30,7 +31,7 @@ namespace FEQ0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
try
{
ta.Fill(this.dsEQ.EquipmentFilter, eqfiletertype, FCOMMON.info.Login.gcode);

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FEQ0000
{
public partial class EQfilterManager : Form
public partial class EQfilterManager : fBase
{
string divtype = string.Empty;
public EQfilterManager(string type_)
@@ -31,6 +32,7 @@ namespace FEQ0000
private void EQfilter_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
try
{
ta.Fill(this.dsEQ.EquipmentFilter, divtype, FCOMMON.info.Login.gcode);

View File

@@ -9,10 +9,11 @@ using System.Windows.Forms;
using System.CodeDom.Compiler;
using System.Reflection;
using Microsoft.CSharp;
using FCOMMON;
namespace FEQ0000
{
public partial class fEquipment : Form
public partial class fEquipment : fBase
{
public enum eTabletype
{
@@ -116,6 +117,7 @@ namespace FEQ0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.Text = string.Format("Equipment List({0})", this.dataType);
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, true);

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FEQ0000
{
public partial class fImpEquipment : Form
public partial class fImpEquipment : fBase
{
DataTable dt = null;
DataTable dtExcel = new DataTable();
@@ -26,6 +27,7 @@ namespace FEQ0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize ();
this.Text = string.Format("Data Import({0})", "ALL");
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, true);

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
namespace FEQ0000
{
public partial class rpt_equipmentAll : Form
public partial class rpt_equipmentAll : fBase
{
dsEQ.EETGW_EquipmentDataTable dt;
public rpt_equipmentAll(dsEQ.EETGW_EquipmentDataTable dt_,string title)
@@ -27,7 +28,7 @@ namespace FEQ0000
private void rpt_equipment_Load(object sender, EventArgs e)
{
//this.Text = string.Format("Data Report({0})", "ALL");
EnsureVisibleAndUsableSize();
this.Show();
Application.DoEvents();

View File

@@ -12,7 +12,7 @@ using System.Windows.Forms;
namespace FEQ0000.Purchase
{
public partial class fBatchUpdate : Form
public partial class fBatchUpdate : fBase
{
public fBatchUpdate(List<int> _rows)
{
@@ -25,6 +25,7 @@ namespace FEQ0000.Purchase
private void fBatchUpdate_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
var code_state = DBM.getCodeTable("04");
cmbState.DataSource = code_state;
cmbState.DisplayMember = "Value";

View File

@@ -161,8 +161,8 @@
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.label1 = new System.Windows.Forms.Label();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.label2 = new System.Windows.Forms.Label();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -276,6 +276,7 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -402,6 +403,7 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(100, 26);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -752,6 +754,7 @@
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(75, 37);
this.dtSD.Text = "1982-11-23";
@@ -768,6 +771,7 @@
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(75, 37);
this.dtED.Text = "1982-11-23";
@@ -824,6 +828,7 @@
// tbRequest
//
this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbRequest.Name = "tbRequest";
this.tbRequest.Size = new System.Drawing.Size(70, 37);
this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -838,6 +843,7 @@
// tbManager
//
this.tbManager.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbManager.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbManager.Name = "tbManager";
this.tbManager.Size = new System.Drawing.Size(70, 37);
this.tbManager.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -851,6 +857,7 @@
// tbAdmin
//
this.tbAdmin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbAdmin.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbAdmin.Name = "tbAdmin";
this.tbAdmin.Size = new System.Drawing.Size(70, 37);
this.tbAdmin.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -965,7 +972,18 @@
this.fpSpread1.TabIndex = 7;
this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff_1);
this.fpSpread1.ClipboardPasted += new FarPoint.Win.Spread.ClipboardPastedEventHandler(this.fpSpread1_ClipboardPasted);
this.fpSpread1.SetViewportLeftColumn(0, 0, 8);
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(0, 606);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1226, 23);
this.label2.TabIndex = 8;
this.label2.Text = "--";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fpSpread1_Sheet1
//
@@ -1075,6 +1093,7 @@
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "place";
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Tag = "place";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
@@ -1314,18 +1333,6 @@
this.fpSpread1_Sheet1.ShowRowSelector = true;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(0, 606);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1226, 23);
this.label2.TabIndex = 8;
this.label2.Text = "--";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fPurchaseCR
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1443,7 +1450,6 @@
private System.Windows.Forms.ToolStripLabel toolStripLabel7;
private System.Windows.Forms.ToolStripTextBox tbAdmin;
private System.Windows.Forms.ToolStripButton toolStripButton8;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
@@ -1452,5 +1458,6 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem6;
private System.Windows.Forms.ToolStripMenuItem btMakeItemsData;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
}
}

View File

@@ -104,6 +104,7 @@ namespace FEQ0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.cmDate.SelectedIndex = 0;
this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
this.cmbSort.SelectedIndex = 0;
@@ -289,6 +290,8 @@ namespace FEQ0000
var crcfindex = this.fpSpread1.ActiveSheet.Columns["crcf"].Index;
var prjindex = this.fpSpread1.ActiveSheet.Columns["projectidx"].Index;
var cstsindex = this.fpSpread1.ActiveSheet.Columns["conf_status"].Index;
var nameindex = this.fpSpread1.ActiveSheet.Columns["pumname"].Index; // pumname
var placeindex = this.fpSpread1.ActiveSheet.Columns["place"].Index; // pumname
for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
{
@@ -299,12 +302,17 @@ namespace FEQ0000
var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex);
var crcf = this.fpSpread1.ActiveSheet.GetValue(i, crcfindex);
var v_confstats = this.fpSpread1.ActiveSheet.GetValue(i, cstsindex);
var v_pumname = this.fpSpread1.ActiveSheet.GetValue(i, nameindex);
var v_place = this.fpSpread1.ActiveSheet.GetValue(i, placeindex);
var str_place = "";
var str_pumname = string.Empty;
var str_crcf = string.Empty;
var str_confstats = string.Empty;
if (crcf != null) str_crcf = crcf.ToString();
if (v_confstats != null) str_confstats = v_confstats.ToString();
if (v_pumname != null) str_pumname = v_pumname.ToString();
if (v_place != null) str_place = v_place.ToString().ToUpper();
if (value != null && (Boolean)value)
{
@@ -333,6 +341,9 @@ namespace FEQ0000
break;
case "---":
case "----":
if (str_place.Contains("SPR") || str_pumname.ToUpper().Contains("SPR"))
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Violet;
else
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue;
break;
case "received":

Some files were not shown because too many files have changed in this diff Show More