This commit is contained in:
chi
2021-12-21 09:52:32 +09:00
parent 4cf24cedaf
commit 7e6f9e4bcb
36 changed files with 5115 additions and 773 deletions

View File

@@ -51,7 +51,9 @@
this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel();
this.sbJan = new System.Windows.Forms.ToolStripLabel();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
this.tbSD = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.tbED = new System.Windows.Forms.ToolStripTextBox();
@@ -59,8 +61,6 @@
this.tbGrp = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
@@ -139,6 +139,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";
@@ -220,8 +221,20 @@
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(79, 24);
this.toolStripButton2.Text = "내보내기";
this.toolStripButton2.Visible = false;
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton3
//
this.toolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(79, 24);
this.toolStripButton3.Text = "메일전송";
this.toolStripButton3.Visible = false;
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
@@ -239,9 +252,19 @@
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
// lbStt
//
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbStt.ForeColor = System.Drawing.Color.Blue;
this.lbStt.Name = "lbStt";
this.lbStt.Size = new System.Drawing.Size(31, 28);
this.lbStt.Text = "기간";
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
//
// tbSD
//
this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSD.Name = "tbSD";
this.tbSD.Size = new System.Drawing.Size(100, 31);
this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -256,6 +279,7 @@
// tbED
//
this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbED.Name = "tbED";
this.tbED.Size = new System.Drawing.Size(100, 31);
this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -269,6 +293,7 @@
//
// tbGrp
//
this.tbGrp.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbGrp.Name = "tbGrp";
this.tbGrp.Size = new System.Drawing.Size(200, 31);
//
@@ -295,25 +320,6 @@
this.fpSpread1.SetViewportLeftColumn(0, 0, 4);
this.fpSpread1.SetActiveViewport(0, 0, -1);
//
// lbStt
//
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbStt.ForeColor = System.Drawing.Color.Blue;
this.lbStt.Name = "lbStt";
this.lbStt.Size = new System.Drawing.Size(31, 28);
this.lbStt.Text = "기간";
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
//
// toolStripButton3
//
this.toolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(79, 24);
this.toolStripButton3.Text = "메일전송";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -514,7 +520,7 @@
this.fpSpread1_Sheet1.Cells.Get(0, 47).Border = complexBorder1;
this.fpSpread1_Sheet1.Cells.Get(0, 48).Border = complexBorder1;
this.fpSpread1_Sheet1.Cells.Get(0, 49).Border = complexBorder1;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "번호";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "분류";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "사번";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "직급";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "성명";
@@ -526,10 +532,11 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "발생년차";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "사용휴가";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "잔여휴가";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(0).Border = complexBorder1;
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "번호";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "분류";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 69F;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));

View File

@@ -14,12 +14,16 @@ namespace FBS0000
{
public partial class WorkTable : FCOMMON.fBase
{
public WorkTable(string sd, string ed, string grp)
public WorkTable()
{
InitializeComponent();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
tbSD.Text = sd;
tbED.Text = ed;
tbGrp.Text = grp;
tbGrp.Text = string.Empty;
//this.dv1.CellFormatting += dv1_CellFormatting;
}
@@ -40,16 +44,14 @@ namespace FBS0000
RefreshData();
}
void RefreshData()
{
fpSpread1_Sheet1.Rows.Count = 0;
//열제목
var cols = new List<string>();
cols.AddRange(new string[] { "번호", "사번", "직급", "성명" });
cols.AddRange(new string[] { "분류", "사번", "직급", "성명" });
var sd = DateTime.Parse(tbSD.Text);
var ed = DateTime.Parse(tbED.Text);
@@ -57,7 +59,7 @@ namespace FBS0000
while (true)
{
var curDate = sd.AddDays(idx++);
cols.Add(curDate.Day.ToString("00"));
cols.Add(curDate.Day.ToString("00") + "\r\n" + curDate.DayOfWeek.ToString().Substring(0, 3));
if (curDate.ToShortDateString() == ed.ToShortDateString()) break;
}
cols.AddRange(new string[] { "발생", "사용", "잔여" });
@@ -71,24 +73,34 @@ namespace FBS0000
else if (c > cols.Count - 4) fpSpread1_Sheet1.Columns[c].BackColor = Color.WhiteSmoke;
else fpSpread1_Sheet1.Columns[c].BackColor = Color.White;
}
//fpSpread1_Sheet1.Cells[0, c].Value = cols[c];
//업무일지 데이터
var taJR = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();
var JobReport = taJR.GetData(FCOMMON.info.Login.gcode, tbSD.Text, tbED.Text);
var taHolyList = new dsMSSQLTableAdapters.HolidayLIstTableAdapter();
var HolyList = taHolyList.GetData(tbSD.Text, tbED.Text);
//해당 기간내의 사용
var taUser = new dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
var dtUser = taUser.GetData(FCOMMON.info.Login.gcode, tbGrp.Text);
//var taUser = new dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
var dtUser = JobReport.OrderBy(t => t.userProcess+ t.name).GroupBy(t => t.id);// taUser.GetData(FCOMMON.info.Login.gcode, tbGrp.Text);
var users = new List<userinfo>();
var seq = 0;
foreach (var item in dtUser)
{
if (string.IsNullOrEmpty(item.indate))
var dr = item.First();
if (string.IsNullOrEmpty(dr.indate) == false)
{
//입사일자를 체크해서. 이 날짜가 입사일 이전이면 넘어간다
}
users.Add(new userinfo { grade = item.grade, name = item.name, empno = item.empno, seq = item.seq.ToString() });
users.Add(new userinfo { grade = dr.grade, name = dr.name, empno = dr.id, seq = dr.userProcess, indate = dr.indate, outdate = dr.outdate });
seq += 1;
}
//휴가테이블에서 데이터를 가져온다
var taHoly = new dsMSSQLTableAdapters.HolydayTableAdapter();
var dtHoly = taHoly.GetByGrp(tbSD.Text, tbED.Text, FCOMMON.info.Login.gcode, this.tbGrp.Text);
var dtHoly = taHoly.GetByDate(FCOMMON.info.Login.gcode, tbSD.Text, tbED.Text);
var qta = new dsMSSQLTableAdapters.QueriesTableAdapter();
@@ -104,21 +116,53 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade;
fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name;
//이월잔액
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno,sd.ToString("yyyy-01-01"), sd.ToShortDateString(),"999999");
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.ToShortDateString(), "999999");
var used = 0.0;
fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
fpSpread1_Sheet1.Rows[rowindex].Border = new FarPoint.Win.LineBorder(Color.Gainsboro, 1,false, false,true, true);
fpSpread1_Sheet1.Rows[rowindex].Border = new FarPoint.Win.LineBorder(Color.Gainsboro, 1, false, false, true, true);
//각 일자별로 특이사항을 찾는다
int c = 0;
for (c = 4; c < cols.Count - 3; c++)
{
var curDate = sd.AddDays(c - 4);
var bholy = false;
//이날짜가 휴일인지 체크한다.
var drHoly = HolyList.Where(t => t.pdate == curDate.ToShortDateString()).FirstOrDefault();
if (drHoly != null && drHoly.free)
{
bholy = true;
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.LightPink;
if (drHoly.memo == "토요일" || drHoly.memo == "일요일")
{
fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
else
{
fpSpread1_Sheet1.Cells[rowindex, c].Note = drHoly.memo;
}
}
else
{
fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.FromArgb(240, 240, 240); ;
}
//입사일이면 메세지 추가
if (item.indate == curDate.ToShortDateString())
fpSpread1_Sheet1.Cells[rowindex, c].Note += "입사";
if (item.outdate == curDate.ToShortDateString())
fpSpread1_Sheet1.Cells[rowindex, c].Note += "퇴사";
var dr = dtHoly.Where(t => t.uid == item.empno && t.sdate.ToShortDateString() == curDate.ToShortDateString()).FirstOrDefault();
if (dr != null)
{
//휴가내역이 있다.
if (dr.term > 0)
used += dr.term;
@@ -137,14 +181,54 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DeepSkyBlue;
}
if (string.IsNullOrEmpty(dr.contents) == false) fpSpread1_Sheet1.Cells[rowindex, c].Note = dr.contents;
else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
if (string.IsNullOrEmpty(dr.contents) == false) fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents}";
//else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
else
{
fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.White;
fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
var JRUser = JobReport.Where(t => t.id == item.empno && t.pdate == curDate.ToShortDateString());
var sum_hrs = JRUser.Sum(t => t.hrs);
var sum_ot = JRUser.Sum(t => t.ot);
var sum_ot2 = JRUser.Sum(t => t.ot2);
if (bholy) //주말이다
{
//주말이다.
if (sum_ot > 0 || sum_ot2 > 0)
{
if (sum_ot2 == 0)
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"휴일근무(미승인:{sum_ot}h)";
else
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"휴일근무({sum_ot2}h)";
}
else
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.White;
}
else
{
//평일인데 근무시간이 있다
if (sum_hrs > 0)
{
if (sum_ot > 0 || sum_ot2 > 0)
{
//연장근무를 했다
if (sum_ot2 == 0) fpSpread1_Sheet1.Cells[rowindex, c].Note += $"연장근무(미승인:{sum_ot}h)";
else fpSpread1_Sheet1.Cells[rowindex, c].Note += $"연장근무({sum_ot2}h)";
}
else
{
//평일근무
}
}
else
{
//근무를 안했다
fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.White;
//fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
}
}
@@ -184,6 +268,9 @@ namespace FBS0000
public string empno { get; set; }
public string name { get; set; }
public string grade { get; set; }
public string indate { get; set; }
public string outdate { get; set; }
public userinfo()
{
@@ -248,7 +335,7 @@ namespace FBS0000
Outlook.Application outlookApplication = new Outlook.Application();
Outlook.MailItem newTask = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
newTask.Subject = tbSD.Text.Substring(0,7) +"월 출근부";
newTask.Subject = tbSD.Text.Substring(0, 7) + "월 출근부";
//newTask.To = "Chikyun.Kim@amkor.co.kr";
//newTask.HTMLBody = "<i><b>this is test mail</b></i>";
newTask.BodyFormat = OlBodyFormat.olFormatHTML;

View File

@@ -30,19 +30,19 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday));
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -86,18 +86,18 @@
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
this.cmO.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -174,7 +174,6 @@
//
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";
@@ -340,7 +339,6 @@
// tbSD
//
this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSD.Name = "tbSD";
this.tbSD.Size = new System.Drawing.Size(100, 31);
this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -355,7 +353,6 @@
// tbED
//
this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbED.Name = "tbED";
this.tbED.Size = new System.Drawing.Size(100, 31);
this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -424,7 +421,7 @@
this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown);
this.fpSpread1.SetViewportLeftColumn(0, 0, 1);
this.fpSpread1.SetActiveViewport(0, 0, -1);
this.fpSpread1.SetActiveViewport(0, -1, -1);
//
// cmO
//
@@ -491,19 +488,6 @@
this.ToolStripMenuItem.Text = "현재 사원 원장 보기";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// bs
//
this.bs.DataMember = "Holyday";
this.bs.DataSource = this.dsMSSQL;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// taUser
//
this.taUser.ClearBeforeFill = true;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -530,27 +514,27 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(일)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType2.TimeDefault = new System.DateTime(2021, 9, 7, 9, 38, 59, 393);
this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType2;
dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType1.TimeDefault = new System.DateTime(2021, 12, 20, 18, 33, 49, 994);
this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate";
this.fpSpread1_Sheet1.Columns.Get(1).Label = "일자";
this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate";
this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "요일";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "사번";
@@ -558,90 +542,90 @@
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
textCellType10.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType10;
textCellType4.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명";
this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
numberCellType7.MaximumValue = 999999999999999D;
numberCellType7.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType7;
numberCellType1.MaximumValue = 999999999999999D;
numberCellType1.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(일)";
this.fpSpread1_Sheet1.Columns.Get(5).Tag = "dr";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
numberCellType8.MaximumValue = 999999999999999D;
numberCellType8.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType8;
numberCellType2.MaximumValue = 999999999999999D;
numberCellType2.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)";
this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents";
this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용";
this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "#";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 40F;
this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
numberCellType9.MaximumValue = 999999999999999D;
numberCellType9.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType9;
numberCellType3.MaximumValue = 999999999999999D;
numberCellType3.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(일)";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "cr";
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
numberCellType10.MaximumValue = 999999999999999D;
numberCellType10.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType10;
numberCellType4.MaximumValue = 999999999999999D;
numberCellType4.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)";
this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh";
this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType11.DecimalPlaces = 1;
numberCellType11.MaximumValue = 999999999999999D;
numberCellType11.MinimumValue = -999999999999999D;
numberCellType11.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType11;
numberCellType5.DecimalPlaces = 1;
numberCellType5.MaximumValue = 999999999999999D;
numberCellType5.MinimumValue = -999999999999999D;
numberCellType5.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)";
this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand";
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType11;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)";
this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh";
this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
numberCellType12.DecimalPlaces = 1;
numberCellType12.MaximumValue = 999999999999999D;
numberCellType12.MinimumValue = -999999999999999D;
numberCellType12.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType12;
numberCellType6.DecimalPlaces = 1;
numberCellType6.MaximumValue = 999999999999999D;
numberCellType6.MinimumValue = -999999999999999D;
numberCellType6.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6;
this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray;
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)";
this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand";
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType12;
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType6;
this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray;
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)";
@@ -656,6 +640,19 @@
this.fpSpread1_Sheet1.ShowRowSelector = true;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// bs
//
this.bs.DataMember = "Holyday";
this.bs.DataSource = this.dsMSSQL;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// taUser
//
this.taUser.ClearBeforeFill = true;
//
// fHolyday
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -665,7 +662,7 @@
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
this.Name = "fHolyday";
this.Text = "출근부";
this.Text = "연차관리";
this.Load += new System.EventHandler(this.@__Load);
this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.fHolyday_KeyPress);
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
@@ -676,8 +673,8 @@
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
this.cmO.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

View File

@@ -79,7 +79,7 @@ namespace FBS0000
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
curLevel = 5;
//curLevel = 5;
if (curLevel >= 5)
{
//권한이 잇으므로 모든 사용자로 한다.
@@ -386,9 +386,9 @@ namespace FBS0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
var f = new WorkTable(sd, ed, this.cmbGrp.Text);
//var sd = DateTime.Now.ToString("yyyy-MM-01");
//var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
var f = new WorkTable();
f.Show();
}

View File

@@ -197,23 +197,6 @@
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7GF3XVVdRS51dRBBRdBcUhKJE
HxRE9CHOja6iJmYZjewiqItAonKKrC3J0hzbdJuGutk+cHqifWBLj7rlXDqXwnZOO9ONp/ec5bHhLnzh
x+E98H/e33nOOTv4RVFUxehzOYYbKzFYcxDk1vFtsp8fPuxyuRivxwnK44DtRjmy2ey2EELUavVOo9F4
c+CpEi6NErbr5Uin0wWwLAuGYUSSySTW19fzAYUGdlivyrYEbIRskEqlsLa2VmhgfaKEs1UB6xUZOI4T
eNAZQaM+gnuEBl0YDdow6gm8hRggGrjzBv2XZchkMgL8sN4eh47wdiQO7XAcdzrmhADeqsCgv1mBL6/q
0HepTEjn+f9UFRm8207jdhstdBCNRnNFDUwXyoSC+ACOS8Phj6DHPQXtSATvnQuwUPNY/b2ElZUVhgQc
3TRQ12H0pRym86X/hjnohqbRRy1h+heLuQSHsZkkbN+WMeCdRSKRKNKB2w7j2RIhgO/gozuGyWgK3vAf
uGdZuAiBGIeu0TB8Ph8kEskJ0cD8UA5HSy0MVSViiR1DYdBxDu4ZBk6awVAoBeonh3eOKBYXF7caTBCD
3soDYold5JknF1g4pvLDPBPzHDSWH1u/RPP9Woy8qEHvmc0Auy+GMTqJr2TIE05jnJxu9qXQqjdhnrIW
N+g5LUUulxPexPIqC8/3OLpJFx9cMbQPzuG13oKArR3jGgUaqvc1CQYqlUraWXUIhmvH0H1KCpqmEQqF
EAwG4ff7hcICgYBwdXx6g7G2W5gdaIGhuSJNLPKrpnTXyUdH9jyule2Wk22xX1ekvnpv02f1RW7w2Tn8
BU0oyCcGs6xoAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
@@ -228,6 +211,23 @@
btB3WoJcLie8ieVVFt7vcfSSLj64Y1Bb5/Baa0TArMa4qgFNNftaBAOFQiHprj4E3bVj6D0lAU3TCIVC
CAaD8Pv9QmGBQEC4Oj+9wWjHLcxa2qBrrUwTi/yqLdt18tGRPY/rpLtlZFvs1xVprNnb8ll5kbM+O4e/
RjjIJC1kw30AAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR
hYKILuJ09BQ1MUtpZA9BPQQSlXOIbUmWpszLbqG7tAteTrQLtvSo29Q155qwndPOdOPb/5zlseEe/MOH
w//A7/v/nO85Zxe/KIqqsL2QYqypEqaawyC3Tu6Qg/zwUYfDwUy47KBcVhhulSOTyewIIUShUOzWarW3
jc9kcChlMNwsRyqVyoNlWTAMI5JIJLCxsZELyDewQH9dsi1gM2STZDKJ9fX1fAP9Uxns7fXQX5OA4ziB
R91BNGmCeEBoVAfQ2BVAA4G3EANEA2fOYOSqBOl0WoAf1liiUBPemaPoGoviXueCEMBb5RmMtNbj6+s6
DF8pE9J5/j9VTgbvq2jc7aCFDkKhULagweClMqEgPoDjUrB6guhzzqDLHMQH+zJ01CLWfq8gHo8zJOD4
loGiDrZXUgxeLP03zEE9OothagWzv1gsxDiMzyVg+L4K48Q8YrFYgQ6cFmjPlwgBfAefnGFMLyUxEfgD
5zwLB8Eb5tBjC8DtdqOoqOiUaDDUIoW1rRYDVSViiZ2jAdBRDs45Bnaawag/CSrE4b11CZFIZLvBFDHo
rzwklthDnnl6mYV1JjfMM7XIQan7uf1LHHpYC/PLGvSf2wqwuMMYpxP4RoZcgRQmyelD7iTaNYNYpPSF
DfrOFiObzQpvYnWNhetHFL2ki4+OMFSmBbzR6OA1qDCprEdj9YFmwUAulxd3Vx3BwI0T6D1TDJqm4ff7
4fP54PF4hMK8Xq9wtX5+i/GOO5g3tmGgtSJFLHKrpnTP6cfH9j2pleyVkm2hX1ekoXp/8xfFZc70/AL+
Aj9IyCGwUBkWAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -254,22 +254,6 @@
<metadata name="cmO.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>659, 17</value>
</metadata>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>737, 17</value>
</metadata>
<data name="dateTimeCellType2.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
AAD/////AQgAAP////8AAQgAAAs=
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>294, 17</value>
</metadata>
<data name="toolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
@@ -309,6 +293,22 @@
vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
</value>
</data>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>737, 17</value>
</metadata>
<data name="dateTimeCellType1.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
AAD/////AQgAAP////8AAQgAAAs=
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>294, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>358, 17</value>
</metadata>

View File

@@ -66,6 +66,7 @@
this.ta = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
@@ -144,6 +145,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";
@@ -267,7 +269,8 @@
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel3,
this.cmbGrp,
this.toolStripButton1});
this.toolStripButton1,
this.toolStripButton5});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(984, 31);
@@ -349,6 +352,16 @@
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// toolStripButton5
//
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(59, 28);
this.toolStripButton5.Text = "닫기";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
// fWorkTableUser
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -406,5 +419,6 @@
private FarPoint.Win.Spread.FpSpread fpSpread1;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripButton toolStripButton5;
}
}

View File

@@ -173,5 +173,10 @@ namespace FBS0000
//리스트업데이트
UpdateGrpList();
}
private void toolStripButton5_Click(object sender, EventArgs e)
{
this.Close();
}
}
}

View File

@@ -229,6 +229,21 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>188, 17</value>
</metadata>
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>369, 17</value>
</metadata>