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

개인정보 관련 업데이트 진행

Browse Source 
ot 정보는 타인이 못봄
휴가신청 관련건도 타인이 못봄
This commit is contained in:
backuppc
2025-11-11 11:43:29 +09:00
parent e6a39d52e9
commit 709ca7c85a
57 changed files with 1869 additions and 8491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,8 @@ namespace FPJ0000
cmbCf.DisplayMember = "DP";
cmbCf.ValueMember = "VAL";
dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
}
void __Closed(object sender, FormClosedEventArgs e)
@@ -48,19 +50,71 @@ namespace FPJ0000
private void __Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
this.dtED.Text = DateTime.Now.AddMonths(1).ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
this.dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
UpdateUserList();
btSave.Visible = false;// curLevel >= 5;
btEdit.Text = curLevel >= 5 ? "승인(&E)" : "편집(&E)";
// binit = true;
if (curLevel < 5)
{
cmbUser.Enabled = false;
}
else
{
if (cmbUser.Items.Count > 0)
cmbUser.SelectedIndex = 0;
}
refreshData();
}
void UpdateUserList(bool datelist = false)
{ //this.cmbUser.DisplayMember = "dispName";
//this.cmbUser.ValueMember = "id";
// this.bs.DataSource = dr;
this.cmbUser.Items.Clear();
this.cmbUser.Items.Add("-- ALL --");
//해당그룹내의 사용자 목록을 가져와야한다
if (datelist == false)
{
var dtUser = FCOMMON.DBM.getActiveUserTable();
foreach (DataRow dr in dtUser.Rows)
{
this.cmbUser.Items.Add(dr["dispname"].ToString());
}
}
else
{
var ta = new dsQueryTableAdapters.HolydayUserListTableAdapter();
var dtUser = ta.GetData(FCOMMON.info.Login.gcode, dtSD.Text, dtED.Text);
foreach (dsQuery.HolydayUserListRow dr in dtUser.Rows)
{
this.cmbUser.Items.Add($"{dr.UserName}({dr.uid})");
}
}
this.cmbUser.Text = $"{FCOMMON.info.Login.nameK}({FCOMMON.info.Login.no})";
//if (this.cmbUser.SelectedIndex < 0) this.cmbUser.SelectedIndex = 0;
}
string GetUIDValue()
{
string uid = "%";
if (cmbUser.SelectedIndex > 0)
{
var si = cmbUser.Text.IndexOf("(");
var ei = cmbUser.Text.LastIndexOf(")");
uid = cmbUser.Text.Substring(si + 1, ei - si - 1);
}
return uid;
}
private bool getKisulInput
{
@@ -112,7 +166,13 @@ namespace FPJ0000
//dsMSSQL.JobReport.Clear();
var sd = dtSD.Text.Trim();
var ed = dtED.Text.Trim();
ta.Fill(this.dSKuntae.EETGW_HolydayRequest, FCOMMON.info.Login.gcode, sd, ed);
var seluid = GetUIDValue();
var uid = "";
if (cmbUser.SelectedIndex == 0) uid = "%";
else uid = GetUIDValue();
ta.Fill(this.dSKuntae.EETGW_HolydayRequest, FCOMMON.info.Login.gcode, sd, ed, uid);
var sum_day = dSKuntae.EETGW_HolydayRequest.AsEnumerable().Where(t => t.conf == 1).Sum(t => t.HolyDays);
var sum_time = dSKuntae.EETGW_HolydayRequest.AsEnumerable().Where(t => t.conf == 1).Sum(t => t.HolyTimes);
@@ -174,7 +234,7 @@ namespace FPJ0000
else
{
search = search.Replace("'", "''");
var collist = new string[] {"name", "Response", "HolyReason","remark" };
var collist = new string[] { "name", "Response", "HolyReason", "remark" };
string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?";
foreach (var col in collist)
{
@@ -334,11 +394,11 @@ namespace FPJ0000
}
}
if(FCOMMON.DBM.GetMagamStatus(dr.sdate.Substring(0,7)))
{
if (FCOMMON.DBM.GetMagamStatus(dr.sdate.Substring(0, 7)))
{
FCOMMON.Util.MsgE("마감된 자료이므로 삭제할 수 없습니다");
return;
}
}
if (FCOMMON.DBM.GetMagamStatus(dr.edate.Substring(0, 7)))
{
@@ -381,18 +441,18 @@ namespace FPJ0000
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as DSKuntae.EETGW_HolydayRequestRow;
if(dr.cate.Equals("외출")==false)
if (dr.cate.Equals("외출") == false)
{
FCOMMON.Util.MsgE("외출 자료만 완료할 수 있습니다");
return;
}
if(dr.conf != 1)
if (dr.conf != 1)
{
FCOMMON.Util.MsgE("관리자 승인된 자료만 완료할 수 있습니다");
return;
}
var f = new OtConfirm.fOutCoomplete(dr);
if(f.ShowDialog() == DialogResult.OK)
if (f.ShowDialog() == DialogResult.OK)
{
dr.stime = f.dtSD.Value.ToString("HH:mm");
dr.etime = f.dtED.Value.ToString("HH:mm");