otPMS추가(테스트버젼)

SubProject/FPJ0000/OtConfirm/fOTConfirm.cs

@@ -1,4 +1,6 @@
-using System;
+using FarPoint.Win.Spread;
+using FPJ0000.OtConfirm;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -411,6 +413,12 @@ namespace FPJ0000
         private void toolStripButton1_Click(object sender, EventArgs e)
         {
             //전체승인
+            using(var f = new fOTConfirmValue())
+            {
+                if (f.ShowDialog() != DialogResult.OK) return;
+            }
+
+
             var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?\n휴일에는 1.5x 가 적용 됩니다");
             if (dlg != DialogResult.Yes) return;
 
@@ -446,11 +454,6 @@ namespace FPJ0000
 
         private void toolStripButton3_Click(object sender, EventArgs e)
         {
-            //var drv = this.bs.Current as DataRowView;
-            //if (drv == null) return;
-            //var dr = drv.Row as dsPRJ.JobReportRow;
-
-
             List<dsPRJ.JobReportRow> rows = new List<dsPRJ.JobReportRow>();
             List<int> rowindex = new List<int>();
             foreach (DataGridViewCell cell in dv1.SelectedCells)
@@ -461,7 +464,7 @@ namespace FPJ0000
                 if (rowindex.Contains(cell.RowIndex) == false) rowindex.Add(cell.RowIndex);
             }
 
-
+            //데이터를 외부 폼에 전송하여 값을 셋팅해온다
             using (var f = new OtConfirm.fOTConfirmOK(rows.ToArray()))
             {
                 if (f.ShowDialog() == DialogResult.OK)
@@ -506,5 +509,10 @@ namespace FPJ0000
             dtSD.Text = sd.ToShortDateString();
             dtED.Text = ed.ToShortDateString();
         }
-	}
+
+        private void btConfAll_CheckStateChanged(object sender, EventArgs e)
+        {
+
+        }
+    }
 }