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

@@ -160,7 +160,7 @@ namespace FPJ0000.JobReport_
if (this.richTextBoxEx1.Text.Trim() != "")
{
this.richTextBoxEx1.Focus();
this.richTextBoxEx1.Focus();
}
else
{
@@ -168,7 +168,7 @@ namespace FPJ0000.JobReport_
tbProject.SelectAll();
}
tbProject.Tag = tbProject.Text;
// if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description;
//editor
@@ -179,12 +179,12 @@ namespace FPJ0000.JobReport_
//ed.DisplayEditForm(this.panel1);
//ed.AllowRtf = true;
bInit = true;
}
// editform.editor ed;
// editform.editor ed;
void ctl_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
@@ -287,7 +287,7 @@ namespace FPJ0000.JobReport_
tbProject.Focus();
return;
}
if (cmbType.Text != "휴가" && string.IsNullOrEmpty( this.richTextBoxEx1.Text )==true)
if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
{
FCOMMON.Util.MsgE("진행 내용이 없습니다.");
this.richTextBoxEx1.Focus();
@@ -364,7 +364,7 @@ namespace FPJ0000.JobReport_
}
double hrs2 = 0.0;
if(double.TryParse(tbHrs.Text,out hrs2) ==false)
if (double.TryParse(tbHrs.Text, out hrs2) == false)
{
FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요");
tbHrs.Focus();
@@ -421,6 +421,49 @@ namespace FPJ0000.JobReport_
if (predr["process"] != DBNull.Value)
cmbProcess.Text = predr["process"].ToString(); //190506
}
}
chkform_indexchan(sender, e);
}
void chkform_indexchan(object sender, EventArgs e)
{
if (cmbType.Text.Trim() != "" &&
cmbType.SelectedIndex >= 0 && cmbState.Text.Trim().isEmpty() == false)
{
//해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
var formname = cmbType.Text.Trim() + "|" + cmbState.Text.Trim();
var db = new EEEntities();
var dr = db.EETGW_DocuForm.Where(t => t.cate == "J1" && t.title == formname).FirstOrDefault();
if (dr != null)
{
//신규상태이다
if (this.dr.RowState == DataRowState.Added || this.dr.RowState == DataRowState.Detached)
{
if (this.richTextBoxEx1.Text.isEmpty())
{
this.richTextBoxEx1.Rtf = dr.body;
}
else
{
//뭔가 자료가 있는가?
if (this.richTextBoxEx1.Text.Length < 10)
{
if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes)
{
this.richTextBoxEx1.Rtf = dr.body + this.richTextBoxEx1.Rtf;
}
}
}
}
}
}
}