..

SubProject/FPJ0000/JobReport_/fJobReport.cs

@@ -393,6 +393,7 @@ namespace FPJ0000
         private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
         {
             var newdr = this.dsMSSQL.JobReport.NewJobReportRow();
+            newdr.status = "진행 중";
             newdr.pdate = DateTime.Now.ToShortDateString();
             if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday ||
                 DateTime.Now.DayOfWeek == DayOfWeek.Saturday) newdr.hrs = 0;

SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs

@@ -323,6 +323,7 @@
             this.cmbState.Name = "cmbState";
             this.cmbState.Size = new System.Drawing.Size(160, 20);
             this.cmbState.TabIndex = 4;
+            this.cmbState.SelectedIndexChanged += new System.EventHandler(this.chkform_indexchan);
             // 
             // cmbPackage
             // 
@@ -349,9 +350,12 @@
             // tam
             // 
             this.tam.BackupDataSetBeforeUpdate = false;
+            this.tam.EETGW_JobReport_AutoInputTableAdapter = null;
             this.tam.EETGW_JobReport_EBoardTableAdapter = null;
             this.tam.EETGW_NoteTableAdapter = null;
             this.tam.EETGW_ProjecthistoryDTableAdapter = null;
+            this.tam.EETGW_ProjectResonTableAdapter = null;
+            this.tam.EETGW_ProjectsScheduleTableAdapter = null;
             this.tam.EETGW_ProjectToDoTableAdapter = null;
             this.tam.EETGW_SaveCostTableAdapter = null;
             this.tam.JobReportTableAdapter = this.ta;
@@ -399,7 +403,7 @@
             this.richTextBoxEx1.Location = new System.Drawing.Point(0, 129);
             this.richTextBoxEx1.Name = "richTextBoxEx1";
             this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
-    "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
+    "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
     "Ex1\\par\r\n}\r\n";
             this.richTextBoxEx1.SetColorWithFont = true;
             this.richTextBoxEx1.ShowToolStrip = true;

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -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;
+
+                                }
+                            }
+                        }
+                    }
+                }
+
             }
         }
 

SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc

@@ -210,7 +210,7 @@
             <TablixBody>
               <TablixColumns>
                 <TablixColumn>
-                  <Width>1.12417cm</Width>
+                  <Width>1.46813cm</Width>
                 </TablixColumn>
               </TablixColumns>
               <TablixRows>
@@ -465,7 +465,7 @@
             </TablixRowHierarchy>
             <DataSetName>DataSet1</DataSetName>
             <Height>2.17042cm</Height>
-            <Width>7.26188cm</Width>
+            <Width>7.60584cm</Width>
             <Style>
               <Border>
                 <Style>None</Style>