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

60
SubProject/FPJ0000/JobReport_/rJobReportDay.cs
View File

@@ -12,14 +12,14 @@ namespace FPJ0000.JobReport_
{
public partial class rJobReportDay : fBase
{
// Boolean binit = false;
public rJobReportDay(string baseday )
// Boolean binit = false;
public rJobReportDay(string baseday)
{
InitializeComponent();
this.WindowState = FormWindowState.Maximized;
if (baseday.Length > 7)
tbMon.Text = baseday.Substring(0, 7);
}
private void rJobReport_Load(object sender, EventArgs e)
@@ -35,9 +35,12 @@ namespace FPJ0000.JobReport_
this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
var curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
if (curLevel < 5) tbProcess.Enabled = false;
//this.tbMon.Text = DateTime.Now.ToString("yyyy-MM");
refrehData();
// binit = true;
// binit = true;
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -66,15 +69,15 @@ namespace FPJ0000.JobReport_
var Process = tbProcess.Text.Trim();
if (Process == "%" || tbProcess.SelectedIndex == 0) Process = "";
var wekklist = new string[] { "일","월","화","수","목","금","토" };
var wekklist = new string[] { "일", "월", "화", "수", "목", "금", "토" };
//날짜에 해당하는 열을 먼저 생성한다
dataGridView1.Columns.Add("dvcu_damdang", "사원명");
// dataGridView1.Columns.Add("dvcu_process", "공정");
var daylist = dsReport.JobReportDay.OrderBy(t=>t.pdate).GroupBy(t => t.pdate);
// dataGridView1.Columns.Add("dvcu_process", "공정");
var daylist = dsReport.JobReportDay.OrderBy(t => t.pdate).GroupBy(t => t.pdate);
foreach (var dayitem in daylist)
{
var dtValue = DateTime.Parse(dayitem.Key);
var week = wekklist[(int)dtValue.DayOfWeek];
this.dataGridView1.Columns.Add("dvcu_pdate", dayitem.Key.Substring(8, 2) + "(" + week.ToString() + ")");
@@ -96,26 +99,29 @@ namespace FPJ0000.JobReport_
// this.dataGridView1.Columns.Add("dvcu_pdate", dayitem.Key.Substring(8, 2) );
//}
this.dataGridView1.Columns[this.dataGridView1.Columns.Count -1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
}
dataGridView1.Columns.Add("dvcu_sum", "합계");
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
var curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
foreach (var item in dsReport.JobReportDay.Where(t=>t.processs.Contains(Process)).OrderBy(t => t.uname + t.uid).GroupBy(t => t.uname))
foreach (var item in dsReport.JobReportDay.Where(t => t.processs.Contains(Process)).OrderBy(t => t.uname + t.uid).GroupBy(t => t.uname))
{
//사용자별로 데이터를 가져온다.
var username = item.Key;
var userid = item.FirstOrDefault().uid;
if (curLevel < 5 && userid != FCOMMON.info.Login.no) continue;
List<string> rowdata = new List<string>();
rowdata.Add(username);
// rowdata.Add(item.FirstOrDefault().processs);
// rowdata.Add(item.FirstOrDefault().processs);
//이 사용자의 데이터를 날짜별로 정렬해서 가져온다.
var sum = 0.0;
var sumOT = 0.0;
var sumFR = 0.0; //휴일근무시간 210310
for (int i = 1; i < this.dataGridView1.Columns.Count-1; i++)
for (int i = 1; i < this.dataGridView1.Columns.Count - 1; i++)
{
var col = this.dataGridView1.Columns[i];
var dayStr = col.HeaderText.Substring(0, 2);
@@ -133,15 +139,15 @@ namespace FPJ0000.JobReport_
{
//이날은 휴일이다
sumFR += daydata.ot;// + daydata.hrs;
//sumOT += daydata.ot;
rowdata.Add("*" + daydata.hrs.ToString() + "+" + daydata.ot.ToString());
//sumOT += daydata.ot;
rowdata.Add("*" + daydata.hrs.ToString() + "+" + daydata.ot.ToString());
}
else
{
//평일이다
sumOT += daydata.ot;
if(daydata.jobtype == "휴가")
if (daydata.jobtype == "휴가")
{
if (daydata.hrs + daydata.ot == 8.0) rowdata.Add("휴가");
else rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
@@ -150,7 +156,7 @@ namespace FPJ0000.JobReport_
{
rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
}
}
}
else rowdata.Add("--"); //업무일지에 자료가 없다.
@@ -158,13 +164,13 @@ namespace FPJ0000.JobReport_
rowdata.Add(sum.ToString() + "+" + sumOT.ToString() + "(*" + sumFR.ToString() + ")");
this.dataGridView1.Rows.Add(rowdata.ToArray());
}
foreach(DataGridViewRow dvrow in this.dataGridView1.Rows)
foreach (DataGridViewRow dvrow in this.dataGridView1.Rows)
{
for(int i = 1;i < this.dataGridView1.ColumnCount-1;i++)
for (int i = 1; i < this.dataGridView1.ColumnCount - 1; i++)
{
var col = this.dataGridView1.Columns[i ];
var col = this.dataGridView1.Columns[i];
var cellvalue = "--";
if(dvrow.Cells[i].Value != null) cellvalue= dvrow.Cells[i].Value.ToString();
if (dvrow.Cells[i].Value != null) cellvalue = dvrow.Cells[i].Value.ToString();
if (cellvalue == "--") dvrow.Cells[i].Style.ForeColor = Color.Gray;
else if (cellvalue == "휴가") dvrow.Cells[i].Style.ForeColor = Color.Tomato;
else
@@ -174,7 +180,7 @@ namespace FPJ0000.JobReport_
double ot;
if (double.TryParse(datasplbu[1], out ot) == false) ot = 0;
if(col.Tag.ToString() == "1")
if (col.Tag.ToString() == "1")
{
dvrow.Cells[i].Style.ForeColor = Color.Green;
}
@@ -198,10 +204,10 @@ namespace FPJ0000.JobReport_
dvrow.Cells[i].Style.ForeColor = Color.Red;
}
}
}
}
}
this.dataGridView1.AutoResizeColumns();
}
@@ -209,11 +215,11 @@ namespace FPJ0000.JobReport_
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
}
}
private void button1_Click_1(object sender, EventArgs e)
private void button1_Click_1(object sender, EventArgs e)
{
}
private void lbStt_Click(object sender, EventArgs e)
@@ -249,7 +255,7 @@ namespace FPJ0000.JobReport_
var sdo = DateTime.Parse(this.tbMon.Text + "-01");
var sd = sdo.AddMonths(-1);
tbMon.Text = sd.ToString("yyyy-MM");
}
private void toolStripButton7_Click(object sender, EventArgs e)