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

....

Browse Source
This commit is contained in:
chi
2022-02-01 00:28:56 +09:00
parent 66f1ff0cbb
commit 4a43b30973
88 changed files with 1503 additions and 22144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SubProject/FPJ0000/JobReport_/K5Dailyform.cs
View File

@@ -272,7 +272,7 @@ namespace FPJ0000.JobReport_
var db = new EEEntities();
var gcode = "EET1P";
if (FCOMMON.info.Login.gcode.isEmpty() == false)
if (String.IsNullOrEmpty(FCOMMON.info.Login.gcode) == false)
gcode = FCOMMON.info.Login.gcode;
var rawdata = db.vJobReportForUser.AsNoTracking()

2
SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
View File

@@ -238,7 +238,7 @@ namespace FPJ0000.JobReport_
//2번부터는 데이터를 넣어야 한다
double sumOt = 0.0;
double holytime = 0.0;
//double holytime = 0.0;
int coldata = 2;
for (int i = 2; i < 11; i++)
{

4
SubProject/FPJ0000/JobReport_/fJobReport.cs
View File

@@ -46,7 +46,7 @@ namespace FPJ0000
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
{
if (dr.outdate.isEmpty() == false)
if (String.IsNullOrEmpty(dr.outdate) == false)
{
var odt = DateTime.Parse(dr.outdate);
if(odt <= DateTime.Now) continue; //퇴사자제외 211221
@@ -63,7 +63,7 @@ namespace FPJ0000
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
{
if (dr.outdate.isEmpty() == false)
if (String.IsNullOrEmpty(dr.outdate) == false)
{
var odt = DateTime.Parse(dr.outdate);
if (odt <= DateTime.Now) continue; //퇴사자제외 211221

4
SubProject/FPJ0000/JobReport_/fJobReportImport.cs
View File

@@ -58,8 +58,8 @@ namespace FPJ0000.JobReport_
textBox1.Text = od.FileName;
}
string sd = "";
string ed = "";
/// sd = "";
// string ed = "";
private void button1_Click(object sender, EventArgs e)
{

8
SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
View File

@@ -223,7 +223,7 @@ namespace FPJ0000.JobReport_
{
this.richTextBoxEx1.Rtf = dr.description2;
}
catch (Exception ex)
catch
{
this.richTextBoxEx1.Text = dr.description;
}
@@ -555,7 +555,7 @@ namespace FPJ0000.JobReport_
void chkform_indexchan(object sender, EventArgs e)
{
if (cmbType.Text.Trim() != "" &&
cmbType.SelectedIndex >= 0 && cmbState.Text.Trim().isEmpty() == false)
cmbType.SelectedIndex >= 0 && String.IsNullOrEmpty(cmbState.Text.Trim()) == false)
{
@@ -581,7 +581,7 @@ namespace FPJ0000.JobReport_
if (dr != null)
{
if (this.richTextBoxEx1.Text.isEmpty())
if (String.IsNullOrEmpty(this.richTextBoxEx1.Text))
{
this.richTextBoxEx1.Rtf = dr.body;
}
@@ -603,7 +603,7 @@ namespace FPJ0000.JobReport_
{
var oldtext = this.richTextBoxEx1.Text;
this.richTextBoxEx1.Rtf = dr.body;
if (this.richTextBoxEx1.Text.isEmpty() == false)
if (String.IsNullOrEmpty(this.richTextBoxEx1.Text) == false)
this.richTextBoxEx1.Text += "\r\n\r\n" + oldtext;
//this.richTextBoxEx1.Text += oldtext;

4
SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs
View File

@@ -117,7 +117,7 @@ namespace FPJ0000.JobReport_
// tbWW.Text = dr.ww;
dts.Value = DateTime.Parse(dr.pdate); //일자선택
this.checkBox1.Checked = !dr.edate.isEmpty();
this.checkBox1.Checked = !String.IsNullOrEmpty(dr.edate);
if (checkBox1.Checked) dte.Value = DateTime.Parse(dr.edate);
dte.Enabled = checkBox1.Checked;
checkBox1.CheckedChanged += (s1, e1) => {
@@ -158,7 +158,7 @@ namespace FPJ0000.JobReport_
{
this.richTextBoxEx1.Rtf = dr.description2;
}
catch (Exception ex)
catch
{
this.richTextBoxEx1.Text = dr.description;
}

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

@@ -11,7 +11,7 @@ namespace FPJ0000.JobReport_
{
public partial class rJobReportDay : Form
{
Boolean binit = false;
// Boolean binit = false;
public rJobReportDay()
{
InitializeComponent();
@@ -34,7 +34,7 @@ namespace FPJ0000.JobReport_
this.tbMon.Text = DateTime.Now.ToString("yyyy-MM");
refrehData();
binit = true;
// binit = true;
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

4
SubProject/FPJ0000/JobReport_/rJobReportUser.cs
View File

@@ -274,7 +274,7 @@ namespace FPJ0000.JobReport_
//2번부터는 데이터를 넣어야 한다
double sumOt = 0.0;
double holytime = 0.0;
//double holytime = 0.0;
int coldata = 2;
for (int i = 2; i <= 6; i++)
{
@@ -292,7 +292,7 @@ namespace FPJ0000.JobReport_
//이 이름에 해당하는 데이터의 시간을 가져온다
double ot = 0.0;
double hrs = 0.0;
if (colName != "*" && colName.isEmpty()==false)
if (colName != "*" && String.IsNullOrEmpty(colName)==false)
{
//double holytime = 0.0;
var timeList = item.Where(t => t.svalue == colName);

2
SubProject/FPJ0000/JobReport_/rK5Dailyform.cs
View File

@@ -52,7 +52,7 @@ namespace FPJ0000.JobReport_
var db = new EEEntities();
var gcode = "EET1P";
if (FCOMMON.info.Login.gcode.isEmpty() == false)
if (String.IsNullOrEmpty(FCOMMON.info.Login.gcode) == false)
gcode = FCOMMON.info.Login.gcode;
//var ta = new dsReportTableAdapters.vJobReportForUserTableAdapter();