전자실메일양식 통일 및 정리 작업

2024-01-09 14:04:01 +09:00
parent aca27c5484
commit aef0c375ad
134 changed files with 4651 additions and 2343 deletions
--- a/SubProject/FPJ0000/FPJ0000.csproj
+++ b/SubProject/FPJ0000/FPJ0000.csproj
@@ -1001,7 +1001,7 @@
      <Project>{f31c242c-1b15-4518-9733-48558499fe4b}</Project>
      <Name>arControl</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\Sub\YARTE\YARTE.csproj">
+    <ProjectReference Include="..\..\Sub\YARTE\YARTE\YARTE\YARTE.csproj">
      <Project>{db5ee9c8-eacf-4231-877e-b9dfd7a714de}</Project>
      <Name>YARTE</Name>
    </ProjectReference>
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs
@@ -89,11 +89,11 @@
            this.HolyTimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.stime = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.etime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cmbCf = new System.Windows.Forms.DataGridViewComboBoxColumn();
            this.HolyReason = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.HolyLocation = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.processsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cmbCf = new System.Windows.Forms.DataGridViewComboBoxColumn();
            this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -497,11 +497,11 @@
            this.HolyTimes,
            this.stime,
            this.etime,
+            this.cmbCf,
            this.HolyReason,
            this.HolyLocation,
            this.telDataGridViewTextBoxColumn,
            this.processsDataGridViewTextBoxColumn,
-            this.cmbCf,
            this.Response,
            this.HolyBackup,
            this.remarkDataGridViewTextBoxColumn});
@@ -620,6 +620,20 @@
            this.etime.Name = "etime";
            this.etime.Width = 64;
            // 
+            // cmbCf
+            // 
+            this.cmbCf.DataPropertyName = "conf";
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.cmbCf.DefaultCellStyle = dataGridViewCellStyle6;
+            this.cmbCf.HeaderText = "관리자 승인";
+            this.cmbCf.Items.AddRange(new object[] {
+            "선택안함",
+            "승인",
+            "거절"});
+            this.cmbCf.Name = "cmbCf";
+            this.cmbCf.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.cmbCf.Width = 85;
+            // 
            // HolyReason
            // 
            this.HolyReason.DataPropertyName = "HolyReason";
@@ -649,20 +663,6 @@
            this.processsDataGridViewTextBoxColumn.ReadOnly = true;
            this.processsDataGridViewTextBoxColumn.Width = 64;
            // 
-            // cmbCf
-            // 
-            this.cmbCf.DataPropertyName = "conf";
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.cmbCf.DefaultCellStyle = dataGridViewCellStyle6;
-            this.cmbCf.HeaderText = "관리자 승인";
-            this.cmbCf.Items.AddRange(new object[] {
-            "선택안함",
-            "승인",
-            "거절"});
-            this.cmbCf.Name = "cmbCf";
-            this.cmbCf.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.cmbCf.Width = 85;
-            // 
            // Response
            // 
            this.Response.DataPropertyName = "Response";
@@ -768,11 +768,11 @@
        private System.Windows.Forms.DataGridViewTextBoxColumn HolyTimes;
        private System.Windows.Forms.DataGridViewTextBoxColumn stime;
        private System.Windows.Forms.DataGridViewTextBoxColumn etime;
+        private System.Windows.Forms.DataGridViewComboBoxColumn cmbCf;
        private System.Windows.Forms.DataGridViewTextBoxColumn HolyReason;
        private System.Windows.Forms.DataGridViewTextBoxColumn HolyLocation;
        private System.Windows.Forms.DataGridViewTextBoxColumn telDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn processsDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewComboBoxColumn cmbCf;
        private System.Windows.Forms.DataGridViewTextBoxColumn Response;
        private System.Windows.Forms.DataGridViewTextBoxColumn HolyBackup;
        private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
--- 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
-        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/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
-        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/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
-        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/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
-        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/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/Project/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
@@ -2036,7 +2036,7 @@
            this.btSearch.Padding = new System.Windows.Forms.Padding(5, 0, 3, 0);
            this.btSearch.Size = new System.Drawing.Size(122, 69);
            this.btSearch.TabIndex = 9;
-            this.btSearch.Text = "새로고침(&R)";
+            this.btSearch.Text = "새로고침(F5)";
            this.btSearch.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.btSearch.UseVisualStyleBackColor = true;
            this.btSearch.Click += new System.EventHandler(this.button2_Click);
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -19,8 +19,17 @@ namespace FPJ0000
            fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini");
            this.dsMSSQL.Projects.TableNewRow += Projects_TableNewRow;
            this.FormClosed += __Closed;
+            this.KeyPreview = true;
+            this.KeyDown += (s1, e1) => { 
+                if(e1.KeyCode == Keys.F5)
+                {
+                    btSearch.PerformClick();
+                }
+            };
        }

+        
+
        void __Closed(object sender, FormClosedEventArgs e)
        {
            timer1.Stop();
--- a/SubProject/FPJ0000/Project/fProjectListUser.cs
+++ b/SubProject/FPJ0000/Project/fProjectListUser.cs
@@ -223,7 +223,6 @@ namespace FPJ0000
                var idinfo = uidinfo.Split('|');
                var uid = idinfo[0];

-
                if (dtActUser.Select($"id='{uid}'").Any() == false) continue;

                var newdr = this.dSProjectSummary.ProjectCountForUser.NewProjectCountForUserRow();
@@ -243,21 +242,27 @@ namespace FPJ0000
                //진행중인자료의 플랜을 확인한다.
                var listing = list.Where(t => t.status == "진행").ToList();

-                newdr.CntNone = listing.Where(t => string.IsNullOrEmpty(t.ddate)).Count();
-                newdr.Plan01 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-01")).Count();
-                newdr.Plan02 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-02")).Count();
-                newdr.Plan03 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-03")).Count();
-                newdr.Plan04 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-04")).Count();
-                newdr.Plan05 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-05")).Count();
-                newdr.Plan06 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-06")).Count();
-                newdr.Plan07 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-07")).Count();
-                newdr.Plan08 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-08")).Count();
-                newdr.Plan09 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-09")).Count();
-                newdr.Plan10 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-10")).Count();
-                newdr.Plan11 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-11")).Count();
-                newdr.Plan12 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-12")).Count();
+               if(uid == "395552")
+                {

-                var nextyear = (int.Parse(cmbYearS.Text) + 1).ToString();
+                }
+
+                var yearstr = cmbYearS.Text;
+                newdr.CntNone = listing.Where(t => string.IsNullOrEmpty(t.ddate)).Count();
+                newdr.Plan01 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-01")).Count();
+                newdr.Plan02 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-02")).Count();
+                newdr.Plan03 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-03")).Count();
+                newdr.Plan04 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-04")).Count();
+                newdr.Plan05 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-05")).Count();
+                newdr.Plan06 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-06")).Count();
+                newdr.Plan07 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-07")).Count();
+                newdr.Plan08 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-08")).Count();
+                newdr.Plan09 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-09")).Count();
+                newdr.Plan10 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-10")).Count();
+                newdr.Plan11 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-11")).Count();
+                newdr.Plan12 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-12")).Count();
+
+                var nextyear = (int.Parse(yearstr) + 1).ToString();
                newdr.PlanNext = listing.Where(t => t.ddate.StartsWith($"{nextyear}")).Count();
                newdr.CntOther = listing.Count - newdr.CntNone - newdr.PlanNext - newdr.Plan01 -
                     newdr.Plan02 - newdr.Plan03 - newdr.Plan04 - newdr.Plan05 - newdr.Plan06 -