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

..

Browse Source
This commit is contained in:
chi
2021-07-16 14:20:37 +09:00
parent 9e64a0d603
commit 8da7008d0b
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("21.07.16.1300")]
[assembly: AssemblyFileVersion("21.07.16.1300")]
[assembly: AssemblyVersion("21.07.16.1400")]
[assembly: AssemblyFileVersion("21.07.16.1400")]

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

@@ -443,7 +443,7 @@ namespace FPJ0000.JobReport_
//신규상태이다
if (this.dr.RowState == DataRowState.Added || this.dr.RowState == DataRowState.Detached)
//if (this.dr.RowState == DataRowState.Added || this.dr.RowState == DataRowState.Detached)
{
if (this.richTextBoxEx1.Text.isEmpty())
{
@@ -452,11 +452,25 @@ namespace FPJ0000.JobReport_
else
{
//뭔가 자료가 있는가?
if (this.richTextBoxEx1.Text.Length < 10)
var header = string.Empty;
var rt = new RichTextBoxEx.RichTextBoxEx();
rt.Rtf = dr.body;
if (rt.Text.Length > 10) header = rt.Text.Substring(0, 10).Trim();
else header = rt.Text.Trim();
rt.Dispose();
if (this.richTextBoxEx1.Text.StartsWith(header) ==false)
{
if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes)
//if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes)
{
this.richTextBoxEx1.Rtf = dr.body + this.richTextBoxEx1.Rtf;
var oldtext = this.richTextBoxEx1.Text;
this.richTextBoxEx1.Rtf = dr.body;
if (this.richTextBoxEx1.Text.isEmpty() == false)
this.richTextBoxEx1.Text += "\r\n\r\n"+oldtext;
//this.richTextBoxEx1.Text += oldtext;
}
}