diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index c72a6bc..b0b5ff2 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("22.01.05.0840")] -[assembly: AssemblyFileVersion("22.01.05.0840")] +[assembly: AssemblyVersion("22.01.10.1050")] +[assembly: AssemblyFileVersion("22.01.10.1050")] diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs index 84edb39..6b53e0f 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs @@ -51,7 +51,9 @@ namespace FPJ0000 this.dtED.Text = DateTime.Now.AddMonths(1).ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString(); this.dtSD.Text = DateTime.Now.AddMonths(-3).ToShortDateString(); - btSave.Visible = curLevel >= 5; + this.dv1.EditMode = DataGridViewEditMode.EditProgrammatically; + + btSave.Visible = false;// curLevel >= 5; btEdit.Text = curLevel >= 5 ? "승인(&E)" : "편집(&E)"; binit = true; refreshData(); diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index a5dc517..421d05a 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -13,6 +13,7 @@ namespace FPJ0000.OtConfirm public partial class fHolyRequestAdd : Form { DSKuntae.EETGW_HolydayRequestRow dr; + Boolean binit = false; public fHolyRequestAdd(DSKuntae.EETGW_HolydayRequestRow dr_) { InitializeComponent(); @@ -101,7 +102,7 @@ namespace FPJ0000.OtConfirm cmbPreset.Items.AddRange(관리자사전멘트.Select(t => t.Value).ToArray()); cmbPreset.SelectedIndex = 0; } - + binit = true; } private void button1_Click(object sender, EventArgs e) @@ -132,6 +133,10 @@ namespace FPJ0000.OtConfirm if (tbDays.Text.IsNumeric()) vDay = int.Parse(tbDays.Text.Trim()); if (tbTimes.Text.IsNumeric()) vTime = float.Parse(tbTimes.Text.Trim()); + //라디오버튼에 따른 시간 값 할당 + if (radTime.Checked) vDay = 0; + else vTime = 0; + if (vDay > 0 && vTime > 0) { FCOMMON.Util.MsgE("사용일/시간을 동시에 입력할 수는 없습니다.\r\n" + @@ -262,7 +267,7 @@ namespace FPJ0000.OtConfirm tbTimes.BackColor = Color.DimGray; tbDays.BackColor = Color.Gold; } - + if(binit) UpdateStatus(); } }