개인정보 관련 업데이트 진행
ot 정보는 타인이 못봄 휴가신청 관련건도 타인이 못봄
This commit is contained in:
@@ -14,7 +14,7 @@ namespace FPJ0000.JobReport_
|
||||
public partial class fJobChartMenu : fBase
|
||||
{
|
||||
Boolean binit = false;
|
||||
|
||||
int curLevel = 0;// Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
|
||||
public fJobChartMenu()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -22,7 +22,7 @@ namespace FPJ0000.JobReport_
|
||||
Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
|
||||
Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS;
|
||||
Properties.Settings.Default["EEEntitiesLayout"] = FCOMMON.info.CS;
|
||||
|
||||
curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
|
||||
|
||||
this.dts.Value = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01"));
|
||||
this.dte.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddDays(-1);
|
||||
@@ -30,19 +30,19 @@ namespace FPJ0000.JobReport_
|
||||
private void fJobChartMenu_Load(object sender, EventArgs e)
|
||||
{
|
||||
EnsureVisibleAndUsableSize();
|
||||
this.tbProcess.Items.Clear();
|
||||
this.cmbProcess.Items.Clear();
|
||||
|
||||
tbProcess.Items.Add("--전체--");
|
||||
cmbProcess.Items.Add("--전체--");
|
||||
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
cmbProcess.Items.Add(dr);
|
||||
|
||||
//사용자의 공정명을 선택해준다
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
this.cmbProcess.Text = FCOMMON.info.Login.process;
|
||||
|
||||
//프로세스가 선택되지 않았다면 전체를 선택해준다.
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0;
|
||||
|
||||
//사용자 목록을 선택한다
|
||||
UpdateUserList();
|
||||
@@ -59,6 +59,12 @@ namespace FPJ0000.JobReport_
|
||||
binit = true;
|
||||
btSave.Enabled = true;
|
||||
btRefresh.Enabled = true;
|
||||
|
||||
if(curLevel < 5)
|
||||
{
|
||||
this.cmbProcess.Enabled = false;
|
||||
cmbUser.Enabled = false;
|
||||
}
|
||||
}
|
||||
void UpdateUserList()
|
||||
{
|
||||
@@ -80,7 +86,7 @@ namespace FPJ0000.JobReport_
|
||||
var id = item.Field<string>("id");
|
||||
var dispname = item.Field<string>("dispname");
|
||||
var process = item.Field<string>("process");
|
||||
if (tbProcess.SelectedIndex > 0 && tbProcess.Text.Equals(process) == false) continue;
|
||||
if (cmbProcess.SelectedIndex > 0 && cmbProcess.Text.Equals(process) == false) continue;
|
||||
cmbUser.Items.Add(dispname);
|
||||
}
|
||||
|
||||
@@ -96,7 +102,7 @@ namespace FPJ0000.JobReport_
|
||||
////if (tbProcess.SelectedIndex != 0) userlist = userlist.Where(t => t.processs == tbProcess.Text); //해당 공정의 인원만 처리한다
|
||||
|
||||
|
||||
if (tbProcess.SelectedIndex > 0)
|
||||
if (cmbProcess.SelectedIndex > 0)
|
||||
cmbUser.Text = string.Format("{1}({0})", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK);
|
||||
|
||||
if (cmbUser.SelectedIndex < 0) cmbUser.SelectedIndex = 0; //기본전체로 선택해준다.
|
||||
@@ -120,7 +126,7 @@ namespace FPJ0000.JobReport_
|
||||
fpSpread1.Visible = false;
|
||||
|
||||
//조회공정
|
||||
this.fpSpread1.Sheets[0].Cells[3, 2].Value = tbProcess.Text;
|
||||
this.fpSpread1.Sheets[0].Cells[3, 2].Value = cmbProcess.Text;
|
||||
|
||||
//담당자
|
||||
this.fpSpread1.Sheets[0].Cells[3, 3].Value = cmbUser.Text;
|
||||
@@ -159,9 +165,9 @@ namespace FPJ0000.JobReport_
|
||||
var UserNo = getUserID();// cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1);
|
||||
userCount = 1;// db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo).GroupBy(t=>t.id).Count();
|
||||
}
|
||||
else if (tbProcess.SelectedIndex > 0)
|
||||
else if (cmbProcess.SelectedIndex > 0)
|
||||
{
|
||||
userCount = (int)taJobreportuser.GetProcessUserCount(FCOMMON.info.Login.gcode,tbProcess.Text);// db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).GroupBy(t => t.id).Count();
|
||||
userCount = (int)taJobreportuser.GetProcessUserCount(FCOMMON.info.Login.gcode,cmbProcess.Text);// db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).GroupBy(t => t.id).Count();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -188,9 +194,9 @@ namespace FPJ0000.JobReport_
|
||||
//.OrderBy(t => t.pdate)
|
||||
//.ToList();
|
||||
}
|
||||
else if (tbProcess.SelectedIndex > 0)
|
||||
else if (cmbProcess.SelectedIndex > 0)
|
||||
{
|
||||
baseData = taJobreportuser.GetByProcess(FCOMMON.info.Login.gcode, tbProcess.Text, vSD, vED);// db.vJobReportForUser
|
||||
baseData = taJobreportuser.GetByProcess(FCOMMON.info.Login.gcode, cmbProcess.Text, vSD, vED);// db.vJobReportForUser
|
||||
//.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0 && t.userProcess == tbProcess.Text)
|
||||
//.OrderBy(t => t.name)
|
||||
//.OrderBy(t => t.pdate)
|
||||
|
||||
Reference in New Issue
Block a user