..

2023-12-28 10:24:51 +09:00
parent 6e925857b3
commit 6e091f6218
11 changed files with 217 additions and 167 deletions
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs
@@ -77,6 +77,9 @@
            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
            this.dv1 = new arCtl.arDatagridView();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.외출완료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
            this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -94,9 +97,6 @@
            this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.외출완료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
            ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
            this.bn.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -525,6 +525,24 @@
            this.dv1.TabIndex = 3;
            this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError);
            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.외출완료ToolStripMenuItem});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26);
+            // 
+            // 외출완료ToolStripMenuItem
+            // 
+            this.외출완료ToolStripMenuItem.Name = "외출완료ToolStripMenuItem";
+            this.외출완료ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+            this.외출완료ToolStripMenuItem.Text = "외출 완료";
+            this.외출완료ToolStripMenuItem.Click += new System.EventHandler(this.외출완료ToolStripMenuItem_Click);
+            // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
            // uidDataGridViewTextBoxColumn
            // 
            this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid";
@@ -578,6 +596,7 @@
            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
            dataGridViewCellStyle3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold);
            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
+            dataGridViewCellStyle3.Format = "N1";
            this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle3;
            this.HolyTimes.HeaderText = "대체시간";
            this.HolyTimes.Name = "HolyTimes";
@@ -667,24 +686,6 @@
            this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
            this.remarkDataGridViewTextBoxColumn.Width = 64;
            // 
-            // contextMenuStrip1
-            // 
-            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.외출완료ToolStripMenuItem});
-            this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26);
-            // 
-            // 외출완료ToolStripMenuItem
-            // 
-            this.외출완료ToolStripMenuItem.Name = "외출완료ToolStripMenuItem";
-            this.외출완료ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
-            this.외출완료ToolStripMenuItem.Text = "외출 완료";
-            this.외출완료ToolStripMenuItem.Click += new System.EventHandler(this.외출완료ToolStripMenuItem_Click);
-            // 
-            // ta
-            // 
-            this.ta.ClearBeforeFill = true;
-            // 
            // fHolyRequest
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -754,6 +755,10 @@
        private System.Windows.Forms.ToolStripLabel sbtime;
        private System.Windows.Forms.ToolStripButton toolStripButton8;
        private System.Windows.Forms.ToolStripButton toolStripButton7;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem 외출완료ToolStripMenuItem;
        private System.Windows.Forms.DataGridViewTextBoxColumn uidDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn;
@@ -771,9 +776,5 @@
        private System.Windows.Forms.DataGridViewTextBoxColumn Response;
        private System.Windows.Forms.DataGridViewTextBoxColumn HolyBackup;
        private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.ToolStripButton toolStripButton1;
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem 외출완료ToolStripMenuItem;
    }
 }
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx
@@ -130,7 +130,7 @@
  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -141,7 +141,7 @@
  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -150,7 +150,7 @@
  <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
        oAc0QjgAAAAASUVORK5CYII=
@@ -159,7 +159,7 @@
  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
@@ -527,7 +527,8 @@ namespace FPJ0000.OtConfirm
            if (uiddt == null) return;
            var uid = uiddt.ToString();
            if (uid.isEmpty()) return;
-
+            if (uid == "System.Data.DataRowView") return;
+            if (updateuserinfo.Equals(uid)) return;

            var basedate = DateTime.Now.AddDays(-1).ToShortDateString();
            holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, basedate);
@@ -537,19 +538,19 @@ namespace FPJ0000.OtConfirm
            foreach (var item in holydata)
            {
                var val = item.Value.Split('|');
-                if (val[2] != "0")
+                if (val[0] != "0" || val[2] != "0")
                {
                    var perc = 0f;
                    if (val[0] != "0") perc = float.Parse(val[1]) / float.Parse(val[0]);
                    if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc * 100:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[2]:N1}일 남음({perc * 100:N1}%사용)");
                }
-                else if (val[5] != "0")
+                else if (val[3] != "0" || val[5] != "0")
                {
                    var perc = 0f;
                    if (val[3] != "0") perc = float.Parse(val[4]) / float.Parse(val[3]);
                    if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc * 100:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[5]:N1}시간 남음({perc * 100:N1}%사용)");
                }

            }