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-06 13:36:20 +09:00
parent 9a40cbe37f
commit 488f51db94
11 changed files with 318 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,8 @@ namespace FBS0000
im.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
im2.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
tbSD.Text = DateTime.Now.ToString("yyyy-01") + "-01";
tbED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
dtSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
dtED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
//현재 사용자의 그룹명을 가져옴
var taQuery = new dsMSSQLTableAdapters.QueriesTableAdapter();
@@ -137,14 +137,14 @@ namespace FBS0000
//update data
seluid = GetUIDValue();
var sd = DateTime.Parse(tbSD.Text + " 00:00:00");
var ed = DateTime.Parse(tbED.Text + " 23:59:59");
var sd = DateTime.Parse(dtSD.Text + " 00:00:00");
var ed = DateTime.Parse(dtED.Text + " 23:59:59");
//sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00"));
//this.tbSD.Text = sd.ToShortDateString();
try
{
this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, FCOMMON.info.Login.gcode, seluid, tbED.Text);
this.ta.Fill(this.dsMSSQL.Holyday, dtSD.Text, FCOMMON.info.Login.gcode, seluid, dtED.Text);
this.dsMSSQL.Holyday.AcceptChanges();
}
catch (Exception ex)
@@ -403,7 +403,7 @@ namespace FBS0000
return;
}
string uid = GetUIDValue();
var f = new fHolydayJobReport(tbSD.Text, tbED.Text, uid);
var f = new fHolydayJobReport(dtSD.Text, dtED.Text, uid);
f.Show();
}
@@ -541,8 +541,8 @@ namespace FBS0000
{
var drv = this.bs.Current as DataRowView;
var dr = drv.Row as dsMSSQL.HolydayRow;
this.tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
this.tbED.Text = DateTime.Now.Year.ToString("0000") + "-12-31";
this.dtSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
this.dtED.Text = DateTime.Now.Year.ToString("0000") + "-12-31";
var username = string.Format("[{0}] {1}", dr.uid, dr.UserName);
this.cmbUser.Text = username;
RefreshData();
@@ -553,8 +553,8 @@ namespace FBS0000
var f = new FCOMMON.fSelectMonth();
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
tbSD.Text = sdDate.ToShortDateString();
tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
dtSD.Text = sdDate.ToShortDateString();
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
this.RefreshData();
}
@@ -635,7 +635,7 @@ namespace FBS0000
private void toolStripButton7_Click(object sender, EventArgs e)
{
seluid = GetUIDValue();
var f = new fHolyDayData(tbED.Text, seluid != "%" ? cmbUser.Text : string.Empty );
var f = new fHolyDayData(dtED.Text, seluid != "%" ? cmbUser.Text : string.Empty );
f.Show();
}
@@ -643,5 +643,30 @@ namespace FBS0000
{
}
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();
}
private void toolStripButton8_Click(object sender, EventArgs e)
{
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();
}
private void toolStripButton9_Click(object sender, EventArgs e)
{
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();
}
}
}