toshortstring -> tostring
This commit is contained in:
@@ -106,8 +106,8 @@ namespace FPJ0000.JobReport_
|
||||
// //this.fpSpread1.Sheets[0].Cells[3, 6].Value = dte.Value;
|
||||
|
||||
// ////근문일수,시간
|
||||
// var vSD = dts.Value.ToShortDateString();
|
||||
// var vED = dte.Value.ToShortDateString();
|
||||
// var vSD = dts.Value.ToString("yyyy-MM-dd");
|
||||
// var vED = dte.Value.ToString("yyyy-MM-dd");
|
||||
|
||||
// ////휴가일수확인
|
||||
// //var drDays = db.HolidayLIst.Where(t => t.free == false && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0);
|
||||
@@ -271,8 +271,8 @@ namespace FPJ0000.JobReport_
|
||||
|
||||
|
||||
//자료를 불러온다
|
||||
var sd = dts.Value.ToShortDateString();// DateTime.Parse(dtSD.Text).ToShortDateString();
|
||||
var ed = dte.Value.ToShortDateString(); // DateTime.Parse(dtED.Text).ToShortDateString();
|
||||
var sd = dts.Value.ToString("yyyy-MM-dd");// DateTime.Parse(dtSD.Text).ToString("yyyy-MM-dd");
|
||||
var ed = dte.Value.ToString("yyyy-MM-dd"); // DateTime.Parse(dtED.Text).ToString("yyyy-MM-dd");
|
||||
var db = new dsJobReportTableAdapters.vJobReportForUserTableAdapter();// EEEntities();
|
||||
|
||||
var gcode = "EET1P";
|
||||
@@ -282,7 +282,7 @@ namespace FPJ0000.JobReport_
|
||||
var rawdata = db.GetByDate(FCOMMON.info.Login.gcode, sd, ed).OrderBy(t => t.pdate).GroupBy(t => t.pdate);// ..vJobReportForUser.AsNoTracking()
|
||||
//.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1)
|
||||
//.OrderBy(t => t.pdate).GroupBy(t => t.pdate).ToList();
|
||||
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString());
|
||||
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToString("yyyy-MM-dd"), ed.ToShortTimeString());
|
||||
|
||||
|
||||
var col = 3;
|
||||
|
||||
@@ -138,8 +138,8 @@ namespace FPJ0000.JobReport_
|
||||
this.fpSpread1.Sheets[0].Cells[3, 5].Value = dte.Value;
|
||||
|
||||
//근문일수,시간
|
||||
var vSD = dts.Value.ToShortDateString();
|
||||
var vED = dte.Value.ToShortDateString();
|
||||
var vSD = dts.Value.ToString("yyyy-MM-dd");
|
||||
var vED = dte.Value.ToString("yyyy-MM-dd");
|
||||
|
||||
//휴가일수확인
|
||||
var taHolidylist = new dsJobReportTableAdapters.HolidayLIstTableAdapter();
|
||||
|
||||
@@ -95,7 +95,7 @@ namespace FPJ0000
|
||||
EnsureVisibleAndUsableSize();
|
||||
this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
|
||||
var sdate = DateTime.Parse(dtSD.Text);
|
||||
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
|
||||
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
|
||||
|
||||
//공정목록
|
||||
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
@@ -219,7 +219,7 @@ namespace FPJ0000
|
||||
if (e.KeyCode != Keys.Enter) return;
|
||||
var tb = sender as ToolStripTextBox;
|
||||
var input = tb.Text.Trim();
|
||||
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
|
||||
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
else
|
||||
{
|
||||
string dt = string.Empty;
|
||||
@@ -411,7 +411,7 @@ namespace FPJ0000
|
||||
void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
|
||||
{
|
||||
e.Row["gcode"] = FCOMMON.info.Login.gcode;
|
||||
e.Row["pdate"] = DateTime.Now.ToShortDateString();
|
||||
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
e.Row["wuid"] = FCOMMON.info.Login.no;
|
||||
e.Row["wdate"] = DateTime.Now;
|
||||
e.Row["status"] = "진행 완료";//other
|
||||
@@ -481,7 +481,7 @@ namespace FPJ0000
|
||||
{
|
||||
var newdr = this.dsMSSQL.JobReport.NewJobReportRow();
|
||||
newdr.status = "진행 완료";
|
||||
newdr.pdate = DateTime.Now.ToShortDateString();
|
||||
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday ||
|
||||
DateTime.Now.DayOfWeek == DayOfWeek.Saturday) newdr.hrs = 0;
|
||||
|
||||
@@ -615,7 +615,7 @@ namespace FPJ0000
|
||||
newdr.wuid = FCOMMON.info.Login.no;
|
||||
newdr.uid = FCOMMON.info.Login.no;
|
||||
//newdr.description = "";
|
||||
newdr.pdate = DateTime.Now.ToShortDateString(); //190509
|
||||
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd"); //190509
|
||||
newdr.idx = -1;
|
||||
//newdr.hrs = 8.0;
|
||||
newdr.SethrsNull();
|
||||
@@ -690,11 +690,11 @@ namespace FPJ0000
|
||||
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
|
||||
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
|
||||
var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
|
||||
dtSD.Text = sdDate.ToShortDateString();
|
||||
if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString())
|
||||
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
|
||||
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
|
||||
if (f.dtPick.SelectionStart.ToString("yyyy-MM-dd") == f.dtPick.SelectionEnd.ToString("yyyy-MM-dd"))
|
||||
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
|
||||
else
|
||||
dtED.Text = f.dtPick.SelectionEnd.ToShortDateString();
|
||||
dtED.Text = f.dtPick.SelectionEnd.ToString("yyyy-MM-dd");
|
||||
refreshData();
|
||||
}
|
||||
|
||||
@@ -762,7 +762,7 @@ namespace FPJ0000
|
||||
{
|
||||
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text));
|
||||
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
|
||||
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
|
||||
dtED.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
|
||||
}
|
||||
|
||||
private void toolStripButton4_Click(object sender, EventArgs e)
|
||||
@@ -825,8 +825,8 @@ namespace FPJ0000
|
||||
var sdo = DateTime.Parse(dtSD.Text);
|
||||
var sd = DateTime.Parse(sdo.AddMonths(-1).ToString("yyyy-MM-01"));
|
||||
var ed = sd.AddMonths(1).AddDays(-1);
|
||||
dtSD.Text = sd.ToShortDateString();
|
||||
dtED.Text = ed.ToShortDateString();
|
||||
dtSD.Text = sd.ToString("yyyy-MM-dd");
|
||||
dtED.Text = ed.ToString("yyyy-MM-dd");
|
||||
|
||||
}
|
||||
|
||||
@@ -835,8 +835,8 @@ namespace FPJ0000
|
||||
var sdo = DateTime.Parse(dtSD.Text);
|
||||
var sd = DateTime.Parse(sdo.AddMonths(1).ToString("yyyy-MM-01"));
|
||||
var ed = sd.AddMonths(1).AddDays(-1);
|
||||
dtSD.Text = sd.ToShortDateString();
|
||||
dtED.Text = ed.ToShortDateString();
|
||||
dtSD.Text = sd.ToString("yyyy-MM-dd");
|
||||
dtED.Text = ed.ToString("yyyy-MM-dd");
|
||||
}
|
||||
|
||||
private void toolStripButton10_Click(object sender, EventArgs e)
|
||||
@@ -933,7 +933,7 @@ namespace FPJ0000
|
||||
newdr.wuid = FCOMMON.info.Login.no;
|
||||
newdr.uid = FCOMMON.info.Login.no;
|
||||
|
||||
newdr.pdate = d.ToShortDateString(); //190509
|
||||
newdr.pdate = d.ToString("yyyy-MM-dd"); //190509
|
||||
newdr.idx = -1;
|
||||
newdr.hrs = 8.0;
|
||||
newdr.ot = 0.0;
|
||||
|
||||
@@ -117,7 +117,7 @@ namespace FPJ0000
|
||||
void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
|
||||
{
|
||||
e.Row["gcode"] = FCOMMON.info.Login.gcode;
|
||||
e.Row["pdate"] = DateTime.Now.ToShortDateString();
|
||||
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
e.Row["wuid"] = FCOMMON.info.Login.no;
|
||||
e.Row["wdate"] = DateTime.Now;
|
||||
e.Row["status"] = "진행 완료";//other
|
||||
@@ -177,7 +177,7 @@ namespace FPJ0000
|
||||
private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var newdr = this.dsMSSQL.EETGW_JobReport_AutoInput.NewEETGW_JobReport_AutoInputRow();
|
||||
newdr.pdate = DateTime.Now.ToShortDateString();
|
||||
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
newdr.uid = FCOMMON.info.Login.no;
|
||||
newdr.gcode = FCOMMON.info.Login.gcode;
|
||||
newdr.wdate = DateTime.Now;
|
||||
@@ -299,7 +299,7 @@ namespace FPJ0000
|
||||
newdr.wuid = FCOMMON.info.Login.no;
|
||||
newdr.uid = FCOMMON.info.Login.no;
|
||||
//newdr.description = "";
|
||||
newdr.pdate = DateTime.Now.ToShortDateString(); //190509
|
||||
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd"); //190509
|
||||
newdr.idx = -1;
|
||||
newdr.hrs = 8.0;
|
||||
newdr.ot = 0.0;
|
||||
@@ -386,7 +386,7 @@ namespace FPJ0000
|
||||
{
|
||||
if (sd > DateTime.Now) break;
|
||||
//이날짜가 일반 날짜라면 데이터를 기록한다.
|
||||
var dayinfo = db.GetOne(sd.ToShortDateString()).FirstOrDefault();// holilist.Where(t => t.pdate == sd.ToShortDateString()).FirstOrDefault();
|
||||
var dayinfo = db.GetOne(sd.ToString("yyyy-MM-dd")).FirstOrDefault();// holilist.Where(t => t.pdate == sd.ToString("yyyy-MM-dd")).FirstOrDefault();
|
||||
if (dayinfo.free == true)
|
||||
{
|
||||
sd = sd.AddDays(1);
|
||||
@@ -394,7 +394,7 @@ namespace FPJ0000
|
||||
}
|
||||
|
||||
//그냥 생성된자료가 없어야한다
|
||||
var vPdate = sd.ToShortDateString();
|
||||
var vPdate = sd.ToString("yyyy-MM-dd");
|
||||
if (taJobReportQuery.ExistUserData(FCOMMON.info.Login.gcode, vPdate, dr.uid) > 0)// db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == vPdate && t.uid == dr.uid).Any())
|
||||
{
|
||||
sd = sd.AddDays(1);
|
||||
@@ -406,7 +406,7 @@ namespace FPJ0000
|
||||
newdr.gcode = FCOMMON.info.Login.gcode;
|
||||
newdr.wuid = FCOMMON.info.Login.no;
|
||||
newdr.wdate = DateTime.Now;
|
||||
newdr.pdate = sd.ToShortDateString();
|
||||
newdr.pdate = sd.ToString("yyyy-MM-dd");
|
||||
newdr.import = false;
|
||||
newdr.hrs = dr.hrs;
|
||||
newdr.ot = dr.ot;
|
||||
|
||||
@@ -140,7 +140,7 @@ namespace FPJ0000.JobReport_
|
||||
var dayval = sheet.readNum(r, colidx);
|
||||
var daystr = string.Format("{0}-{1}-{2}", DateTime.Now.Year, monstr, dayval);
|
||||
var dt = DateTime.Parse(daystr);
|
||||
dr.pdate = dt.ToShortDateString();
|
||||
dr.pdate = dt.ToString("yyyy-MM-dd");
|
||||
}
|
||||
else if (nuddate.Value > 0)
|
||||
{
|
||||
@@ -333,20 +333,20 @@ namespace FPJ0000.JobReport_
|
||||
var sd = dateTimePicker2.Value;
|
||||
var ed = dateTimePicker1.Value;
|
||||
|
||||
var dlg = FCOMMON.Util.MsgQ($"{sd.ToShortDateString()}~{ed.ToShortDateString()} 사이의 업로드된 자료를 삭제 할까요?");
|
||||
var dlg = FCOMMON.Util.MsgQ($"{sd.ToString("yyyy-MM-dd")}~{ed.ToString("yyyy-MM-dd")} 사이의 업로드된 자료를 삭제 할까요?");
|
||||
if (dlg != DialogResult.Yes) return;
|
||||
|
||||
|
||||
var ta = new dsPRJTableAdapters.JobReportTableAdapter();
|
||||
if (this.cmbUser.SelectedValue == null || this.cmbUser.SelectedValue.ToString() == "--")
|
||||
{
|
||||
var cnt = ta.DeleteImportAll(sd.ToShortDateString(), ed.ToShortDateString(), FCOMMON.info.Login.gcode);
|
||||
var cnt = ta.DeleteImportAll(sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"), FCOMMON.info.Login.gcode);
|
||||
FCOMMON.Util.MsgI($"{cnt}건의 자료가 삭제 되었습니다");
|
||||
}
|
||||
else
|
||||
{
|
||||
var uid = this.cmbUser.SelectedItem.ToString();
|
||||
var cnt = ta.DeleteImport(sd.ToShortDateString(), ed.ToShortDateString(), uid, FCOMMON.info.Login.gcode);
|
||||
var cnt = ta.DeleteImport(sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"), uid, FCOMMON.info.Login.gcode);
|
||||
FCOMMON.Util.MsgI($"{cnt}건의 자료가 삭제 되었습니다");
|
||||
}
|
||||
|
||||
|
||||
@@ -507,7 +507,7 @@ namespace FPJ0000.JobReport_
|
||||
}
|
||||
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
|
||||
{
|
||||
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToShortDateString());
|
||||
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToString("yyyy-MM-dd"));
|
||||
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
|
||||
dtPdate.Value = f.dtSelect;
|
||||
}
|
||||
@@ -596,7 +596,7 @@ namespace FPJ0000.JobReport_
|
||||
|
||||
///휴일체크
|
||||
var taQ = new dsQueryTableAdapters.QueriesTableAdapter();
|
||||
var freeday = taQ.CheckHoliday(dtPdate.Value.ToShortDateString());
|
||||
var freeday = taQ.CheckHoliday(dtPdate.Value.ToString("yyyy-MM-dd"));
|
||||
if (freeday != null && freeday == true)
|
||||
{
|
||||
var hrs = float.Parse(tbHrs.Text);
|
||||
@@ -623,7 +623,7 @@ namespace FPJ0000.JobReport_
|
||||
else
|
||||
{
|
||||
//190906
|
||||
FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToShortDateString(), this.richTextBoxEx1.Text, this.richTextBoxEx1.Rtf);
|
||||
FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToString("yyyy-MM-dd"), this.richTextBoxEx1.Text, this.richTextBoxEx1.Rtf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -688,7 +688,7 @@ namespace FPJ0000.JobReport_
|
||||
//}
|
||||
|
||||
this.dr.uid = this.cmbUser.SelectedValue.ToString();
|
||||
this.dr.pdate = dtPdate.Value.ToShortDateString();
|
||||
this.dr.pdate = dtPdate.Value.ToString("yyyy-MM-dd");
|
||||
this.dr.status = cmbState.Text;
|
||||
this.dr.projectName = tbProject.Text;
|
||||
if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text);
|
||||
@@ -752,7 +752,7 @@ namespace FPJ0000.JobReport_
|
||||
mbody.gcode = FCOMMON.info.Login.gcode;
|
||||
mbody.cate = mf.cate;
|
||||
mbody.fromlist = "gw@amkor.co.kr";
|
||||
mbody.pdate = DateTime.Now.ToShortDateString();
|
||||
mbody.pdate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
mbody.subject = maildataupdate(mf.subject);
|
||||
mbody.body = maildataupdate(mf.body);
|
||||
mbody.wuid = FCOMMON.info.Login.no;
|
||||
@@ -778,10 +778,10 @@ namespace FPJ0000.JobReport_
|
||||
if (string.IsNullOrEmpty(org)) return string.Empty;
|
||||
org = org.Replace("{pname}", tbProject.Text);
|
||||
org = org.Replace("{pidx}", tbProjectIndex.Text);
|
||||
org = org.Replace("{sdate}", dtPdate.Value.ToShortDateString());
|
||||
org = org.Replace("{edate}", dtPdate.Value.ToShortDateString());
|
||||
org = org.Replace("{pdate}", dtPdate.Value.ToShortDateString());
|
||||
org = org.Replace("{DATE}", dtPdate.Value.ToShortDateString());
|
||||
org = org.Replace("{sdate}", dtPdate.Value.ToString("yyyy-MM-dd"));
|
||||
org = org.Replace("{edate}", dtPdate.Value.ToString("yyyy-MM-dd"));
|
||||
org = org.Replace("{pdate}", dtPdate.Value.ToString("yyyy-MM-dd"));
|
||||
org = org.Replace("{DATE}", dtPdate.Value.ToString("yyyy-MM-dd"));
|
||||
org = org.Replace("{NAME}", cmbUser.Text);
|
||||
org = org.Replace("{HR}", tbHrs.Text);
|
||||
org = org.Replace("{OT}", tbOt.Text);
|
||||
|
||||
@@ -273,7 +273,7 @@ namespace FPJ0000.JobReport_
|
||||
}
|
||||
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
|
||||
{
|
||||
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dts.Value.ToShortDateString());
|
||||
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dts.Value.ToString("yyyy-MM-dd"));
|
||||
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
|
||||
dts.Value = f.dtSelect;
|
||||
}
|
||||
@@ -329,7 +329,7 @@ namespace FPJ0000.JobReport_
|
||||
dr.enable = chkEnable.Checked;
|
||||
|
||||
this.dr.uid = this.cmbUser.SelectedValue.ToString();
|
||||
this.dr.pdate = dts.Value.ToShortDateString();
|
||||
this.dr.pdate = dts.Value.ToString("yyyy-MM-dd");
|
||||
this.dr.status = cmbGrp26.Text;
|
||||
this.dr.projectName = tbProject.Text;
|
||||
if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text);
|
||||
@@ -344,7 +344,7 @@ namespace FPJ0000.JobReport_
|
||||
this.dr.SetotNull();
|
||||
|
||||
//완료일자 적용 - 210803 chi <= 김윤선p
|
||||
if (checkBox1.Checked) dr.edate = dte.Value.ToShortDateString();
|
||||
if (checkBox1.Checked) dr.edate = dte.Value.ToString("yyyy-MM-dd");
|
||||
else dr.SetedateNull();
|
||||
|
||||
//MessageBox.Show(richTextBox1.Text);
|
||||
|
||||
@@ -29,8 +29,8 @@ namespace FPJ0000.JobReport_
|
||||
void RefreshList()
|
||||
{
|
||||
var cn = FCOMMON.DBM.getCn();
|
||||
var sd = dts.Value.ToShortDateString();
|
||||
var ed = dte.Value.ToShortDateString();
|
||||
var sd = dts.Value.ToString("yyyy-MM-dd");
|
||||
var ed = dte.Value.ToString("yyyy-MM-dd");
|
||||
var sql =
|
||||
$"select projectName,max(pidx) as pidx " +
|
||||
$" from JobReport" +
|
||||
@@ -135,8 +135,8 @@ namespace FPJ0000.JobReport_
|
||||
|
||||
|
||||
var cn = FCOMMON.DBM.getCn();
|
||||
var sd = dts.Value.ToShortDateString();
|
||||
var ed = dte.Value.ToShortDateString();
|
||||
var sd = dts.Value.ToString("yyyy-MM-dd");
|
||||
var ed = dte.Value.ToString("yyyy-MM-dd");
|
||||
if (cn.State == ConnectionState.Closed) cn.Open();
|
||||
var cmd = new System.Data.SqlClient.SqlCommand("", cn);
|
||||
|
||||
|
||||
@@ -88,8 +88,8 @@ namespace FPJ0000.JobReport_
|
||||
{
|
||||
|
||||
//근문일수,시간
|
||||
var vSD = dts.Value.ToShortDateString();
|
||||
var vED = dte.Value.ToShortDateString();
|
||||
var vSD = dts.Value.ToString("yyyy-MM-dd");
|
||||
var vED = dte.Value.ToString("yyyy-MM-dd");
|
||||
|
||||
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
|
||||
var taH = new dsReportTableAdapters.JobProjectTimesTableAdapter();
|
||||
|
||||
@@ -100,8 +100,8 @@ namespace FPJ0000.JobReport_
|
||||
{
|
||||
|
||||
//근문일수,시간
|
||||
// var vSD = dts.Value.ToShortDateString();
|
||||
//var vED = dte.Value.ToShortDateString();
|
||||
// var vSD = dts.Value.ToString("yyyy-MM-dd");
|
||||
//var vED = dte.Value.ToString("yyyy-MM-dd");
|
||||
var curww = int.Parse(DateTime.Now.ToString("yy") + "00") + int.Parse(tbWW.Tag.ToString());
|
||||
|
||||
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
|
||||
|
||||
@@ -92,8 +92,8 @@ namespace FPJ0000.JobReport_
|
||||
{
|
||||
|
||||
//근문일수,시간
|
||||
var vSD = dts.Value.ToShortDateString();
|
||||
var vED = dte.Value.ToShortDateString();
|
||||
var vSD = dts.Value.ToString("yyyy-MM-dd");
|
||||
var vED = dte.Value.ToString("yyyy-MM-dd");
|
||||
|
||||
//string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
|
||||
var taH = new dsReportTableAdapters.vJobReportForUserTableAdapter();
|
||||
|
||||
@@ -129,8 +129,8 @@ namespace FPJ0000.JobReport_
|
||||
fpSpread1.Sheets[0].AddSpanCell(5, 11, 2, 1);
|
||||
|
||||
//근문일수,시간
|
||||
var vSD = dts.Value.ToShortDateString();
|
||||
var vED = dte.Value.ToShortDateString();
|
||||
var vSD = dts.Value.ToString("yyyy-MM-dd");
|
||||
var vED = dte.Value.ToString("yyyy-MM-dd");
|
||||
|
||||
//휴가일수확인
|
||||
var drDays = taHolydayDateList.GetData(vSD, vED);
|
||||
|
||||
@@ -49,8 +49,8 @@ namespace FPJ0000.JobReport_
|
||||
|
||||
|
||||
//자료를 불러온다
|
||||
var sd = DateTime.Parse(dtSD.Text).ToShortDateString();
|
||||
var ed = DateTime.Parse(dtED.Text).ToShortDateString();
|
||||
var sd = DateTime.Parse(dtSD.Text).ToString("yyyy-MM-dd");
|
||||
var ed = DateTime.Parse(dtED.Text).ToString("yyyy-MM-dd");
|
||||
var db = new dsReportTableAdapters.vJobReportForUserTableAdapter();// EEEntities();
|
||||
|
||||
var gcode = "EET1P";
|
||||
@@ -62,7 +62,7 @@ namespace FPJ0000.JobReport_
|
||||
var rawdata = db.GetByDate(FCOMMON.info.Login.gcode, sd, ed).GroupBy(t => t.pdate);//.vJobReportForUser.AsNoTracking()
|
||||
//.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0)
|
||||
//.OrderBy(t => t.pdate).GroupBy(t => t.pdate);
|
||||
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString());
|
||||
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToString("yyyy-MM-dd"), ed.ToShortTimeString());
|
||||
|
||||
// var rawdata = rawdata0.GroupBy(t => t.pdate);
|
||||
|
||||
@@ -387,18 +387,18 @@ namespace FPJ0000.JobReport_
|
||||
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
|
||||
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
|
||||
var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
|
||||
dtSD.Text = sdDate.ToShortDateString();
|
||||
if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString())
|
||||
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
|
||||
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
|
||||
if (f.dtPick.SelectionStart.ToString("yyyy-MM-dd") == f.dtPick.SelectionEnd.ToString("yyyy-MM-dd"))
|
||||
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
|
||||
else
|
||||
dtED.Text = f.dtPick.SelectionEnd.ToShortDateString();
|
||||
dtED.Text = f.dtPick.SelectionEnd.ToString("yyyy-MM-dd");
|
||||
}
|
||||
|
||||
private void toolStripLabel4_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text));
|
||||
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
|
||||
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
|
||||
dtED.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
|
||||
}
|
||||
|
||||
private void chkallto_Click(object sender, EventArgs e)
|
||||
|
||||
Reference in New Issue
Block a user