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

23
SubProject/FBS0000/Holiday/WorkTable.cs
View File

@@ -27,7 +27,7 @@ namespace FBS0000
tbGrp.Text = string.Empty;
//this.dv1.CellFormatting += dv1_CellFormatting;
}
private void __Load(object sender, EventArgs e)
{
@@ -95,7 +95,7 @@ namespace FBS0000
//var dtUser = JobReport.OrderBy(t => t.userProcess + t.name).GroupBy(t => t.id);// taUser.GetData(FCOMMON.info.Login.gcode, tbGrp.Text);
var dtUser = FCOMMON.DBM.getActiveUserTable(); //업무일지 미사용자로인해서 사용자 목록은 이것을 사용한다 220215
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
var users = new List<userinfo>();
var seq = 0;
foreach (System.Data.DataRow dr in dtUser.Rows)
@@ -126,9 +126,14 @@ namespace FBS0000
if (dr["outdate"] == null) newuser.outdate = string.Empty;
newuser.outdate = dr["outdate"].ToString();
if (curLevel >= 5 || newuser.empno == FCOMMON.info.Login.no)
{
users.Add(newuser);
seq += 1;
}
users.Add(newuser);
seq += 1;
}
//휴가테이블에서 데이터를 가져온다
@@ -154,8 +159,8 @@ namespace FBS0000
}
//이월잔액
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999","%");
var jan = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), ed.ToShortDateString(), "999999","%");
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999", "%");
var jan = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), ed.ToShortDateString(), "999999", "%");
var used = 0.0;
fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
@@ -212,7 +217,7 @@ namespace FBS0000
//현재인원값
var bIndate = DateTime.TryParse(item.indate, out DateTime dtIn);
var bOutdate = DateTime.TryParse(item.outdate, out DateTime dtOut);
// Boolean usePerson = true;
// Boolean usePerson = true;
//
//if (bIndate == true && curDate.ToShortDateString().CompareTo(dtIn.ToShortDateString()) < 0)
@@ -258,7 +263,7 @@ namespace FBS0000
}
//근태 시작일자가 조회시작일보다 적다면, 데이터가 걸쳐진 것이므로 회색으로 처리하자 2308320
if(dr.sdate.ToShortDateString().CompareTo(sd.ToShortDateString()) < 0)
if (dr.sdate.ToShortDateString().CompareTo(sd.ToShortDateString()) < 0)
{
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DimGray;
fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.White;
@@ -352,7 +357,7 @@ namespace FBS0000
fpSpread1_Sheet1.Columns[c].Tag = ps;
}
used = (float)jand-(float)jan ;
used = (float)jand - (float)jan;
//var jan = jand - used;
fpSpread1_Sheet1.Cells[rowindex, c++].Value = jand != 0 ? jand.ToString() : string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c++].Value = used != 0 ? used.ToString() : string.Empty;

3
SubProject/FBS0000/Holiday/fHolyDayData.cs
View File

@@ -33,7 +33,8 @@ namespace FBS0000
this.tbMon.Text = DateTime.Now.ToShortDateString();
cmbType.SelectedIndex = 0; //일기준으로한다
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
if (curLevel < 5) cmbUser.Enabled = false;
}
private void rJobReport_Load(object sender, EventArgs e)

4
SubProject/FBS0000/Holiday/fHolyDayDataSum.cs
View File

@@ -78,8 +78,8 @@ namespace FBS0000
var ed = DateTime.Parse(this.tbMon.Text);
var sd = DateTime.Parse(ed.ToString("yyyy") + "-01-01");
//this.reportViewer1.LocalReport.DataSources.Clear();
var uid = "%";// GetUIDValue();
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
var uid = curLevel > 5 ? "%" : FCOMMON.info.Login.no; // GetUIDValue();
if (cmbType.SelectedIndex == 0)
{
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());

19
SubProject/FBS0000/Holiday/fHolyday.cs
View File

@@ -79,14 +79,19 @@ namespace FBS0000
복사ToolStripMenuItem.Enabled = true;
toolStripButton2.Enabled = true;
toolStripButton3.Enabled = true;
}
cmbUser.Enabled = true;
}
else
{
toolStripButton3.Enabled = false;
cmbUser.Enabled = false;
toolStripButton3.Enabled = false;
toolStripButton2.Enabled = false;
btSave.Enabled = false;
btDel.Enabled = false;
btAdd.Enabled = false;
toolStripLabel3.Enabled = false;
RefreshData();
//this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다.
@@ -414,9 +419,13 @@ namespace FBS0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
//var sd = DateTime.Now.ToString("yyyy-MM-01");
//var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
var f = new WorkTable();
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
if(curLevel < 5)
{
AR.UTIL.MsgE("사용 권한이 없습니다");
return;
}
var f = new WorkTable();
f.Show();
}

2
SubProject/FBS0000/Holiday/fyeonchastate.cs
View File

@@ -82,6 +82,8 @@ namespace FBS0000
}
else
{
cmbUser.Enabled = false;
toolStripLabel3.Enabled = false;
//toolStripButton3.Enabled = false;
//toolStripButton2.Enabled = false;
//btSave.Enabled = false;

8
SubProject/FBS0000/Holiday/rHolidaySummary.cs
View File

@@ -44,11 +44,17 @@ namespace FBS0000
this.dsReport.holydatasum.Clear();
var grp_user = dsReport.holydata.GroupBy(t => t.uid).ToList();
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
foreach (var grp in grp_user)
{
//cate group
var first_user = grp.First();
if (curLevel < 5 && grp.Key.Equals(FCOMMON.info.Login.no) == false)
{
continue;
}
var grp_cate = grp.GroupBy(t => t.cate).ToList();
foreach (var cate in grp_cate)
{