외출입력시 빈값 00:00 이 보이지 않게 수정(정봉석p)

SubProject/FPJ0000/OtConfirm/fHolyRequest.cs

@@ -273,8 +273,8 @@ namespace FPJ0000
             newdr.HolyDays = 0;
             newdr.HolyTimes = 0f;
             newdr.cate = "년차";
-            newdr.stime = "00:00";
-            newdr.etime = "00:00";
+            //newdr.stime = "00:00";
+            //newdr.etime = "00:00";
             var f = new OtConfirm.fHolyRequestAdd(newdr);
             if (f.ShowDialog() == DialogResult.OK)
             {

SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs

@@ -41,8 +41,16 @@ namespace FPJ0000.OtConfirm
             this.cmbUser.ValueMember = "id";
             this.cmbUser.DisplayMember = "dispname";
 
-            this.textBox1.Text = dr.stime;
-            this.textBox2.Text = dr.etime;
+            if (dr.IsstimeNull() == false)
+                this.textBox1.Text = dr.stime;
+            else
+                this.textBox1.Text = "00:00";
+
+            if (dr.IsetimeNull() == false)
+                this.textBox2.Text = dr.etime;
+            else
+                this.textBox2.Text = "00:00";
+
             if (dr.RowState == DataRowState.Detached)
             {
                 this.Text = "(휴가/외출)신청 추가";
@@ -215,7 +223,7 @@ namespace FPJ0000.OtConfirm
                 }
 
                 //추가시에는 종료시간을 입력하지 않게한다.
-                if(dr.RowState == DataRowState.Detached)
+                if (dr.RowState == DataRowState.Detached)
                 {
                     if (textBox2.Text.IndexOf(":") == -1 || textBox2.Text.Equals("00:00"))
                     {
@@ -245,7 +253,7 @@ namespace FPJ0000.OtConfirm
                     return;
                 }
 
-                if(textBox2.Text.Equals("00:00")==false)
+                if (textBox2.Text.Equals("00:00") == false)
                 {
                     var st = DateTime.Parse(tbSD.Value.ToShortDateString() + " " + textBox1.Text + ":00");
                     var et = DateTime.Parse(tbED.Value.ToShortDateString() + " " + textBox2.Text + ":00");
@@ -380,12 +388,15 @@ namespace FPJ0000.OtConfirm
                 dr.Remark = tbRemark.Text.Trim();
 
             dr.Response = tbResponse.Text.Trim();
+
             dr.sdate = tbSD.Value.ToShortDateString();
             dr.edate = tbED.Value.ToShortDateString();
             dr.sendmail = chkSendMail.Checked; //220104
 
-            dr.stime = textBox1.Text.Trim();
-            dr.etime = textBox2.Text.Trim();
+            if (textBox1.Text.isEmpty() == false && textBox1.Text.Equals("00:00") == false)
+                dr.stime = textBox1.Text.Trim();
+            if (textBox2.Text.isEmpty() == false && textBox2.Text.Equals("00:00") == false)
+                dr.etime = textBox2.Text.Trim();
 
             dr.HolyDays = vDay;
             dr.HolyTimes = vTime;//

SubProject/FPJ0000/Project/fProjectList.resx

@@ -230,16 +230,16 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF
-        SKESs3bThtoYFRWWrimXuVLWWotRWW7pZGrq0pb01b7Mvmy3NjdbWxnd091nh+6WP9ULHg7u/TwPbz68
-        qf/G5PyI9ltBGGzvoe+fx8m+N9Ayrx6LYwm9IzFdz/DiQs+jKCzuCLoeRkAl07+Qq3rayIkZCYwn9j3X
-        S532tcDg1UE/rMUJdyP5WWd+BjEjodvzlcz75q6ACVyGZeYiKOQgGA5dml2zwDwUIfNsKKs3jGwJhoMX
-        /JKCKqtCVcHsQlmnHOouhcRP2cZCYleGSCINzdnJlYIqa6lKSZdwzUNNaBtpRvm5HSQo0D8ayhQ4JsJw
-        jIfgmgrh7Zcl7DWOkwJ1b6lKQW/ntPfqscdcjuJTBZC3bsGALwyboDH27w1ef0qgotUHFbOzsoyWc42u
-        OsjoQq6Izttmur2ARGoZ9gmWeB38lxSQLfgN7LxqbAeg7C5B9fV9OOo8jM30Bm4jvX6rsFGb/QPiyWU4
-        J1ncmcqIGnzCYim1+rKaq5XQe7Q44qhBMV3A5TdlwgItA++w+O0n7vozGzyY4Q/JNc0iW+pOJWTthSjS
-        5yH/+LqVsIDuxjwpGOSDQpgU3OQfIpsXwTg0Jt+ad6C99hIxvsD9NEK8ngBfIARytcno+S1mJDQwzxFd
-        +gE2nsbnaApBNglqt8GLXMka7jvEjIRjlrnR2o5AsrZjFtXn/dh/ZvVe/hGK+gOGgSyOMlw1+wAAAABJ
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUpeTlkYLDJQi
+        pFCJWbtpQ5eMigpL15TLXClrrcWoLLd0MjV1aUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68
+        qf/G6PgIw60A9Nb30A0s4GT/G2iYV4/FsYS+0ai2d2RpsfdRBGZXGN0Pw6CS6V/IVQNt4MSMBMYd/Z7r
+        pU57W6H3aKEb0eCEq4n8rDc9g5iR0OP+Sub981fA+C/DPHsRFHIQDIcuza1ZYBoOk3k2lMUTQrYEw8EL
+        PklBtUWhrGR2oaxLDlW3QuKnrONBsStDOJ6G+uzUSkG1pVRZQZdwLcPNaB9tQfm5HSQoMDAWzBTYJ0Ow
+        TwThnA7i7ZcE9nZMkAJVX6lSQW/nNPcasMdUjuJTBZC3bcGgNwSroHH27w1ef4qjss0LJbOzqoyWc03O
+        esjoQq6IzttmvL2IeGoZtkmWeO38lxSQLfgNbLxqrQdQ0VOCmuv7cNRxGJvpDdxGev1WYaN22wfEkstw
+        TLG4M50RNfSERSK1+rLqq1XQuTU4Yq9FMV3A5TdnwgKtg++w9O0n7voyGzyY5Q/JOcMiW6quCsgMhSjS
+        5SH/+LqVsID2xgIpGOKDQpgU3OQfIpsXgRjURu+ad6C59hJRvsD1NEy8bj9fIARytanD/VvMSGhkniOS
+        +AE2lsbnSAoBNglqt96DXMka79vFjIRj5vmxuk5/sq5zDjXnfdh/ZvVe/hGK+gN/kyyMXKtb+AAAAABJ
         RU5ErkJggg==
 </value>
   </data>