...

2021-12-25 21:34:14 +09:00
parent 9ef9971c99
commit 5aa0cf84a0
7 changed files with 110 additions and 74 deletions
--- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs
+++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs
@@ -174,6 +174,7 @@
            // 
            this.bindingNavigatorPositionItem.AccessibleName = "위치";
            this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
            this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
            this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
            this.bindingNavigatorPositionItem.Text = "0";
@@ -339,6 +340,7 @@
            // tbSD
            // 
            this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
            this.tbSD.Name = "tbSD";
            this.tbSD.Size = new System.Drawing.Size(100, 31);
            this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -353,6 +355,7 @@
            // tbED
            // 
            this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F);
            this.tbED.Name = "tbED";
            this.tbED.Size = new System.Drawing.Size(100, 31);
            this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -522,7 +525,7 @@
            dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
            dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
            dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2021, 12, 20, 18, 33, 49, 994);
+            dateTimeCellType1.TimeDefault = new System.DateTime(2021, 12, 25, 21, 27, 32, 750);
            this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1;
            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate";
            this.fpSpread1_Sheet1.Columns.Get(1).Label = "일자";
@@ -662,7 +665,7 @@
            this.Controls.Add(this.toolStrip1);
            this.Controls.Add(this.bn);
            this.Name = "fHolyday";
-            this.Text = "연차관리";
+            this.Text = "근태 입력";
            this.Load += new System.EventHandler(this.@__Load);
            this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.fHolyday_KeyPress);
            ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
--- a/SubProject/FBS0000/Holiday/fHolyday.resx
+++ b/SubProject/FBS0000/Holiday/fHolyday.resx
@@ -197,23 +197,6 @@
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
-        Dwoi+hCno6uoiVlGI7sI6iKQqJxDbEuyNMem7ivmNtsHfpxoH9jSo25Nl86lsJ3Tzpzj6T1neWy4C1/4
-        cXgP/J/3d55zzg5+URRVOfJchuHmKlhrD4LcOr5N9vPDh91uNzPmdYHyOmG+UYH19fVtIYQolcqder3+
-        puWpHG6VHObrFUin0wWwLAuGYUSSySSy2Ww+oNDAAdNV6ZaAjZANUqkU1tbWCg1MT+RwtTfAdEUKjuME
-        HnRH0KyN4B6hSRNGU1cYjQTeQgwQDTx5g6HLUmQyGQF+WOuIQ0N4a4+jaziOO51zQgBvVWAw1NqAL6/q
-        MXipXEjn+f9UBRm8q6Zxu4MWOohGo7miBoYL5UJBfADHpeH0R9DnmUKXPYL3rgUYqShWfy9hZWWFIQFH
-        Nw2U9Rh5KYPhfNm/YQ4a2zQGqSVM/2Ixl+AwOpOE+dsyLGOzSCQSRTrwOKA/WyoE8B189MQwOZ/CWPgP
-        PLMs3IRAjEPPSBg+nw8lJSUnRIOBhzI42+qgqy4VS+y0hUHHOXhmGLhoBrZQCtRPDu+c81hcXNxqMEEM
-        +qsOiCX2kGeeXGDhnMoP80xEOaiMP7Z+iQP362B/UYv+M5sBDl8Mo3QSX8mQN5zGODl9wJdCu9aAKGUq
-        btB3WoJcLie8ieVVFt7vcfSSLj64Y1Bb5/Baa0TArMa4qgFNNftaBAOFQiHprj4E3bVj6D0lAU3TCIVC
-        CAaD8Pv9QmGBQEC4Oj+9wWjHLcxa2qBrrUwTi/yqLdt18tGRPY/rpLtlZFvs1xVprNnb8ll5kbM+O4e/
-        RjjIJC1kw30AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR
@@ -228,6 +211,23 @@
        DfrOFiObzQpvYnWNhetHFL2ki4+OMFSmBbzR6OA1qDCprEdj9YFmwUAulxd3Vx3BwI0T6D1TDJqm4ff7
        4fP54PF4hMK8Xq9wtX5+i/GOO5g3tmGgtSJFLHKrpnTP6cfH9j2pleyVkm2hX1ekoXp/8xfFZc70/AL+
        Aj9IyCGwUBkWAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR
+        hYKILuLc6ClqYpbRyB6CeggkKucQ25IsTZmXXQzdpV3wcqJtYkuPbid1zbkmbOe0M9349j9neWy4B//w
+        4fA/8Pv+P+d7ztkhLIqiKhzP5RhtrMRwzUGQW8e3yX5h+LDL5WLHPU5QHjvMN8qRyWS2hRiiVqt3GgyG
+        m5anSrg0SpivlyOVSuXBcRxYlpVIJBJYX1/PBeQb2GC6KtsSsBGyQTKZxNraWr6B6YkSzlYFTFdk4Hle
+        5EEng0Y9g3uEBl0IDR0h1BMECylAMnDnDIYuy5BOp0WEYb0tCh3hrTWKjtEo7rQHxQDBKs9gqFmBL6/q
+        MHipTEwX+P9UFRm8q6Vxu40WO2AYJlvQoP9CmViQEMDzKdh9DHrcM+iwMnjvXIKRWsDq72XE43GWBBzd
+        NFDXwfFSjv7zpf+GeehGZjFILWP2F4dgjMfYXALmbyuwjM8jFosV6MBtg+FsiRggdPDRHcb0YhLjoT9w
+        z3NwEfxhHl2OELxeL4qKik5IBgMP5bC31KKvqkQqsX0kBDrKwz3HwkmzGAkkQf3k8c6+iEgkstVgkhj0
+        Vh6QSuwizzy9xME+kxsWmFzgoTH+2PolDtyvhfVFDXrPbAbYvGGM0Ql8JUOeUAoT5PQBbxKt+n4sUKbC
+        Bj2ni5HNZsU3sbLKwfM9im7SxQdXGNrhIF7rjfCbtZjQKNBQva9JNFCpVMWdVYfQd+0Yuk8Vg6ZpBAIB
+        TE1NwefziYX5/X7xav/0BmNttzBvaUFfc0WKWORWTemuk4+O7HlcK9stJ9tCv65EffXeps/qi/zws3P4
+        CzhYyB5xw8wTAAAAAElFTkSuQmCC
 </value>
  </data>
  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -303,7 +303,7 @@
        cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
        AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
        K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
-        AAD/////AQgAAP////8AAQgAAAs=
+        AAD///////////////8A/////ws=
 </value>
  </data>
  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs
@@ -140,7 +140,9 @@ namespace FPJ0000
            e.Row["name"] = FCOMMON.info.Login.nameK;
            e.Row["dept"] = FCOMMON.info.Login.dept;
            e.Row["conf"] = 0;
-            e.Row["remark"] = "사유:\r\n행선지:\r\n업무백업:";
+            e.Row["remark"] = string.Empty;
+            e.Row["holydays"] = 0;
+            e.Row["holytimes"] = 0f;

        }

@@ -238,7 +240,7 @@ namespace FPJ0000
            var newdr = this.dSKuntae.EETGW_HolydayRequest.NewEETGW_HolydayRequestRow();
            newdr.sdate = DateTime.Now.ToShortDateString();
            newdr.edate = DateTime.Now.ToShortDateString();
-            newdr.HolyDays = 1;
+            newdr.HolyDays = 0;
            newdr.HolyTimes = 0f;
            newdr.cate = "연차";
            var f = new OtConfirm.fHolyRequestAdd(newdr);
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs
@@ -63,6 +63,7 @@ namespace FPJ0000.OtConfirm
            this.tbResponse = new System.Windows.Forms.RichTextBox();
            this.button1 = new System.Windows.Forms.Button();
            this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
+            this.cmbPreset = new System.Windows.Forms.ComboBox();
            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit();
            this.grpUser.SuspendLayout();
@@ -331,13 +332,14 @@ namespace FPJ0000.OtConfirm
            // 
            // grpAdmin
            // 
+            this.grpAdmin.Controls.Add(this.cmbPreset);
            this.grpAdmin.Controls.Add(this.rad2);
            this.grpAdmin.Controls.Add(this.rad1);
            this.grpAdmin.Controls.Add(this.rad0);
            this.grpAdmin.Controls.Add(this.tbResponse);
            this.grpAdmin.Location = new System.Drawing.Point(12, 520);
            this.grpAdmin.Name = "grpAdmin";
-            this.grpAdmin.Size = new System.Drawing.Size(788, 228);
+            this.grpAdmin.Size = new System.Drawing.Size(788, 242);
            this.grpAdmin.TabIndex = 1;
            this.grpAdmin.TabStop = false;
            this.grpAdmin.Text = "관리자";
@@ -379,15 +381,15 @@ namespace FPJ0000.OtConfirm
            // tbResponse
            // 
            this.tbResponse.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Response", true));
-            this.tbResponse.Location = new System.Drawing.Point(26, 80);
+            this.tbResponse.Location = new System.Drawing.Point(26, 115);
            this.tbResponse.Name = "tbResponse";
-            this.tbResponse.Size = new System.Drawing.Size(744, 125);
+            this.tbResponse.Size = new System.Drawing.Size(744, 113);
            this.tbResponse.TabIndex = 3;
            this.tbResponse.Text = "";
            // 
            // button1
            // 
-            this.button1.Location = new System.Drawing.Point(12, 760);
+            this.button1.Location = new System.Drawing.Point(12, 768);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(788, 72);
            this.button1.TabIndex = 2;
@@ -399,6 +401,21 @@ namespace FPJ0000.OtConfirm
            // 
            this.ta.ClearBeforeFill = true;
            // 
+            // cmbPreset
+            // 
+            this.cmbPreset.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
+            this.cmbPreset.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbPreset.FormattingEnabled = true;
+            this.cmbPreset.Items.AddRange(new object[] {
+            "연차",
+            "하기",
+            "대체"});
+            this.cmbPreset.Location = new System.Drawing.Point(26, 74);
+            this.cmbPreset.Name = "cmbPreset";
+            this.cmbPreset.Size = new System.Drawing.Size(744, 35);
+            this.cmbPreset.TabIndex = 6;
+            this.cmbPreset.SelectedIndexChanged += new System.EventHandler(this.cmbPreset_SelectedIndexChanged);
+            // 
            // fHolyRequestAdd
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -458,5 +475,6 @@ namespace FPJ0000.OtConfirm
        private System.Windows.Forms.TextBox tbTimes;
        private System.Windows.Forms.TextBox tbDays;
        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.ComboBox cmbPreset;
    }
 }
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
@@ -69,7 +69,7 @@ namespace FPJ0000.OtConfirm
        private void fHolyRequestAdd_Load(object sender, EventArgs e)
        {
            curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
-
+          

            //관리자라면 관리자패널을 활성해준다.
            if (dr.RowState == DataRowState.Detached)
@@ -79,9 +79,13 @@ namespace FPJ0000.OtConfirm
            else
            {
                grpAdmin.Enabled = curLevel >= 5;
+                var 관리자사전멘트 = FCOMMON.DBM.getCodeList("54");
+                cmbPreset.Items.Clear();
+                cmbPreset.Items.Add(" -- 저장된 문구를 선택하세요(공용:54) --");
+                cmbPreset.Items.AddRange(관리자사전멘트.Select(t => t.Value).ToArray());
+                cmbPreset.SelectedIndex = 0;
            }

-
        }

        private void button1_Click(object sender, EventArgs e)
@@ -101,7 +105,17 @@ namespace FPJ0000.OtConfirm
                FCOMMON.Util.MsgE("시작일~종료일 범위를 확인하세요");
                return;
            }
+            var vDay = 0;
+            var vTime = 0f;

+            if (tbDays.Text.IsNumeric()) vDay = int.Parse(tbDays.Text.Trim());
+            if (tbTimes.Text.IsNumeric()) vTime = float.Parse(tbTimes.Text.Trim());
+
+            if (vDay < 1 && vTime < 0.1)
+            {
+                FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요");
+                return;
+            }
            if (dr.RowState == DataRowState.Detached)
            {
                var dlg = FCOMMON.Util.MsgQ("입력을 완료하시겠습니까?\r\n관리자에게 메일로 알림이 발생 합니다");
@@ -118,17 +132,7 @@ namespace FPJ0000.OtConfirm
                }
            }

-            var vDay = 0;
-            var vTime = 0f;
-
-            if (tbDays.Text.IsNumeric()) vDay = int.Parse(tbDays.Text.Trim());
-            if (tbTimes.Text.IsNumeric()) vTime = float.Parse(tbTimes.Text.Trim());
-
-            if (vDay < 1 && vTime < 0.1)
-            {
-                FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요");
-                return;
-            }
+     

            dr.HolyReason = tbReason.Text.Trim();
            dr.HolyLocation = tbLocation.Text.Trim();
@@ -151,6 +155,15 @@ namespace FPJ0000.OtConfirm
            DialogResult = DialogResult.OK;
        }

+        private void button2_Click(object sender, EventArgs e)
+        {
+            
+        }

+        private void cmbPreset_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cmbPreset.SelectedIndex > 0)
+                tbResponse.Text = cmbPreset.Text;
+        }
    }
 }