pmp제거, ot 시간 없으면 null로 입력

SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs

@@ -798,6 +798,7 @@
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F;
             numberCellType3.MaximumValue = 999999999999999D;
             numberCellType3.MinimumValue = -999999999999999D;
+            numberCellType3.NullDisplay = "--";
             this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot";
             this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red;
@@ -815,7 +816,7 @@
             dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
             dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
             dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2021, 7, 23, 22, 53, 4, 0);
+            dateTimeCellType1.TimeDefault = new System.DateTime(2021, 7, 28, 22, 53, 4, 0);
             this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -826,7 +827,7 @@
             dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
             dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
             dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType2.TimeDefault = new System.DateTime(2021, 7, 23, 22, 53, 4, 0);
+            dateTimeCellType2.TimeDefault = new System.DateTime(2021, 7, 28, 22, 53, 4, 0);
             this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;

SubProject/FPJ0000/JobReport_/fJobReport.resx

@@ -260,20 +260,20 @@
   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZLdS1NhHMd3lX9CWBddClFaKRV1US61WYG9
-        WVmZTucUTW3owiBTp5FphiYqVIhSdFFRVnNqU2vO5UYzelmm5st8jU2Xez1Hd8769pyz1QyEfvDhuXjO
-        98P5fc8RcBN7VZN6pFqvTril/xlXpqfISfPUcKeBTqgeoA/d1Jn2yrV1mxMfr+NDqyf+er/W6qQXZyw2
-        1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ
-        QDlMobhtCul3TNQ/krgSNeXwrGBwhsWHGYacDN7zkhX0jS3j9ZCHCHwYnGdhmPOiQjUN4ZXeR3z4TE30
-        xKmyxF/SxhNIbziJhq5WlD+rgbAkHNEEUcUexCp2olZZy6/iohlYljyILehjeMHpauHT3i/taB+9jwZ9
-        IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T
-        8DFk3c2EdszNr9IzSkFNelhyexFX/s4v4Ca+so+WNYthHNOhyXAZN7oLcKbmAFLrE2E0e2AkxXIFa8f9
-        ndiIIFaxSrDvWol3V9EmJNeJMDg+gIq32VCoZEi6HYNWzQt8nGVgJMUOTHrxjmB1eiEsDQh2yEOlkfKN
-        yGs5h/ON8ThXe5CXyFTJkD/LJG8SA+5+cJrFe+4TE5ykyCiZzi+IlK+fjZRvIA+FIrIwFMerYpBzTwzt
-        kBoV6iJkPxFD0ngaRiIwkH9DTwS014dt+ZrgCvtl/fS8ncanWZanb2QOl5qzkEGC0qYkFLRc/HvH4Vlh
-        EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC
-        WIAFl5eHa95Fs7DYHD6KouxhFzq+BuICQVRWV06EpLN7u1Rti5A+p/+S4Sf8D5LndJikY2lLWkdPuFiV
-        LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZJZTxNRGIZ7pT/BoBdekhgFtUaNXijIUsAE
+        NwSiKEspBGQTajARIQUjshiQAIkaAtF4oQZUoCwFpJRCG4oRQQRkLUugtCxdZqAz5fXMtFpNSPySJ+fi
+        zPtkvndGwI3/A2X0xWKNIrREsxaQp6HISfOUcqeWDi3up4OfqEfOSlXlh8Le7uFDf0/Qo16VwUwb9ctG
+        1mTdgsnixmjmoPFjyYycT3pElozZRCnyva6oc0IK1YYlwxrbP2uHdo6BVs9AM8tAPbMN5c8ttI5ascUA
+        TWMUcj7MIe7ZCPWPJCC3ndq0bWNwnsWXeYacDAZ4yTZ6JrfQPmojAgcGl1hoF+0okOvhe7/rDR+OKPWZ
+        vp4XtiOpuoq4ymuobKtDfn0pfHO94EMQFZyBv+wkyprK+FUsNIOVdRv87/YwvCC82Pd913AzmideolKT
+        xUtuVwQj63UUUusiIa6+hNjqWDQNraB5xILGb5vYID0FyHppXiAqF+0NzE1jNePdeDUsQ5EyhZdEV4WQ
+        8GUkPk+AatLKr9I5QUFBeli32hGQ3+cUcBNU2ENn1MRAN6lGtfYeHndkIqL0AqIrwqCbtUFHiuUKVk05
+        OzERgb/sL8G5h7n2U9kHEVUuwuBUPwq6kyCTZyDyqR/qlB/xdYGBjhTbP2NHH8FgtsM3zyU4LvWQCKUH
+        kFp7AzergnCjLJCXZMijIK1PIG/iB+5+UM9igPvEBDMpUpiudgqE0n0LQul+8pAHhFkeuFLkh+QXMVCN
+        KlCgyEbSuxiIq8KhIwIt+Tc0REDbHfBOU7pXOJ/eSy9t0BhaYHl6xheRXpOIeBKUVEcis/bOnzsO2zZL
+        BI1uwVFimze5Bf/DSlbwTmhwC05nfLYNz6zs7PbwbhjXNx1HbjdZXHFSZGLH9NymzTw8u+qYXqUwbaAw
+        6WLVYufhmrfQLJaNGw6KojY8b7V8d8UFghOJbcne4taOYxKFyVvSQP8h3onXb8QNtKe4Zf1wbEunV4w8
+        TiAQCH4BkPChBKRJ4EwAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -402,14 +402,15 @@ namespace FPJ0000.JobReport_
                     return;
                 }
 
-                dr.ot = ot;
                 if(ot == 0)
                 {
+                    dr.SetotNull();
                     dr.SetotStartNull();
                     dr.SetotEndNull();
                 }
                 else
                 {
+                    dr.ot = ot;
                     dr.otStart = dateTimePicker1.Value;
                     dr.otEnd = dateTimePicker2.Value;
                 }
@@ -417,7 +418,7 @@ namespace FPJ0000.JobReport_
             }
             else
             {
-                dr.ot = 0;
+                dr.SetotNull();
                 dr.SetotStartNull();
                 dr.SetotEndNull();
             }

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs

@@ -118,8 +118,8 @@ namespace FPJ0000.JobReport_
             dts.Value = DateTime.Parse(dr.pdate);   //일자선택
 
             this.checkBox1.Checked = !dr.edate.isEmpty();
-            if(this.checkBox1.Checked)  dte.Value = DateTime.Parse(dr.edate);
-                
+            if (this.checkBox1.Checked) dte.Value = DateTime.Parse(dr.edate);
+
 
             cmbUser.SelectedValue = dr.uid;
             tbProject.Text = dr.projectName;
@@ -372,6 +372,25 @@ namespace FPJ0000.JobReport_
             this.dr.tag = tbTag.Text.Trim();
             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
             else this.dr.hrs = 0;
+
+
+            //ot 시간을 초기화한다. -- 210728 김윤선
+            if (double.TryParse(tbOt.Text, out double ot))
+            {
+                if (ot == 0.0)
+                {
+                    this.dr.SetotNull();
+                }
+                else
+                {
+                    this.dr.ot = ot;
+                }
+            }
+            else
+            {
+                this.dr.SetotNull();
+            }
+
             if (tbOt.Text != "") this.dr.ot = double.Parse(tbOt.Text);
             else this.dr.ot = 0;
             //this.dr.description = richTextBox1.Text.Trim();