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

2023-01-30 19:23:57 +09:00
parent 3a1fd6401c
commit f8842333a0
7 changed files with 67 additions and 30 deletions
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("23.01.25.0950")]
-[assembly: AssemblyFileVersion("23.01.25.0950")]
+[assembly: AssemblyVersion("23.01.30.1900")]
+[assembly: AssemblyFileVersion("23.01.30.1900")]
--- a/Project/fMain.Designer.cs
+++ b/Project/fMain.Designer.cs
@@ -139,6 +139,7 @@
            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
            this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
+            this.프로그램사용관련알림ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.cmTab.SuspendLayout();
            this.statusStrip1.SuspendLayout();
            this.menuStrip1.SuspendLayout();
@@ -502,7 +503,8 @@
            this.mn_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.aLLToolStripMenuItem,
            this.toolStripMenuItem2,
-            this.라인코드관리ToolStripMenuItem});
+            this.라인코드관리ToolStripMenuItem,
+            this.프로그램사용관련알림ToolStripMenuItem});
            this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
            this.mn_eq.Name = "mn_eq";
            this.mn_eq.Size = new System.Drawing.Size(203, 24);
@@ -510,20 +512,24 @@
            // 
            // aLLToolStripMenuItem
            // 
+            this.aLLToolStripMenuItem.Enabled = false;
+            this.aLLToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
            this.aLLToolStripMenuItem.Name = "aLLToolStripMenuItem";
-            this.aLLToolStripMenuItem.Size = new System.Drawing.Size(186, 24);
+            this.aLLToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
            this.aLLToolStripMenuItem.Text = "데이터 및 레포트";
            this.aLLToolStripMenuItem.Click += new System.EventHandler(this.aLLToolStripMenuItem_Click);
            // 
            // toolStripMenuItem2
            // 
            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(183, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(230, 6);
            // 
            // 라인코드관리ToolStripMenuItem
            // 
+            this.라인코드관리ToolStripMenuItem.Enabled = false;
+            this.라인코드관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
            this.라인코드관리ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem";
-            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(186, 24);
+            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
            this.라인코드관리ToolStripMenuItem.Text = "라인코드관리";
            this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click);
            // 
@@ -1063,6 +1069,13 @@
            this.toolStripButton3.ToolTipText = "휴가신청";
            this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
            // 
+            // 프로그램사용관련알림ToolStripMenuItem
+            // 
+            this.프로그램사용관련알림ToolStripMenuItem.Name = "프로그램사용관련알림ToolStripMenuItem";
+            this.프로그램사용관련알림ToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
+            this.프로그램사용관련알림ToolStripMenuItem.Text = "프로그램 사용 관련 알림";
+            this.프로그램사용관련알림ToolStripMenuItem.Click += new System.EventHandler(this.프로그램사용관련알림ToolStripMenuItem_Click);
+            // 
            // fMain
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1204,6 +1217,7 @@
        private System.Windows.Forms.ToolStripMenuItem 프로젝트스케쥴담당자사번업데이트ToolStripMenuItem;
        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem12;
        private System.Windows.Forms.ToolStripMenuItem 그룹정보ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 프로그램사용관련알림ToolStripMenuItem;
    }
 }

--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -1289,5 +1289,17 @@ namespace Project
 			var f = new FCM0000.fUserGroup();
 			f.ShowDialog();
 		}
+
+        private void 프로그램사용관련알림ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+			var dlg = FCOMMON.Util.MsgQ("프로그램이 분리되었습니다.\n\n" +
+				"지금 다운로드 URL을 열까요?\n\n문의\n\n장비기술팀 : 진재훈\n자동화기술팀 : 정재희");
+			if(dlg == DialogResult.Yes)
+            {
+				var url = "https://amkor-my.sharepoint.com/:u:/g/personal/chikyun_kim_amkor_co_kr/EX2HxdH5H9ZLqa8fyr0nD3QBQJxhdKfsfGZiJboAABBS5g?e=aaDVzZ";
+				Util.RunExplorer(url);
+
+			}
+        }
    }
 }
--- a/Project/fMain.resx
+++ b/Project/fMain.resx
@@ -452,14 +452,14 @@
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
        h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
-        /U7m/E+5XP8/92TF/3lzYj/UbMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPpVyp/1Z8q+d/yc2e
-        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vtkb+vV7o9blnWyHc
+        /U7m/E+5XP8/92TF/3lzYj/UbMj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
+        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vtEb8vV7o9blnWyHc
        gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
-        v2iNEH9c5vn/SobRnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
+        v2iNEH9c5vn/SobhnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
        LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
-        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+brgd7fQPo/MoaKnQGr
-        2d+jAdUG1LhtIjtQcP7Xbc3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
-        BQAEJaue5HIBbgAAAABJRU5ErkJggg==
+        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bLgd7fQPo/MoaKnQGr
+        2d+jAdUG1LhtIjtQcP6XrU3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
+        BQDvi6uR57RFnwAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs
+++ b/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)
            {
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
@@ -41,8 +41,16 @@ namespace FPJ0000.OtConfirm
            this.cmbUser.ValueMember = "id";
            this.cmbUser.DisplayMember = "dispname";

+            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 = "(휴가/외출)신청 추가";
@@ -380,11 +388,14 @@ 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

+            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;
--- a/SubProject/FPJ0000/Project/fProjectList.resx
+++ b/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>