...
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.btSave = new System.Windows.Forms.Button();
|
||||
this.cmbUser = new System.Windows.Forms.ComboBox();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
@@ -40,7 +41,8 @@
|
||||
this.btRefresh = new System.Windows.Forms.Button();
|
||||
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
|
||||
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
|
||||
this.btSave = new System.Windows.Forms.Button();
|
||||
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
|
||||
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
|
||||
this.panel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
|
||||
@@ -49,6 +51,8 @@
|
||||
// panel1
|
||||
//
|
||||
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
|
||||
this.panel1.Controls.Add(this.linkLabel2);
|
||||
this.panel1.Controls.Add(this.linkLabel1);
|
||||
this.panel1.Controls.Add(this.btSave);
|
||||
this.panel1.Controls.Add(this.cmbUser);
|
||||
this.panel1.Controls.Add(this.label4);
|
||||
@@ -63,9 +67,20 @@
|
||||
this.panel1.Location = new System.Drawing.Point(0, 0);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Padding = new System.Windows.Forms.Padding(5);
|
||||
this.panel1.Size = new System.Drawing.Size(888, 58);
|
||||
this.panel1.Size = new System.Drawing.Size(1102, 58);
|
||||
this.panel1.TabIndex = 1;
|
||||
//
|
||||
// btSave
|
||||
//
|
||||
this.btSave.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.btSave.Location = new System.Drawing.Point(947, 5);
|
||||
this.btSave.Name = "btSave";
|
||||
this.btSave.Size = new System.Drawing.Size(75, 48);
|
||||
this.btSave.TabIndex = 13;
|
||||
this.btSave.Text = "파일저장";
|
||||
this.btSave.UseVisualStyleBackColor = true;
|
||||
this.btSave.Click += new System.EventHandler(this.btSave_Click);
|
||||
//
|
||||
// cmbUser
|
||||
//
|
||||
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
@@ -138,7 +153,7 @@
|
||||
// btRefresh
|
||||
//
|
||||
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.btRefresh.Location = new System.Drawing.Point(808, 5);
|
||||
this.btRefresh.Location = new System.Drawing.Point(1022, 5);
|
||||
this.btRefresh.Name = "btRefresh";
|
||||
this.btRefresh.Size = new System.Drawing.Size(75, 48);
|
||||
this.btRefresh.TabIndex = 2;
|
||||
@@ -154,49 +169,41 @@
|
||||
this.fpSpread1.Name = "fpSpread1";
|
||||
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
|
||||
this.fpSpread1_Sheet1});
|
||||
this.fpSpread1.Size = new System.Drawing.Size(888, 638);
|
||||
this.fpSpread1.Size = new System.Drawing.Size(1102, 592);
|
||||
this.fpSpread1.TabIndex = 4;
|
||||
//
|
||||
// fpSpread1_Sheet1
|
||||
//
|
||||
this.fpSpread1_Sheet1.Reset();
|
||||
this.fpSpread1_Sheet1.SheetName = "Sheet1";
|
||||
// Formulas and custom names must be loaded with R1C1 reference style
|
||||
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
|
||||
this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.DefaultStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.FilterBar.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty;
|
||||
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
|
||||
//
|
||||
// btSave
|
||||
// linkLabel1
|
||||
//
|
||||
this.btSave.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.btSave.Location = new System.Drawing.Point(733, 5);
|
||||
this.btSave.Name = "btSave";
|
||||
this.btSave.Size = new System.Drawing.Size(75, 48);
|
||||
this.btSave.TabIndex = 13;
|
||||
this.btSave.Text = "파일저장";
|
||||
this.btSave.UseVisualStyleBackColor = true;
|
||||
this.btSave.Click += new System.EventHandler(this.btSave_Click);
|
||||
this.linkLabel1.AutoSize = true;
|
||||
this.linkLabel1.Location = new System.Drawing.Point(522, 12);
|
||||
this.linkLabel1.Name = "linkLabel1";
|
||||
this.linkLabel1.Size = new System.Drawing.Size(41, 12);
|
||||
this.linkLabel1.TabIndex = 14;
|
||||
this.linkLabel1.TabStop = true;
|
||||
this.linkLabel1.Text = "다음달";
|
||||
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
|
||||
//
|
||||
// linkLabel2
|
||||
//
|
||||
this.linkLabel2.AutoSize = true;
|
||||
this.linkLabel2.Location = new System.Drawing.Point(475, 12);
|
||||
this.linkLabel2.Name = "linkLabel2";
|
||||
this.linkLabel2.Size = new System.Drawing.Size(41, 12);
|
||||
this.linkLabel2.TabIndex = 15;
|
||||
this.linkLabel2.TabStop = true;
|
||||
this.linkLabel2.Text = "이전달";
|
||||
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
|
||||
//
|
||||
// fJobChartMenu
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(888, 696);
|
||||
this.ClientSize = new System.Drawing.Size(1102, 650);
|
||||
this.Controls.Add(this.fpSpread1);
|
||||
this.Controls.Add(this.panel1);
|
||||
this.Name = "fJobChartMenu";
|
||||
@@ -227,5 +234,7 @@
|
||||
private FarPoint.Win.Spread.FpSpread fpSpread1;
|
||||
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
|
||||
private System.Windows.Forms.Button btSave;
|
||||
private System.Windows.Forms.LinkLabel linkLabel2;
|
||||
private System.Windows.Forms.LinkLabel linkLabel1;
|
||||
}
|
||||
}
|
||||
@@ -360,5 +360,23 @@ namespace FPJ0000.JobReport_
|
||||
FCOMMON.Util.MsgE("파일저장완료\n" + sd.FileName);
|
||||
}
|
||||
}
|
||||
|
||||
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
|
||||
{
|
||||
//이전달
|
||||
var sd = dts.Value.AddMonths(-1);
|
||||
var ed = sd.AddMonths(1);
|
||||
dts.Value = sd;
|
||||
dte.Value = ed;
|
||||
}
|
||||
|
||||
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
|
||||
{
|
||||
//다음달
|
||||
var sd = dts.Value.AddMonths(1);
|
||||
var ed = sd.AddMonths(1);
|
||||
dts.Value = sd;
|
||||
dte.Value = ed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -593,7 +593,7 @@ namespace FPJ0000
|
||||
FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
|
||||
return;
|
||||
}
|
||||
if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0)
|
||||
if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0 && FCOMMON.info.Login.level < 5)
|
||||
{
|
||||
FCOMMON.Util.MsgE("연장/휴일 근무 시간이 승인된 자료이므로 삭제할 수 없습니다");
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user