This commit is contained in:
chi
2021-07-16 13:53:52 +09:00
parent 7b7c5d1f4f
commit 9e64a0d603
37 changed files with 2215 additions and 140 deletions

View File

@@ -95,7 +95,7 @@ namespace FPJ0000
data.champion = string.Empty;
data.duedate = "미 할당";
data.project = -1;
data.reserve = string.Empty;
data.reserve = dr.reserve; // string.Empty; 예약자는 그대로 한다.
}
else
{
@@ -381,6 +381,17 @@ namespace FPJ0000
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
var currentime = this.ctlLayout1.items[this.no - 1];
if (currentime.project == -1 && currentime.reserve.isEmpty() == false)
{
//프로젝트가 할당된 상태가 아니다.
if (currentime.reserve != FCOMMON.info.Login.nameK)
{
FCOMMON.Util.MsgE($"다음 예약자 {currentime.reserve} 가 아닙니다.\r\n해당 예약자가 취소해야 등록 가능 합니다");
return;
}
}
var f = new FCM0000.fLovProject(string.Empty, "진행");
if (f.ShowDialog() == DialogResult.OK)
{
@@ -399,7 +410,7 @@ namespace FPJ0000
newdr.col = 1;
newdr.rowspan = 1;
newdr.colspan = 1;
newdr.wdate = DateTime.Now;
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
db.EETGW_Project_Layout.Add(newdr);
db.SaveChanges();
@@ -587,18 +598,18 @@ namespace FPJ0000
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
if(this.project < 1)
if (this.project < 1)
{
FCOMMON.Util.MsgE("선택된 프로젝트가 없습니다");
return;
}
var dlg = FCOMMON.Util.MsgQ("슬롯 " + this.no.ToString() + "의 프로젝트를 해제 할까요?\n" +
"해당 슬롯은 '미사용'이 됩니다");
if(dlg == DialogResult.Yes)
if (dlg == DialogResult.Yes)
{
var db = new EEEntities();
var dr= db.EETGW_Project_Layout.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.no == this.no).FirstOrDefault();
if(dr != null)
var dr = db.EETGW_Project_Layout.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.no == this.no).FirstOrDefault();
if (dr != null)
{
dr.project = -1;
db.SaveChanges();