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

문자편집기 창 별도 추가했음,

Browse Source 
휴가내역 정렬 수정
This commit is contained in:
chi
2020-06-05 13:10:14 +09:00
parent a844e35d0b
commit bd442b73a8
20 changed files with 2697 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
SubProject/FPJ0000/Project/fProjectData.cs
View File

@@ -56,6 +56,10 @@ namespace FPJ0000
this.cmbPart.DataSource = dt_part;
this.bs.DataSource = dr;
if (string.IsNullOrEmpty(dr.CMP_After) == false) rtAft.Rtf = dr.CMP_After;
if (string.IsNullOrEmpty(dr.CMP_Before) == false) rtBef.Rtf = dr.CMP_Before;
if (string.IsNullOrEmpty(dr.CMP_Description) == false) rtDesc.Rtf = dr.CMP_Description;
if (string.IsNullOrEmpty(dr.CMP_Background) == false) rtBack.Rtf = dr.CMP_Background;
//주간일지내역을 업데이트
refresh_History();
@@ -64,9 +68,14 @@ namespace FPJ0000
{
if (dr.idx >= 0)
this.taSchedule.Fill(this.dsPRJ.ProjectsSchedule, this.dr.idx);
}
catch (System.Exception ex)
{
rtBack.Text = rtDesc.Text = rtAft.Text = rtBef.Text = "";
System.Windows.Forms.MessageBox.Show(ex.Message);
}
this.cmbProcess.Text = dr.process;
@@ -105,6 +114,10 @@ namespace FPJ0000
this.dr.status = cmbState.Text;
this.dr.part = cmbPart.Text;
this.dr.category = cmbCate.Text;
this.dr.CMP_After = rtAft.Rtf;
this.dr.CMP_Before = rtBef.Rtf;
this.dr.CMP_Description = rtDesc.Rtf;
this.dr.CMP_Background = rtBack.Rtf;
this.Validate();
this.bs.EndEdit();
@@ -220,12 +233,12 @@ namespace FPJ0000
{
if (tbPath.Text == "") tbPath.Text = "/" + tbIdx.Text;
if(tbPath.Text.StartsWith("\\")==false)
if (tbPath.Text.StartsWith("\\") == false)
{
if (tbPath.Text.StartsWith("/")) tbPath.Text = tbPath.Text.Replace("/", "\\");
else tbPath.Text = "\\" + tbPath.Text;
}
var serverpath = @"\\10.131.36.57\Data\Project";
if (System.IO.Directory.Exists(serverpath) == false)
{
@@ -241,7 +254,7 @@ namespace FPJ0000
{
System.IO.Directory.CreateDirectory(path);
string[] subdir = new string[] { "Source", "Document", "Draw","Estimate" };
string[] subdir = new string[] { "Source", "Document", "Draw", "Estimate" };
foreach (var dir in subdir)
System.IO.Directory.CreateDirectory(path + "\\" + dir);
@@ -297,6 +310,22 @@ namespace FPJ0000
SelectDate(textBox1);
}
private void bs_CurrentChanged(object sender, EventArgs e)
{
}
private void rtBack_Click(object sender, EventArgs e)
{
}
private void rtBack_DoubleClick(object sender, EventArgs e)
{
var rt = sender as System.Windows.Forms.RichTextBox;
var f = new Note.fTextEditor(rt.Rtf);
if (f.ShowDialog() == DialogResult.OK)
rt.Rtf = f.richTextBoxEx1.Rtf;
}
}
}