.

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.08.03.0900")]
+[assembly: AssemblyVersion("21.08.06.1020")]
-[assembly: AssemblyFileVersion("21.08.03.0900")]
+[assembly: AssemblyFileVersion("21.08.06.1020")]

SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs

@@ -67,8 +67,8 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
             this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
-            this.tbTag = new System.Windows.Forms.TextBox();
             this.lbTitleTip = new System.Windows.Forms.Label();
+            this.tbTag = new System.Windows.Forms.TextBox();
             hrsLabel = new System.Windows.Forms.Label();
             typeLabel = new System.Windows.Forms.Label();
             label1 = new System.Windows.Forms.Label();
@@ -89,38 +89,38 @@
             // hrsLabel
             // 
             hrsLabel.AutoSize = true;
-            hrsLabel.Location = new System.Drawing.Point(15, 125);
+            hrsLabel.Location = new System.Drawing.Point(15, 120);
             hrsLabel.Name = "hrsLabel";
             hrsLabel.Size = new System.Drawing.Size(53, 12);
-            hrsLabel.TabIndex = 16;
+            hrsLabel.TabIndex = 19;
             hrsLabel.Text = "근무시간";
             // 
             // typeLabel
             // 
             typeLabel.AutoSize = true;
-            typeLabel.Location = new System.Drawing.Point(374, 91);
+            typeLabel.Location = new System.Drawing.Point(374, 38);
             typeLabel.Name = "typeLabel";
             typeLabel.Size = new System.Drawing.Size(53, 12);
-            typeLabel.TabIndex = 13;
+            typeLabel.TabIndex = 11;
             typeLabel.Text = "업무형태";
             // 
             // label1
             // 
             label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(15, 91);
+            label1.Location = new System.Drawing.Point(15, 38);
             label1.Name = "label1";
             label1.Size = new System.Drawing.Size(53, 12);
-            label1.TabIndex = 10;
+            label1.TabIndex = 7;
             label1.Text = "요청부서";
             // 
             // projectLabel
             // 
             projectLabel.AutoSize = true;
-            projectLabel.Location = new System.Drawing.Point(15, 39);
+            projectLabel.Location = new System.Drawing.Point(16, 64);
             projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             projectLabel.Name = "projectLabel";
             projectLabel.Size = new System.Drawing.Size(53, 12);
-            projectLabel.TabIndex = 7;
+            projectLabel.TabIndex = 15;
             projectLabel.Text = "프로젝트";
             // 
             // label4
@@ -156,16 +156,16 @@
             // label3
             // 
             label3.AutoSize = true;
-            label3.Location = new System.Drawing.Point(188, 91);
+            label3.Location = new System.Drawing.Point(188, 38);
             label3.Name = "label3";
             label3.Size = new System.Drawing.Size(41, 12);
-            label3.TabIndex = 10;
+            label3.TabIndex = 9;
             label3.Text = "패키지";
             // 
             // label6
             // 
             label6.AutoSize = true;
-            label6.Location = new System.Drawing.Point(582, 91);
+            label6.Location = new System.Drawing.Point(582, 38);
             label6.Name = "label6";
             label6.Size = new System.Drawing.Size(53, 12);
             label6.TabIndex = 13;
@@ -174,41 +174,41 @@
             // label2
             // 
             label2.AutoSize = true;
-            label2.Location = new System.Drawing.Point(155, 125);
+            label2.Location = new System.Drawing.Point(155, 120);
             label2.Name = "label2";
             label2.Size = new System.Drawing.Size(53, 12);
-            label2.TabIndex = 16;
+            label2.TabIndex = 21;
             label2.Text = "초과시간";
             // 
             // label7
             // 
             label7.AutoSize = true;
             label7.Font = new System.Drawing.Font("맑은 고딕", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label7.Location = new System.Drawing.Point(297, 117);
+            label7.Location = new System.Drawing.Point(297, 112);
             label7.Name = "label7";
             label7.Size = new System.Drawing.Size(73, 13);
-            label7.TabIndex = 56;
+            label7.TabIndex = 23;
             label7.Text = "초과시간정보";
             // 
             // lbSummary
             // 
             this.lbSummary.AutoSize = true;
             this.lbSummary.ForeColor = System.Drawing.Color.SlateGray;
-            this.lbSummary.Location = new System.Drawing.Point(70, 162);
+            this.lbSummary.Location = new System.Drawing.Point(70, 157);
             this.lbSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbSummary.Name = "lbSummary";
             this.lbSummary.Size = new System.Drawing.Size(339, 12);
-            this.lbSummary.TabIndex = 53;
+            this.lbSummary.TabIndex = 27;
             this.lbSummary.Text = "금월 근무시간 : {0:N1}h / {1:N0}h , 금월 초과시간 : {2:N1}h";
             // 
             // tbHrs
             // 
             this.tbHrs.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
             this.tbHrs.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbHrs.Location = new System.Drawing.Point(72, 115);
+            this.tbHrs.Location = new System.Drawing.Point(72, 110);
             this.tbHrs.Name = "tbHrs";
             this.tbHrs.Size = new System.Drawing.Size(77, 39);
-            this.tbHrs.TabIndex = 17;
+            this.tbHrs.TabIndex = 20;
             this.tbHrs.Text = "0.0";
             this.tbHrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -249,10 +249,10 @@
             // 
             this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbType.FormattingEnabled = true;
-            this.cmbType.Location = new System.Drawing.Point(431, 87);
+            this.cmbType.Location = new System.Drawing.Point(431, 34);
             this.cmbType.Name = "cmbType";
             this.cmbType.Size = new System.Drawing.Size(142, 20);
-            this.cmbType.TabIndex = 14;
+            this.cmbType.TabIndex = 12;
             this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
             // 
             // btSave
@@ -261,7 +261,7 @@
             this.btSave.Location = new System.Drawing.Point(829, 6);
             this.btSave.Name = "btSave";
             this.btSave.Size = new System.Drawing.Size(133, 115);
-            this.btSave.TabIndex = 20;
+            this.btSave.TabIndex = 28;
             this.btSave.Text = "확인";
             this.btSave.UseVisualStyleBackColor = false;
             this.btSave.Click += new System.EventHandler(this.button1_Click);
@@ -291,12 +291,12 @@
             // 
             // tbProjectIndex
             // 
-            this.tbProjectIndex.Location = new System.Drawing.Point(758, 35);
+            this.tbProjectIndex.Location = new System.Drawing.Point(759, 60);
             this.tbProjectIndex.Margin = new System.Windows.Forms.Padding(4);
             this.tbProjectIndex.Name = "tbProjectIndex";
             this.tbProjectIndex.ReadOnly = true;
             this.tbProjectIndex.Size = new System.Drawing.Size(64, 21);
-            this.tbProjectIndex.TabIndex = 9;
+            this.tbProjectIndex.TabIndex = 17;
             this.tbProjectIndex.TabStop = false;
             this.tbProjectIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -305,10 +305,10 @@
             this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true));
             this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.tbOt.ForeColor = System.Drawing.Color.Red;
-            this.tbOt.Location = new System.Drawing.Point(213, 115);
+            this.tbOt.Location = new System.Drawing.Point(213, 110);
             this.tbOt.Name = "tbOt";
             this.tbOt.Size = new System.Drawing.Size(77, 39);
-            this.tbOt.TabIndex = 17;
+            this.tbOt.TabIndex = 22;
             this.tbOt.Text = "0.0";
             this.tbOt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.tbOt.Validated += new System.EventHandler(this.tbOt_Validated);
@@ -328,10 +328,10 @@
             // 
             this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbProcess.FormattingEnabled = true;
-            this.cmbProcess.Location = new System.Drawing.Point(641, 87);
+            this.cmbProcess.Location = new System.Drawing.Point(641, 34);
             this.cmbProcess.Name = "cmbProcess";
             this.cmbProcess.Size = new System.Drawing.Size(181, 20);
-            this.cmbProcess.TabIndex = 15;
+            this.cmbProcess.TabIndex = 14;
             // 
             // cmbState
             // 
@@ -348,19 +348,19 @@
             // 
             this.cmbPackage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbPackage.FormattingEnabled = true;
-            this.cmbPackage.Location = new System.Drawing.Point(235, 87);
+            this.cmbPackage.Location = new System.Drawing.Point(235, 34);
             this.cmbPackage.Name = "cmbPackage";
             this.cmbPackage.Size = new System.Drawing.Size(131, 20);
-            this.cmbPackage.TabIndex = 12;
+            this.cmbPackage.TabIndex = 10;
             // 
             // cmbRequest
             // 
             this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbRequest.FormattingEnabled = true;
-            this.cmbRequest.Location = new System.Drawing.Point(73, 87);
+            this.cmbRequest.Location = new System.Drawing.Point(73, 34);
             this.cmbRequest.Name = "cmbRequest";
             this.cmbRequest.Size = new System.Drawing.Size(108, 20);
-            this.cmbRequest.TabIndex = 11;
+            this.cmbRequest.TabIndex = 8;
             // 
             // ta
             // 
@@ -390,10 +390,10 @@
             // chkAutoAdd
             // 
             this.chkAutoAdd.AutoSize = true;
-            this.chkAutoAdd.Location = new System.Drawing.Point(646, 120);
+            this.chkAutoAdd.Location = new System.Drawing.Point(646, 115);
             this.chkAutoAdd.Name = "chkAutoAdd";
             this.chkAutoAdd.Size = new System.Drawing.Size(176, 16);
-            this.chkAutoAdd.TabIndex = 54;
+            this.chkAutoAdd.TabIndex = 26;
             this.chkAutoAdd.Text = "프로젝트 주간내역으로 등록";
             this.chkAutoAdd.UseVisualStyleBackColor = true;
             // 
@@ -403,10 +403,10 @@
             this.tbProject.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.tbProject.FormattingEnabled = true;
-            this.tbProject.Location = new System.Drawing.Point(72, 35);
+            this.tbProject.Location = new System.Drawing.Point(73, 60);
             this.tbProject.Name = "tbProject";
             this.tbProject.Size = new System.Drawing.Size(679, 20);
-            this.tbProject.TabIndex = 55;
+            this.tbProject.TabIndex = 16;
             // 
             // richTextBoxEx1
             // 
@@ -419,12 +419,12 @@
             this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
             this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.richTextBoxEx1.FilePath = "";
-            this.richTextBoxEx1.Location = new System.Drawing.Point(0, 185);
+            this.richTextBoxEx1.Location = new System.Drawing.Point(0, 177);
             this.richTextBoxEx1.Name = "richTextBoxEx1";
             this.richTextBoxEx1.Rtf = resources.GetString("richTextBoxEx1.Rtf");
             this.richTextBoxEx1.SetColorWithFont = true;
             this.richTextBoxEx1.ShowToolStrip = true;
-            this.richTextBoxEx1.Size = new System.Drawing.Size(969, 469);
+            this.richTextBoxEx1.Size = new System.Drawing.Size(969, 477);
             this.richTextBoxEx1.TabIndex = 58;
             // 
             // panel1
@@ -434,15 +434,17 @@
             this.panel1.Controls.Add(this.dateTimePicker1);
             this.panel1.Controls.Add(label7);
             this.panel1.Controls.Add(this.dtPdate);
-            this.panel1.Controls.Add(this.tbHrs);
             this.panel1.Controls.Add(this.tbProject);
+            this.panel1.Controls.Add(projectLabel);
+            this.panel1.Controls.Add(this.tbHrs);
+            this.panel1.Controls.Add(this.tbProjectIndex);
             this.panel1.Controls.Add(label2);
+            this.panel1.Controls.Add(this.lbTitleTip);
             this.panel1.Controls.Add(hrsLabel);
             this.panel1.Controls.Add(this.chkAutoAdd);
             this.panel1.Controls.Add(this.cmbType);
             this.panel1.Controls.Add(label5);
             this.panel1.Controls.Add(typeLabel);
-            this.panel1.Controls.Add(this.lbTitleTip);
             this.panel1.Controls.Add(this.lbSummary);
             this.panel1.Controls.Add(label6);
             this.panel1.Controls.Add(this.cmbPackage);
@@ -454,36 +456,45 @@
             this.panel1.Controls.Add(stateLabel);
             this.panel1.Controls.Add(this.cmbUser);
             this.panel1.Controls.Add(this.cmbProcess);
-            this.panel1.Controls.Add(this.tbProjectIndex);
             this.panel1.Controls.Add(this.tbWW);
-            this.panel1.Controls.Add(projectLabel);
             this.panel1.Controls.Add(label4);
             this.panel1.Controls.Add(this.tbOt);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(969, 185);
+            this.panel1.Size = new System.Drawing.Size(969, 177);
-            this.panel1.TabIndex = 59;
+            this.panel1.TabIndex = 0;
             // 
             // dateTimePicker2
             // 
             this.dateTimePicker2.CustomFormat = "yyyy-MM-dd hh:mm:ss";
             this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker2.Location = new System.Drawing.Point(455, 131);
+            this.dateTimePicker2.Location = new System.Drawing.Point(455, 126);
             this.dateTimePicker2.Margin = new System.Windows.Forms.Padding(4);
             this.dateTimePicker2.Name = "dateTimePicker2";
             this.dateTimePicker2.Size = new System.Drawing.Size(153, 21);
-            this.dateTimePicker2.TabIndex = 57;
+            this.dateTimePicker2.TabIndex = 25;
             // 
             // dateTimePicker1
             // 
             this.dateTimePicker1.CustomFormat = "yyyy-MM-dd hh:mm:ss";
             this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker1.Location = new System.Drawing.Point(297, 131);
+            this.dateTimePicker1.Location = new System.Drawing.Point(297, 126);
             this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(4);
             this.dateTimePicker1.Name = "dateTimePicker1";
             this.dateTimePicker1.Size = new System.Drawing.Size(153, 21);
-            this.dateTimePicker1.TabIndex = 57;
+            this.dateTimePicker1.TabIndex = 24;
+            // 
+            // lbTitleTip
+            // 
+            this.lbTitleTip.AutoSize = true;
+            this.lbTitleTip.ForeColor = System.Drawing.Color.SlateGray;
+            this.lbTitleTip.Location = new System.Drawing.Point(72, 87);
+            this.lbTitleTip.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbTitleTip.Name = "lbTitleTip";
+            this.lbTitleTip.Size = new System.Drawing.Size(339, 12);
+            this.lbTitleTip.TabIndex = 18;
+            this.lbTitleTip.Text = "금월 근무시간 : {0:N1}h / {1:N0}h , 금월 초과시간 : {2:N1}h";
             // 
             // tbTag
             // 
@@ -494,17 +505,6 @@
             this.tbTag.TabIndex = 60;
             this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // lbTitleTip
-            // 
-            this.lbTitleTip.AutoSize = true;
-            this.lbTitleTip.ForeColor = System.Drawing.Color.SlateGray;
-            this.lbTitleTip.Location = new System.Drawing.Point(71, 62);
-            this.lbTitleTip.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lbTitleTip.Name = "lbTitleTip";
-            this.lbTitleTip.Size = new System.Drawing.Size(339, 12);
-            this.lbTitleTip.TabIndex = 53;
-            this.lbTitleTip.Text = "금월 근무시간 : {0:N1}h / {1:N0}h , 금월 초과시간 : {2:N1}h";
-            // 
             // fJobReport_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

SubProject/FPJ0000/JobReport_/fJobReport_Add.resx

@@ -156,6 +156,9 @@
   <metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>299, 17</value>
   </metadata>
@@ -166,7 +169,7 @@
     <value>226, 17</value>
   </metadata>
   <data name="richTextBoxEx1.Rtf" xml:space="preserve">
-    <value>{\rtf1\ansi\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}{\f1\froman\fcharset129 \'b8\'bc\'c0\'ba \'b0\'ed\'b5\'f1;}}
+    <value>{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}{\f1\froman\fcharset129 \'b8\'bc\'c0\'ba \'b0\'ed\'b5\'f1;}}
 {\*\generator Riched20 10.0.19041}\viewkind4\uc1 
 \pard\fs20\lang1042 3. \f1\'c7\'c1\'b7\'ce\'c1\'a7\'c6\'ae\f0\lang1033  \f1\'c1\'a6\'b8\'f1\'c0\'ba\f0  (\f1\'b0\'f8\'c0\'e5\'b6\'f3\'c0\'ce\f0 ,PKG\f1\'b0\'f8\'c1\'a4\f0 /\f1\'c0\'e5\'ba\'f1\'b8\'ed\f0  \f1\'c1\'a6\'c1\'b6\'bb\'e7\f0 /\f1\'b8\'f0\'b5\'a8\'b8\'ed\f0  \f1\'c0\'e5\'ba\'f1\'b9\'f8\'c8\'a3\f0  \f1\'c1\'f6\'bf\'f8\'b3\'bb\'bf\'eb\f0 ) \f1\'c7\'fc\'bd\'c4\'c0\'b8\'b7\'ce\f0  \f1\'c0\'db\'bc\'ba\'c7\'d8\f0  \f1\'c1\'d6\'bc\'bc\'bf\'e4\f0 .\lang1042\par
 }

SubProject/WebServer/BaseController.cs

@@ -136,6 +136,7 @@ namespace WebServer
             }
             else
             {
+                Console.WriteLine($"View filename :{file}");
                 //디폴트뷰의 내용을 가져온다 (있다면 적용한다)
                 if (applydefaultview)
                 {

SubProject/WebServer/Controller/APIController.cs

@@ -32,7 +32,7 @@ namespace WebServer
             if (FCOMMON.info.Login.gcode == null)
                 FCOMMON.info.Login.gcode = "EET1P";
             sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
-
+            Console.WriteLine($"Getdata sql={sql}");
             var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!";
             var cn = new System.Data.SqlClient.SqlConnection(cs);
             var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
@@ -86,6 +86,7 @@ namespace WebServer
                 FCOMMON.info.Login.gcode = "EET1P";
             sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
 
+            Console.WriteLine($"gettable sql={sql}");
             var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!";
             var cn = new System.Data.SqlClient.SqlConnection(cs);
             var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);