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

....

Browse Source
This commit is contained in:
chi
2021-12-30 13:58:45 +09:00
parent 9871904e9d
commit 10d05e36d4
5 changed files with 188 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs generated
View File

@@ -37,6 +37,8 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dSKuntae = new FPJ0000.DSKuntae();
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
@@ -66,8 +68,6 @@
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.dv1 = new arCtl.arDatagridView();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dSKuntae = new FPJ0000.DSKuntae();
this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -86,14 +86,14 @@
this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -132,6 +132,17 @@
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
// bs
//
this.bs.DataMember = "EETGW_HolydayRequest";
this.bs.DataSource = this.dSKuntae;
this.bs.Sort = "";
//
// dSKuntae
//
this.dSKuntae.DataSetName = "DSKuntae";
this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// bindingNavigatorCountItem
//
this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -435,17 +446,6 @@
this.dv1.TabIndex = 3;
this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError);
//
// bs
//
this.bs.DataMember = "EETGW_HolydayRequest";
this.bs.DataSource = this.dSKuntae;
this.bs.Sort = "";
//
// dSKuntae
//
this.dSKuntae.DataSetName = "DSKuntae";
this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// ta
//
this.ta.ClearBeforeFill = true;
@@ -542,6 +542,7 @@
this.HolyDays.DataPropertyName = "HolyDays";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.HolyDays.DefaultCellStyle = dataGridViewCellStyle4;
this.HolyDays.HeaderText = "일";
this.HolyDays.Name = "HolyDays";
@@ -552,10 +553,12 @@
this.HolyTimes.DataPropertyName = "HolyTimes";
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
dataGridViewCellStyle5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold);
dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle5;
this.HolyTimes.HeaderText = "시간";
this.HolyTimes.HeaderText = "대체시간";
this.HolyTimes.Name = "HolyTimes";
this.HolyTimes.Width = 64;
this.HolyTimes.Width = 88;
//
// HolyBackup
//
@@ -586,6 +589,8 @@
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
this.bn.ResumeLayout(false);
this.bn.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false);
@@ -593,8 +598,6 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

26
SubProject/FPJ0000/OtConfirm/fHolyRequest.cs
View File

@@ -53,9 +53,8 @@ namespace FPJ0000
btSave.Visible = curLevel >= 5;
btEdit.Text = curLevel >= 5 ? "승인(&E)" : "편집(&E)";
binit = true;
refreshData();
binit = true;
}
@@ -111,7 +110,26 @@ namespace FPJ0000
var ed = dtED.Text.Trim();
ta.Fill(this.dSKuntae.EETGW_HolydayRequest, FCOMMON.info.Login.gcode, sd, ed);
////색상처리
//dv1.SuspendLayout();
//foreach(DataGridViewRow dr in this.dv1.Rows)
//{
// var times = dr.Cells["HolyTimes"].Value;
// if(times == null || float.Parse( times.ToString()) < 1)
// {
// //대체없음
// dr.DefaultCellStyle.BackColor = Color.White;
// }
// else
// {
// dr.DefaultCellStyle.BackColor = Color.LightSkyBlue;
// }
//}
//dv1.ResumeLayout();
//dv1.Invalidate();
//dv1.Refresh();
}
void funcSave()
@@ -289,7 +307,7 @@ namespace FPJ0000
{
var cnt = ta.Update(dr);
dr.AcceptChanges();
if(cnt == 0)
if (cnt == 0)
FCOMMON.Util.MsgE($"저장 실패");
}
catch (Exception ex)
@@ -330,7 +348,7 @@ namespace FPJ0000
bs.RemoveCurrent();
var cnt = ta.Update(this.dSKuntae.EETGW_HolydayRequest);
if(cnt == 0)
if (cnt == 0)
FCOMMON.Util.MsgQ("삭제가 완료되지 않았습니다");
}
}

13
SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
View File

@@ -69,7 +69,7 @@ namespace FPJ0000.OtConfirm
private void fHolyRequestAdd_Load(object sender, EventArgs e)
{
curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
//관리자라면 관리자패널을 활성해준다.
if (dr.RowState == DataRowState.Detached)
@@ -111,6 +111,13 @@ namespace FPJ0000.OtConfirm
if (tbDays.Text.IsNumeric()) vDay = int.Parse(tbDays.Text.Trim());
if (tbTimes.Text.IsNumeric()) vTime = float.Parse(tbTimes.Text.Trim());
if (vDay > 0 && vTime > 0)
{
FCOMMON.Util.MsgE("사용일/시간을 동시에 입력할 수는 없습니다.\r\n" +
"대체휴가의 경우에만 시간을 입력하시기 바랍니다");
return;
}
if (vDay < 1 && vTime < 0.1)
{
FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요");
@@ -132,7 +139,7 @@ namespace FPJ0000.OtConfirm
}
}
dr.HolyReason = tbReason.Text.Trim();
dr.HolyLocation = tbLocation.Text.Trim();
@@ -157,7 +164,7 @@ namespace FPJ0000.OtConfirm
private void button2_Click(object sender, EventArgs e)
{
}
private void cmbPreset_SelectedIndexChanged(object sender, EventArgs e)