요청자 : k5 김예희(EST)

업무일지 - 사용자목록 오름차순 정렬
ot목록 - 사용자목록 오름차순 정렬,  ot시작,종료시간 추가

SubProject/FPJ0000/JobReport_/fJobReport.cs

@@ -45,7 +45,7 @@ namespace FPJ0000
             {
                 var processStr = "%";
                 var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
-                foreach (dsReport.ProcessUserListRow dr in dtUserList)
+                foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
                 {
                     if (String.IsNullOrEmpty(dr.outdate) == false)
                     {
@@ -62,7 +62,7 @@ namespace FPJ0000
                 {
                     var processStr = prc;// cmbProcess.Text;
                     var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
-                    foreach (dsReport.ProcessUserListRow dr in dtUserList)
+                    foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
                     {
                         if (String.IsNullOrEmpty(dr.outdate) == false)
                         {

SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs

@@ -685,7 +685,6 @@
             this.otStartDataGridViewTextBoxColumn.HeaderText = "시작";
             this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn";
             this.otStartDataGridViewTextBoxColumn.ReadOnly = true;
-            this.otStartDataGridViewTextBoxColumn.Visible = false;
             this.otStartDataGridViewTextBoxColumn.Width = 54;
             // 
             // otEnd
@@ -698,7 +697,6 @@
             this.otEnd.HeaderText = "종료";
             this.otEnd.Name = "otEnd";
             this.otEnd.ReadOnly = true;
-            this.otEnd.Visible = false;
             this.otEnd.Width = 54;
             // 
             // projectNameDataGridViewTextBoxColumn

SubProject/FPJ0000/OtConfirm/fOTConfirm.cs

@@ -138,7 +138,7 @@ namespace FPJ0000
             {
                 var processStr = "%";
                 var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
-                foreach (dsReport.ProcessUserListRow dr in dtUserList)
+                foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
                 {
                     string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
                     this.cmbUser.Items.Add(cmbdata);
@@ -150,7 +150,7 @@ namespace FPJ0000
                 {
                     var processStr = prc;// cmbProcess.Text;
                     var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
-                    foreach (dsReport.ProcessUserListRow dr in dtUserList)
+                    foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
                     {
                         string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
                         this.cmbUser.Items.Add(cmbdata);

SubProject/FPJ0000/OtConfirm/fOTConfirm.resx

@@ -181,20 +181,20 @@
   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3qv6EsF70UohUyqioF6WpTQ3s
-        ZjrMvM0pmprowiBbTCNTF5qoUCFK0YsK7aJTm7dtzm24Veq85v0GXpa6yzm6s/ntOWdLDYR+8OF58Tzf
-        D+f5nofHTvBDZfyVEp0iolT3O0Sio8hKc8jYVU9HlGjpsGca03mxuvxY5PsDXGjvhD7pVi9b6FWTyeQ0
-        2zZhtu6yamGhMbxoQf6XWQhKR+z8DPlBT9Q94UWaZTasnXZAP8NAP8tAN81AM7UF5a9NtAzZsMkAjSMU
-        8j/NIOmFifpHEiJpoTbsWzDOOfF9jiErg15OsgXV+Ca+DdmJwAXjohP6BQcK5bMIfNDxjgtHywImb0ki
-        t0VVN5BUeROVrXUoqJchUOKLAAK/8ByCpadR1ljGXcVKM1hasyM4TsVwgqiSwI8dA01oGnuNSl0uJ4mr
-        CEPu21hk1gkgrL6KxOpENPYtoclkxdf+DayTnkKk3TQn4JfzD/pIspy60S68GZCiWJnBSeKrwkn4GlJf
-        pkA9buOu0j5GQUF6WLM5EFLQ4xawE1qkorNrEmAY16Bafx9P23IQLbuE+IpIGKbtMJBi2YLVE+5OzEQQ
-        LN0juPBI4jiTdxSx5XwYJ7Qo7EqDVJ4NwfMg1Ck/4+c8AwMpVjvlQA9h2eJA4GOP4KTYS+QvPoLM2hjc
-        rgpFTNllTpItj4W4PoV8SRDYfeOsE73sLyZYSJF+WRq3wF98aN5ffJgc8oJ/rheuFwch/VUC1EMKFCry
-        kPYhAcKqKBiIQE/eho4IaIeLCJS7V7iY1U0vrtPom3dyqEYXcK8mFckkKKoWIKf27s4ei33LSQQNuwLW
-        NmfeFfwPG3uFlD2Cs9md9lbNj+39Du9H/+Cwyyeu0eqJkyJT2yZnNuyWzp4+1+QKhcllCuMeVqwODrZ5
-        K02eev+Qi6Kode87zYOeOI93KrU13U/Y0nZCpDD7iRroHZLd+P5F2EB7C5vXjic2t/smyJN4PB7vD5/y
-        nxrD4VALAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3Kv+EsF70UghTyqioF6WpTQ3s
+        Zipm3uYUTW3owiBbzEXmJTRRoUKUohcV2kWnNm9zzm24ieY0Ne838LLUXc7Rnc1vzzlbzkDoBx+eF8/5
+        fji/7zk8dkIeKROvlmgVkaXa36ESLUVOmqOMPXV0ZImGDn+uNl4QqyqOR304xIX2T9jTXtWqmV43Go0O
+        k3UbJouHdTMLjZ/LZhR8nUds6ZiNnyX3ckddE1GkXmXDmlk7dHMMdPMMtLMM1DM7UP7aRuuoFdsM0DRG
+        oeDzHFJeGql/JKGSVmrLtgPDggMDCww5GfRzkh30TG7j+6iNCJwwLDugW7JDJp9H0MPO91w4pixw+rYk
+        aldYfRMpVbdQ1VaPwoYyBEn8EEjgy84jRHoG5U3l3CoWmsHKhg0hCT0MJ4guCfrUOdyM5ok3qNLmcZKE
+        ynDkvYtHdn0sBDXXkFyTjKahFTQbLfj2YwubpKdQaS/NCfgVfC9fSY5DO96Nt8NSFCuzOElidQQJX0f6
+        qzSoJq3cKh0TFBSkhw2rHaGFfS4BO2FFPbSoNgn6STVqdA/wrD0XMWWXkVgZBf2sDXpSLFuwasrViYkI
+        QqT7BBcfS+xn848hvoIPw5QGsu4MSOUixL4IRr3yCwYXGehJsZoZO/oIq2Y7gp64BafE3sIA8VFk18Xh
+        TnUY4sqvcBKRPB7ihjTyJsFg7w3zDvSzn5hgJkX656hdggDx4cUA8RHykDcC8rxxozgYma+ToBpVQKbI
+        R8bHJAiqo6EnAh35N7REQNudRKD0rHApp5de3qQxtOjg6Blfwv3adKSSoLAmFrl19/buWGw7DiJo9AhY
+        24LJI/gfVnaFtH2Cc6IuW2vvwO5BDx+IcdR5IqHJ4o6TItPbp+e2bOYu9aBzeo3C9CqFSTdrFjsH27yF
+        dsAwNOKkKGrT527LiDvO451Ob8v0F7S2nxQqTP7CRnqPVBd+fxE00j6Clg3f5JYOvyR5Co/H4/0Bl8Sf
+        DuVD3wEAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btConf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -255,7 +255,7 @@
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
         8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
-        c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
+        c+a7mZRkkklGQu5saSus3RyM3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
         VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
         /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
         A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
@@ -267,7 +267,7 @@
         3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
         613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
         t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
-        UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC
+        UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AHvBPpKbf2MsAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">