From 3de60a49780d6ccdbc67ec22c9059490ea455091 Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 12 Dec 2022 14:04:34 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EA=B0=80=20=EC=8B=A0=EC=B2=AD=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=EB=8A=94=20=EA=B0=80=EB=8A=A5=20?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 8841e21..ae13edb 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -90,6 +90,8 @@ namespace FPJ0000.OtConfirm } int curLevel = 0; + + public bool IsAdmin { get { return curLevel >= 5; } } private void fHolyRequestAdd_Load(object sender, EventArgs e) { curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); @@ -98,7 +100,7 @@ namespace FPJ0000.OtConfirm //관리자라면 관리자패널을 활성해준다. if (dr.RowState == DataRowState.Detached) { - cmbUser.Enabled = curLevel >= 5; + cmbUser.Enabled = IsAdmin;// curLevel >= 5; grpAdmin.Enabled = false; grpAdmin.Text = "관리자(추가작업시에는 사용할 수 없습니다)"; UpdateStatus(); @@ -106,8 +108,8 @@ namespace FPJ0000.OtConfirm else { cmbUser.Enabled = false; - grpAdmin.Enabled = curLevel >= 5; - if (curLevel >= 5) + grpAdmin.Enabled = IsAdmin;// curLevel >= 5; + if (IsAdmin) { grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)"; @@ -119,7 +121,7 @@ namespace FPJ0000.OtConfirm cmbPreset.SelectedIndex = 0; } - if (curLevel >= 5) + if (IsAdmin) { tbCate.DropDownStyle = ComboBoxStyle.DropDown; } @@ -128,11 +130,11 @@ namespace FPJ0000.OtConfirm tbCate.DropDownStyle = ComboBoxStyle.DropDownList; } - + binit = true; - cmbUser_SelectedIndexChanged(null, null); + cmbUser_SelectedIndexChanged(null, null); } private void button1_Click(object sender, EventArgs e) @@ -199,6 +201,9 @@ namespace FPJ0000.OtConfirm //사용시간여부 확인 var minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 문의 하세요"; + if(IsAdmin) + minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 권한으로 기록은 진행 됩니다"; + bool oktime = false; if (radTime.Checked) //대체사용 { @@ -232,11 +237,10 @@ namespace FPJ0000.OtConfirm if (oktime == false) { FCOMMON.Util.MsgE(minmsg); - return; + if (IsAdmin == false) return; } - - // return; + // return; //하나도 입력안했다면 경고한다 if (String.IsNullOrEmpty(tbReason.Text) && String.IsNullOrEmpty(tbLocation.Text) && String.IsNullOrEmpty(tbBackup.Text) && String.IsNullOrEmpty(tbRemark.Text)) @@ -432,7 +436,7 @@ namespace FPJ0000.OtConfirm var uid = uiddt.ToString(); if (uid.isEmpty()) return; - + holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, DateTime.Now.AddDays(-1).ToShortDateString()); this.richTextBox1.Clear(); @@ -455,7 +459,7 @@ namespace FPJ0000.OtConfirm } } - if(holydata.Any()) + if (holydata.Any()) updateuserinfo = uid; //업데이트한 사용자 id 기록 } }